diff --git a/bin/config_sample/discord.ini b/bin/config_sample/discord.ini deleted file mode 100644 index 6fb6bc3..0000000 --- a/bin/config_sample/discord.ini +++ /dev/null @@ -1,24 +0,0 @@ -[Discord] -; Enables the Discord Webhook Integration -webhook_enabled=false - -; Enables the modcall webhook to post a message when a modcall is made. -webhook_modcall_enabled=false - -; The URL of the modcall webhook. Must contain the webhook ID and token. -webhook_modcall_url= - -; Optional text. Usually for adding tags for roles. Ensure the format is <@&[RoleID]>. -webhook_modcall_content= - -; Attaches a logfile of the area to the modcall webhook. -webhook_modcall_sendfile=false - -; Enables the ban webhook. -webhook_ban_enabled = false - -; The URL of the ban discord webhook to send messages to. Must contain the webhook ID and token. -webhook_ban_url= - -; The color code for the webhook. Allows customization of the color used in the embeed. -webhook_color= diff --git a/bin/config_sample/text/cdns.txt b/bin/config_sample/text/cdns.txt index 2d09b6c..e69de29 100644 --- a/bin/config_sample/text/cdns.txt +++ b/bin/config_sample/text/cdns.txt @@ -1 +0,0 @@ -cdn.discord.com diff --git a/bin_tests/config/discord.ini b/bin_tests/config/discord.ini deleted file mode 100644 index 83c41ac..0000000 --- a/bin_tests/config/discord.ini +++ /dev/null @@ -1,33 +0,0 @@ -[Discord] -; Enables the Discord Webhook Integration -webhook_enabled=false - -; Enables the modcall webhook to post a message when a modcall is made. -webhook_modcall_enabled=false - -; The URL of the modcall webhook. Must contain the webhook ID and token. -webhook_modcall_url= - -; Optional text. Usually for adding tags for roles. Ensure the format is <@&[RoleID]>. -webhook_modcall_content= - -; Attaches a logfile of the area to the modcall webhook. -webhook_modcall_sendfile=false - -; Enables the ban webhook. -webhook_ban_enabled = false - -; The URL of the ban discord webhook to send messages to. Must contain the webhook ID and token. -webhook_ban_url= - -; Enables Uptime Webhook. -webhook_uptime_enabled = false - -; The time between message posting. Time is in minutes. -webhook_uptime_time = 60 - -; The URL of the Uptime Webhook. Must contain the webhook ID and token. -webhook_uptime_url= - -; The color code for the webhook. Allows customization of the color used in the embeed. -webhook_color= diff --git a/bin_tests/config/text/cdns.txt b/bin_tests/config/text/cdns.txt deleted file mode 100644 index bd6d416..0000000 --- a/bin_tests/config/text/cdns.txt +++ /dev/null @@ -1 +0,0 @@ -cdn.discord.com \ No newline at end of file diff --git a/core.pro b/core.pro index 0e939c2..1257675 100644 --- a/core.pro +++ b/core.pro @@ -46,7 +46,6 @@ SOURCES += \ src/commands/roleplay.cpp \ src/config_manager.cpp \ src/db_manager.cpp \ - src/discord.cpp \ src/packet/packet_pr.cpp \ src/packets.cpp \ src/playerstateobserver.cpp \ @@ -91,7 +90,6 @@ HEADERS += src/aoclient.h \ src/config_manager.h \ src/data_types.h \ src/db_manager.h \ - src/discord.h \ src/packet/packet_pr.h \ src/playerstateobserver.h \ src/server.h \ diff --git a/src/commands/moderation.cpp b/src/commands/moderation.cpp index 56d3926..4e33a0c 100644 --- a/src/commands/moderation.cpp +++ b/src/commands/moderation.cpp @@ -97,8 +97,6 @@ void AOClient::cmdBan(int argc, QStringList argv) l_kick_counter++; emit logBan(l_ban.moderator, l_ban.ipid, l_ban_duration, l_ban.reason); - if (ConfigManager::discordBanWebhookEnabled()) - emit server->banWebhookRequest(l_ban.ipid, l_ban.moderator, l_ban_duration, l_ban.reason, l_ban_id); } if (l_kick_counter > 1) diff --git a/src/config_manager.cpp b/src/config_manager.cpp index 369cc30..b7326b4 100644 --- a/src/config_manager.cpp +++ b/src/config_manager.cpp @@ -20,7 +20,6 @@ #include QSettings *ConfigManager::m_settings = new QSettings("config/config.ini", QSettings::IniFormat); -QSettings *ConfigManager::m_discord = new QSettings("config/discord.ini", QSettings::IniFormat); QSettings *ConfigManager::m_areas = new QSettings("config/areas.ini", QSettings::IniFormat); QSettings *ConfigManager::m_logtext = new QSettings("config/text/logtext.ini", QSettings::IniFormat); QSettings *ConfigManager::m_ambience = new QSettings("config/ambience.ini", QSettings::IniFormat); @@ -42,7 +41,7 @@ bool ConfigManager::verifyServerConfig() // Verify config files QStringList l_config_files{"config/config.ini", "config/areas.ini", "config/backgrounds.txt", "config/characters.txt", "config/music.json", - "config/discord.ini", "config/text/8ball.txt", "config/text/gimp.txt", "config/text/praise.txt", + "config/text/8ball.txt", "config/text/gimp.txt", "config/text/praise.txt", "config/text/reprimands.txt", "config/text/commandhelp.json", "config/text/cdns.txt", "config/ipbans.json"}; for (const QString &l_file : l_config_files) { if (!fileExists(QFileInfo(l_file))) { @@ -89,9 +88,6 @@ bool ConfigManager::verifyServerConfig() m_commands->gimps = (loadConfigFile("gimp")); m_commands->filters = (loadConfigFile("filter")); m_commands->cdns = (loadConfigFile("cdns")); - if (m_commands->cdns.isEmpty()) - m_commands->cdns = QStringList{"cdn.discord.com"}; - return true; } @@ -285,7 +281,6 @@ QStringList ConfigManager::iprangeBans() void ConfigManager::reloadSettings() { m_settings->sync(); - m_discord->sync(); m_logtext->sync(); } @@ -468,53 +463,6 @@ int ConfigManager::diceMaxDice() return l_dice; } -bool ConfigManager::discordWebhookEnabled() -{ - return m_discord->value("Discord/webhook_enabled", false).toBool(); -} - -bool ConfigManager::discordModcallWebhookEnabled() -{ - return m_discord->value("Discord/webhook_modcall_enabled", false).toBool(); -} - -QString ConfigManager::discordModcallWebhookUrl() -{ - return m_discord->value("Discord/webhook_modcall_url", "").toString(); -} - -QString ConfigManager::discordModcallWebhookContent() -{ - return m_discord->value("Discord/webhook_modcall_content", "").toString(); -} - -bool ConfigManager::discordModcallWebhookSendFile() -{ - return m_discord->value("Discord/webhook_modcall_sendfile", false).toBool(); -} - -bool ConfigManager::discordBanWebhookEnabled() -{ - return m_discord->value("Discord/webhook_ban_enabled", false).toBool(); -} - -QString ConfigManager::discordBanWebhookUrl() -{ - return m_discord->value("Discord/webhook_ban_url", "").toString(); -} - -QString ConfigManager::discordWebhookColor() -{ - const QString l_default_color = "13312842"; - QString l_color = m_discord->value("Discord/webhook_color", l_default_color).toString(); - if (l_color.isEmpty()) { - return l_default_color; - } - else { - return l_color; - } -} - bool ConfigManager::passwordRequirements() { return m_settings->value("Password/password_requirements", true).toBool(); diff --git a/src/config_manager.h b/src/config_manager.h index 54584ab..075dca6 100644 --- a/src/config_manager.h +++ b/src/config_manager.h @@ -268,63 +268,6 @@ class ConfigManager * @return See short description. */ static int diceMaxDice(); - - /** - * @brief Returns true if the discord webhook integration is enabled. - * - * @return See short description. - */ - static bool discordWebhookEnabled(); - - /** - * @brief Returns true if the discord modcall webhook is enabled. - * - * @return See short description. - */ - static bool discordModcallWebhookEnabled(); - - /** - * @brief Returns the discord webhook URL. - * - * @return See short description. - */ - static QString discordModcallWebhookUrl(); - - /** - * @brief Returns the discord webhook content. - * - * @return See short description. - */ - static QString discordModcallWebhookContent(); - - /** - * @brief Returns true if the discord webhook should send log files. - * - * @return See short description. - */ - static bool discordModcallWebhookSendFile(); - - /** - * @brief Returns true if the discord ban webhook is enabled. - * - * @return See short description. - */ - static bool discordBanWebhookEnabled(); - - /** - * @brief Returns the Discord Ban Webhook URL. - * - * @return See short description. - */ - static QString discordBanWebhookUrl(); - - /** - * @brief Returns a user configurable color code for the embeed object.s - * - * @return See short description. - */ - static QString discordWebhookColor(); - /** * @brief Returns true if password requirements should be enforced. * @@ -532,11 +475,6 @@ class ConfigManager */ static QSettings *m_settings; - /** - * @brief Stores all discord webhook configuration values. - */ - static QSettings *m_discord; - /** * @brief Stores all of the area valus. */ diff --git a/src/discord.cpp b/src/discord.cpp deleted file mode 100644 index 4650152..0000000 --- a/src/discord.cpp +++ /dev/null @@ -1,131 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// -#include "discord.h" - -#include "config_manager.h" - -Discord::Discord(QObject *parent) : - QObject(parent) -{ - m_nam = new QNetworkAccessManager(); - connect(m_nam, &QNetworkAccessManager::finished, - this, &Discord::onReplyFinished); -} - -void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_area, const QString &f_reason, const QQueue &f_buffer) -{ - m_request.setUrl(QUrl(ConfigManager::discordModcallWebhookUrl())); - QJsonDocument l_json = constructModcallJson(f_name, f_area, f_reason); - postJsonWebhook(l_json); - - if (ConfigManager::discordModcallWebhookSendFile()) { - QHttpMultiPart *l_multipart = constructLogMultipart(f_buffer); - postMultipartWebhook(*l_multipart); - } -} - -void Discord::onBanWebhookRequested(const QString &f_ipid, const QString &f_moderator, const QString &f_duration, const QString &f_reason, const int &f_banID) -{ - m_request.setUrl(QUrl(ConfigManager::discordBanWebhookUrl())); - QJsonDocument l_json = constructBanJson(f_ipid, f_moderator, f_duration, f_reason, f_banID); - postJsonWebhook(l_json); -} - -QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString &f_area, const QString &f_reason) const -{ - QJsonObject l_json; - QJsonArray l_array; - QJsonObject l_object{ - {"color", ConfigManager::discordWebhookColor()}, - {"title", f_name + " filed a modcall in " + f_area}, - {"description", f_reason}}; - l_array.append(l_object); - - if (!ConfigManager::discordModcallWebhookContent().isEmpty()) - l_json["content"] = ConfigManager::discordModcallWebhookContent(); - l_json["embeds"] = l_array; - - return QJsonDocument(l_json); -} - -QJsonDocument Discord::constructBanJson(const QString &f_ipid, const QString &f_moderator, const QString &f_duration, const QString &f_reason, const int &f_banID) -{ - QJsonObject l_json; - QJsonArray l_array; - QJsonObject l_object{ - {"color", ConfigManager::discordWebhookColor()}, - {"title", "Ban issued by " + f_moderator}, - {"description", "Client IPID : " + f_ipid + "\nBan ID: " + QString::number(f_banID) + "\nBan reason : " + f_reason + "\nBanned until : " + f_duration}}; - l_array.append(l_object); - l_json["embeds"] = l_array; - - return QJsonDocument(l_json); -} - -QHttpMultiPart *Discord::constructLogMultipart(const QQueue &f_buffer) const -{ - QHttpMultiPart *l_multipart = new QHttpMultiPart(); - QHttpPart l_file; - l_file.setRawHeader(QByteArray("Content-Disposition"), QByteArray("form-data; name=\"file\"; filename=\"log.txt\"")); - l_file.setRawHeader(QByteArray("Content-Type"), QByteArray("plain/text")); - QString l_log; - for (const QString &log_entry : f_buffer) { - l_log.append(log_entry + "\n"); - } - l_file.setBody(l_log.toUtf8()); - l_multipart->append(l_file); - return l_multipart; -} - -void Discord::postJsonWebhook(const QJsonDocument &f_json) -{ - if (!QUrl(m_request.url()).isValid()) { - qWarning("Invalid webhook URL!"); - return; - } - m_request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); - m_nam->post(m_request, f_json.toJson()); -} - -void Discord::postMultipartWebhook(QHttpMultiPart &f_multipart) -{ - if (!QUrl(m_request.url()).isValid()) { - qWarning("Invalid webhook URL!"); - f_multipart.deleteLater(); - return; - } - m_request.setHeader(QNetworkRequest::ContentTypeHeader, "multipart/form-data; boundary=" + f_multipart.boundary()); - QNetworkReply *l_reply = m_nam->post(m_request, &f_multipart); - f_multipart.setParent(l_reply); -} - -void Discord::onReplyFinished(QNetworkReply *f_reply) -{ - auto l_data = f_reply->readAll(); - f_reply->deleteLater(); -#ifdef DISCORD_DEBUG - QDebug() << l_data; -#else - Q_UNUSED(l_data); -#endif -} - -Discord::~Discord() -{ - m_nam->deleteLater(); -} diff --git a/src/discord.h b/src/discord.h deleted file mode 100644 index 1a10f56..0000000 --- a/src/discord.h +++ /dev/null @@ -1,148 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// -#ifndef DISCORD_H -#define DISCORD_H - -#include -#include - -class ConfigManager; - -/** - * @brief A class for handling all Discord webhook requests. - */ -class Discord : public QObject -{ - Q_OBJECT - - public: - /** - * @brief Constructor for the Discord object - * - * @param f_webhook_url The URL to send webhook POST requests to. - * @param f_webhook_content The content to include in the webhook POST request. - * @param f_webhook_sendfile Whether or not to send a file containing area logs with the webhook POST request. - * @param parent Qt-based parent, passed along to inherited constructor from QObject. - */ - Discord(QObject *parent = nullptr); - - /** - * @brief Deconstructor for the Discord class. - * - * @details Marks the network access manager to be deleted later. - */ - ~Discord(); - - /** - * @brief Method to start the Uptime Webhook posting timer. - */ - void startUptimeTimer(); - - /** - * @brief Method to stop the Uptime Webhook posting timer. - */ - void stopUptimeTimer(); - - public slots: - /** - * @brief Handles a modcall webhook request. - * - * @param f_name The name of the modcall sender. - * @param f_area The name of the area the modcall was sent from. - * @param f_reason The reason for the modcall. - * @param f_buffer The area's log buffer. - */ - void onModcallWebhookRequested(const QString &f_name, const QString &f_area, const QString &f_reason, const QQueue &f_buffer); - - /** - * @brief Handles a ban webhook request. - * - * @param f_ipid The IPID of the client. - * @param f_moderator The name of the moderator banning. - * @param f_duration The date the ban expires. - * @param f_reason The reason of the ban. - */ - void onBanWebhookRequested(const QString &f_ipid, const QString &f_moderator, const QString &f_duration, const QString &f_reason, const int &f_banID); - - private: - /** - * @brief The QNetworkAccessManager for webhooks. - */ - QNetworkAccessManager *m_nam; - - /** - * @brief The QNetworkRequest for webhooks. - */ - QNetworkRequest m_request; - - /** - * @brief Constructs a new JSON document for modcalls. - * - * @param f_name The name of the modcall sender. - * @param f_area The name of the area the modcall was sent from. - * @param f_reason The reason for the modcall. - * - * @return A JSON document for the modcall. - */ - QJsonDocument constructModcallJson(const QString &f_name, const QString &f_area, const QString &f_reason) const; - - /** - * @brief Constructs a new QHttpMultiPart document for log files. - * - * @param f_buffer The area's log buffer. - * - * @return A QHttpMultiPart containing the log file. - */ - QHttpMultiPart *constructLogMultipart(const QQueue &f_buffer) const; - - private slots: - /** - * @brief Handles a network reply from a webhook POST request. - * - * @param f_reply Pointer to the QNetworkReply created by the webhook POST request. - */ - void onReplyFinished(QNetworkReply *f_reply); - - /** - * @brief Sends a webhook POST request with the given JSON document. - * - * @param f_json The JSON document to send. - */ - void postJsonWebhook(const QJsonDocument &f_json); - - /** - * @brief Sends a webhook POST request with the given QHttpMultiPart. - * - * @param f_multipart The QHttpMultiPart to send. - */ - void postMultipartWebhook(QHttpMultiPart &f_multipart); - - /** - * @brief Constructs a new JSON document for bans. - * - * @param f_ipid The IPID of the client. - * @param f_moderator The name of the moderator banning. - * @param f_duration The date the ban expires. - * @param f_reason The reason of the ban. - * - * @return A JSON document for the ban. - */ - QJsonDocument constructBanJson(const QString &f_ipid, const QString &f_moderator, const QString &f_duration, const QString &f_reason, const int &f_banID); -}; - -#endif // DISCORD_H diff --git a/src/packet/packet_ma.cpp b/src/packet/packet_ma.cpp index 5a0f86c..ec21ee8 100644 --- a/src/packet/packet_ma.cpp +++ b/src/packet/packet_ma.cpp @@ -110,8 +110,5 @@ void PacketMA::handlePacket(AreaData *area, AOClient &client) const client.sendServerMessage("Banned " + QString::number(clients.size()) + " client(s) with ipid " + target->m_ipid + " for reason: " + reason); int ban_id = client.getServer()->getDatabaseManager()->getBanID(ban.ip); - if (ConfigManager::discordBanWebhookEnabled()) { - Q_EMIT client.getServer()->banWebhookRequest(ban.ipid, ban.moderator, timestamp, ban.reason, ban_id); - } } } diff --git a/src/packet/packet_zz.cpp b/src/packet/packet_zz.cpp index a308e6b..6171fb2 100644 --- a/src/packet/packet_zz.cpp +++ b/src/packet/packet_zz.cpp @@ -44,22 +44,4 @@ void PacketZZ::handlePacket(AreaData *area, AOClient &client) const l_client->sendPacket(PacketFactory::createPacket("ZZ", {l_modcallNotice})); } emit client.logModcall((client.character() + " " + client.characterName()), client.m_ipid, client.name(), client.getServer()->getAreaById(client.areaId())->name()); - - if (ConfigManager::discordModcallWebhookEnabled()) { - QString l_name = client.name(); - if (client.name().isEmpty()) - l_name = client.character(); - - QString l_areaName = area->name(); - - QString webhook_reason = m_content.value(0); - if (target_id != -1) { - AOClient *target = client.getServer()->getClientByID(target_id); - if (target) { - webhook_reason.append(" (Regarding: " + target->name() + ")"); - } - } - - emit client.getServer()->modcallWebhookRequest(l_name, l_areaName, webhook_reason, client.getServer()->getAreaBuffer(l_areaName)); - } } diff --git a/src/server.cpp b/src/server.cpp index 77069bb..a8b8ca2 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -23,7 +23,6 @@ #include "command_extension.h" #include "config_manager.h" #include "db_manager.h" -#include "discord.h" #include "logger/u_logger.h" #include "music_manager.h" #include "network/network_socket.h" @@ -46,9 +45,6 @@ Server::Server(int p_ws_port, QObject *parent) : command_extension_collection->setCommandNameWhitelist(AOClient::COMMANDS.keys()); command_extension_collection->loadFile("config/command_extensions.ini"); - // We create it, even if its not used later on. - discord = new Discord(this); - logger = new ULogger(this); connect(this, &Server::logConnectionAttempt, logger, &ULogger::logConnectionAttempt); @@ -77,9 +73,6 @@ void Server::start() qInfo() << "Server listening on" << server->serverPort(); } - // Checks if any Discord webhooks are enabled. - handleDiscordIntegration(); - // Construct modern advertiser if enabled in config server_publisher = new ServerPublisher(server->serverPort(), &m_player_count, this); @@ -309,7 +302,6 @@ void Server::reloadSettings() ConfigManager::reloadSettings(); emit reloadRequest(ConfigManager::serverName(), ConfigManager::serverDescription()); emit updateHTTPConfiguration(); - handleDiscordIntegration(); logger->loadLogtext(); m_ipban_list = ConfigManager::iprangeBans(); acl_roles_handler->loadFile("config/acl_roles.ini"); @@ -512,21 +504,6 @@ void Server::allowMessage() m_can_send_ic_messages = true; } -void Server::handleDiscordIntegration() -{ - // Prevent double connecting by preemtively disconnecting them. - disconnect(this, nullptr, discord, nullptr); - - if (ConfigManager::discordWebhookEnabled()) { - if (ConfigManager::discordModcallWebhookEnabled()) - connect(this, &Server::modcallWebhookRequest, discord, &Discord::onModcallWebhookRequested); - - if (ConfigManager::discordBanWebhookEnabled()) - connect(this, &Server::banWebhookRequest, discord, &Discord::onBanWebhookRequested); - } - return; -} - void Server::markIDFree(const int &f_user_id) { m_player_state_observer.unregisterClient(m_clients_ids[f_user_id]); @@ -577,7 +554,6 @@ Server::~Server() l_client->deleteLater(); } server->deleteLater(); - discord->deleteLater(); acl_roles_handler->deleteLater(); delete db_manager; diff --git a/src/server.h b/src/server.h index a17723d..afa57f7 100644 --- a/src/server.h +++ b/src/server.h @@ -39,7 +39,6 @@ class AreaData; class CommandExtensionCollection; class ConfigManager; class DBManager; -class Discord; class MusicManager; class ULogger; @@ -346,13 +345,6 @@ class Server : public QObject */ void clientConnected(); - /** - * @brief Method to construct and reconstruct Discord Webhook Integration. - * - * @details Constructs or rebuilds Discord Object during server startup and configuration reload. - */ - void handleDiscordIntegration(); - /** * @brief Marks a userID as free and ads it back to the available client id queue. */ @@ -415,11 +407,6 @@ class Server : public QObject */ QWebSocketServer *server; - /** - * @brief Handles Discord webhooks. - */ - Discord *discord; - /** * @brief Handles HTTP server advertising. */ diff --git a/tests/unittest_config_manager/tst_unittest_config_manager.cpp b/tests/unittest_config_manager/tst_unittest_config_manager.cpp index b0eeee8..230f8a4 100644 --- a/tests/unittest_config_manager/tst_unittest_config_manager.cpp +++ b/tests/unittest_config_manager/tst_unittest_config_manager.cpp @@ -82,28 +82,6 @@ class tst_ConfigManager : public QObject void diceMaxDice(); - void discordWebhookEnabled(); - - void discordModcallWebhookEnabled(); - - void discordModcallWebhookUrl(); - - void discordModcallWebhookContent(); - - void discordModcallWebhookSendFile(); - - void discordBanWebhookEnabled(); - - void discordBanWebhookUrl(); - - void discordUptimeEnabled(); - - void discordUptimeTime(); - - void discordUptimeWebhookUrl(); - - void discordWebhookColor(); - void passwordRequirements(); void passwordMinLength(); @@ -149,17 +127,6 @@ void tst_ConfigManager::verifyServerConfig() // We remove a config file and test again. This should now fail as cdns.txt is missing. QCOMPARE(QFile("config/text/cdns.txt").remove(), true); QCOMPARE(ConfigManager::verifyServerConfig(), false); - - // We rebuild the file. - QFile cdns_config("config/text/cdns.txt"); - if (cdns_config.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { - QTextStream write_stream(&cdns_config); - write_stream << "cdn.discord.com"; - cdns_config.close(); - } - else { - qDebug() << "Unable to recreate cdns config file."; - } } void tst_ConfigManager::bindIP() @@ -330,50 +297,6 @@ void tst_ConfigManager::diceMaxDice() { } -void tst_ConfigManager::discordWebhookEnabled() -{ -} - -void tst_ConfigManager::discordModcallWebhookEnabled() -{ -} - -void tst_ConfigManager::discordModcallWebhookUrl() -{ -} - -void tst_ConfigManager::discordModcallWebhookContent() -{ -} - -void tst_ConfigManager::discordModcallWebhookSendFile() -{ -} - -void tst_ConfigManager::discordBanWebhookEnabled() -{ -} - -void tst_ConfigManager::discordBanWebhookUrl() -{ -} - -void tst_ConfigManager::discordUptimeEnabled() -{ -} - -void tst_ConfigManager::discordUptimeTime() -{ -} - -void tst_ConfigManager::discordUptimeWebhookUrl() -{ -} - -void tst_ConfigManager::discordWebhookColor() -{ -} - void tst_ConfigManager::passwordRequirements() { }