Revert "Apply code suggestions"

This reverts commit e00e7b571d.

include/discord.h

@@ -20,7 +20,9 @@
 
 #include <QtNetwork>
 #include <QCoreApplication>
-#include "area_data.h"
+#include "server.h"
+
+class Server;
 
 class Discord : public QObject {
     Q_OBJECT
@@ -32,25 +34,10 @@ public:
      * @param p_server A pointer to the Server instance Discord is constructed by.
      * @param parent Qt-based parent, passed along to inherited constructor from QObject.
      */
-    Discord(QObject* parent = nullptr)
-        : QObject(parent) {
+    Discord(Server* p_server, QObject* parent = nullptr)
+        : QObject(parent), server(p_server) {
     };
 
-    /**
-     * @brief Whether discord webhooks are enabled on this server.
-     */
-    bool webhook_enabled;
-
-    /**
-     * @brief Requires link to be https and that both WebhookID and WebhookToken are present, if used for Discord.
-     */
-    QString webhook_url;
-
-    /**
-     * @brief If the modcall buffer is sent as a file.
-     */
-    bool webhook_sendfile;
-
 public slots:
 
     /**
@@ -61,7 +48,16 @@ public slots:
      * @param reason The reason the client specified for the modcall.
      * @param current_area The index of the area the modcall is made.
      */
-    void postModcallWebhook(QString name, QString reason, AreaData* area);
+    void postModcallWebhook(QString name, QString area, QString reason, int current_area);
+
+private:
+
+    /**
+     * @brief A pointer to the Server.
+     */
+    Server* server;
+
+private slots:
 
     /**
      * @brief Sends the reply to the POST request sent by Discord::postModcallWebhook.

include/logger.h

@@ -101,7 +101,7 @@ public:
     /**
      *@brief Returns the current area buffer
      */
-    const QQueue<QString>& getBuffer() const;
+    QQueue<QString> getBuffer();
 
 private:
     /**

include/server.h

@@ -183,11 +183,6 @@ class Server : public QObject {
      */
     DBManager* db_manager;
 
-    /**
-     * @brief Handles discord webhooks.
-     */
-    Discord* discord;
-
     /**
      * @brief The max amount of players on the server.
      */
@@ -244,6 +239,21 @@ class Server : public QObject {
      */
     int afk_timeout;
 
+    /**
+     * @brief Whether discord webhooks are enabled on this server.
+     */
+    bool webhook_enabled;
+
+    /**
+     * @brief The URL of the discord webhook.
+     */
+    QString webhook_url;
+
+    /**
+     * @brief If the modcall buffer is send as a file.
+     */
+    bool webhook_sendfile;
+
     /**
      * @brief The server-wide global timer.
      */
@@ -321,10 +331,11 @@ class Server : public QObject {
      * @brief Sends a modcall webhook request, emitted by AOClient::pktModcall.
      *
      * @param name The character or OOC name of the client who sent the modcall.
+     * @param area_name The name of the area the modcall was sent from.
      * @param reason The reason the client specified for the modcall.
-     * @param current_area Integer ID of the area the modcall was send.
+     * @param
      */
-    void webhookRequest(QString name, QString reason, AreaData* area);
+    void webhookRequest(QString name, QString area_name, QString reason, int current_area);
 
   private:
     /**
@@ -348,6 +359,11 @@ class Server : public QObject {
      * @brief The port through which the server will accept WebSocket connections.
      */
     int ws_port;
+
+    /**
+     * @brief Handles discord webhooks.
+     */
+    Discord* discord;
 };
 
 #endif // SERVER_H

src/discord.cpp

@@ -17,13 +17,14 @@
 //////////////////////////////////////////////////////////////////////////////////////
 #include "include/discord.h"
 
-void Discord::postModcallWebhook(QString name, QString reason, AreaData* area)
+void Discord::postModcallWebhook(QString name, QString area, QString reason, int current_area)
 {
-    if (!QUrl (webhook_url).isValid()) {
+    if (!QUrl (server->webhook_url).isValid()) {
         qWarning() << "Invalid webhook url!";
         return;
     }
-    QNetworkRequest request((QUrl (webhook_url)));
+
+    QNetworkRequest request(QUrl (server->webhook_url));
     QNetworkAccessManager* nam = new QNetworkAccessManager();
     connect(nam, &QNetworkAccessManager::finished,
             this, &Discord::onFinish);
@@ -36,7 +37,7 @@ void Discord::postModcallWebhook(QString name, QString reason, AreaData* area)
     QJsonArray jsonArray;
     QJsonObject jsonObject {
         {"color", "13312842"},
-        {"title", name + " filed a modcall in " + area->name},
+        {"title", name + " filed a modcall in " + area},
         {"description", reason}
     };
     jsonArray.append(jsonObject);
@@ -44,7 +45,7 @@ void Discord::postModcallWebhook(QString name, QString reason, AreaData* area)
 
     nam->post(request, QJsonDocument(json).toJson());
 
-    if (area->log_type == "modcall" && webhook_sendfile) {
+    if (server->areas[current_area]->log_type == "modcall" && server->webhook_sendfile) {
         QHttpMultiPart* construct = new QHttpMultiPart();
         request.setHeader(QNetworkRequest::ContentTypeHeader, "multipart/form-data; boundary=" + construct->boundary());
 
@@ -52,7 +53,7 @@ void Discord::postModcallWebhook(QString name, QString reason, AreaData* area)
         QHttpPart file;
         file.setRawHeader(QByteArray("Content-Disposition"), QByteArray("form-data; name=\"file\"; filename=\"log.txt\""));
         file.setRawHeader(QByteArray("Content-Type"), QByteArray("plain/text"));
-        QQueue<QString> buffer = area->logger->getBuffer(); // I feel no shame for doing this
+        QQueue<QString> buffer = server->areas[current_area]->logger->getBuffer(); // I feel no shame for doing this
         QString log;
         while (!buffer.isEmpty()) {
             log.append(buffer.dequeue() + "\n");

src/logger.cpp

@@ -114,7 +114,7 @@ void Logger::flush()
     logfile.close();
 }
 
-const QQueue<QString>& Logger::getBuffer() const
+QQueue<QString> Logger::getBuffer()
 {
     return buffer;
 }

src/packets.cpp

@@ -328,12 +328,12 @@ void AOClient::pktModCall(AreaData* area, int argc, QStringList argv, AOPacket p
     }
     area->logger->logModcall(this, &packet);
 
-    if (server->discord->webhook_enabled) {
+    if (server->webhook_enabled) {
         QString name = ooc_name;
         if (ooc_name.isEmpty())
             name = current_char;
 
-        server->webhookRequest(name, packet.contents[0], area);
+        server->webhookRequest(name, area->name, packet.contents[0], current_area);
     }
     area->logger->flush();
 }

src/server.cpp

@@ -304,10 +304,9 @@ void Server::loadServerConfig()
 
     //Load discord webhook
     config.beginGroup("Discord");
-    discord->webhook_enabled = config.value("webhook_enabled", "false").toBool();
-    discord->webhook_url = config.value("webhook_url", "Your webhook url here.").toString();
-    discord->webhook_sendfile = config.value("webhook_sendfile", false).toBool();
-    config.endGroup();
+    webhook_enabled = config.value("webhook_enabled", "false").toBool();
+    webhook_url = config.value("webhook_url", "Your webhook url here.").toString();
+    webhook_sendfile = config.value("webhook_sendfile", false).toBool();
 }
 
 Server::~Server()