Add file upload if modcall logging is used

+ Configurable option if no log should be send
+ Fix  logger not flushing to file if modcall is used
+ Update sample\config.ini

bin/config_sample/config.ini

@@ -26,3 +26,4 @@ max_dice=100
 [Discord]
 webhook_enabled=false
 webhook_url=Your webhook url here.
+webhook_sendfile=false

include/discord.h

@@ -46,8 +46,9 @@ public slots:
      * @param name The character or OOC name of the client who sent the modcall.
      * @param area The area name of the area the modcall was sent from.
      * @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 area, QString reason);
+    void postModcallWebhook(QString name, QString area, QString reason, int current_area);
 
 private:
 

include/logger.h

@@ -98,6 +98,11 @@ public:
      */
     void flush();
 
+    /**
+     *@brief Returns the current area buffer
+     */
+    QQueue<QString> getBuffer();
+
 private:
     /**
      * @brief Convenience function to format entries to the acceptable standard for logging.

include/server.h

@@ -249,6 +249,11 @@ class Server : public QObject {
      */
     QString webhook_url;
 
+    /**
+     * @brief If the modcall buffer is send as a file.
+     */
+    bool webhook_sendfile;
+
     /**
      * @brief The server-wide global timer.
      */
@@ -323,8 +328,9 @@ class Server : public QObject {
      * @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
      */
-    void webhookRequest(QString name, QString area_name, QString reason);
+    void webhookRequest(QString name, QString area_name, QString reason, int current_area);
 
   private:
     /**

src/discord.cpp

@@ -17,17 +17,22 @@
 //////////////////////////////////////////////////////////////////////////////////////
 #include "include/discord.h"
 
-void Discord::postModcallWebhook(QString name, QString area, QString reason)
+void Discord::postModcallWebhook(QString name, QString area, QString reason, int current_area)
 {
     if (!QUrl (server->webhook_url).isValid()) {
         qWarning() << "Invalid webhook url!";
         return;
     }
+
     QNetworkRequest request(QUrl (server->webhook_url));
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    QNetworkAccessManager* nam = new QNetworkAccessManager();
+    connect(nam, &QNetworkAccessManager::finished,
+            this, &Discord::onFinish);
 
     // This is the kind of garbage Qt makes me write.
     // I am so tired. Qt has broken me.
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
     QJsonObject json;
     QJsonArray jsonArray;
     QJsonObject jsonObject {
@@ -35,15 +40,29 @@ void Discord::postModcallWebhook(QString name, QString area, QString reason)
         {"title", name + " filed a modcall in " + area},
         {"description", reason}
     };
-
     jsonArray.append(jsonObject);
     json["embeds"] = jsonArray;
 
-    QNetworkAccessManager* nam = new QNetworkAccessManager();
-    connect(nam, &QNetworkAccessManager::finished,
-            this, &Discord::onFinish);
-
     nam->post(request, QJsonDocument(json).toJson());
+
+    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());
+
+        //This cost me two days of my life. Thanks Qt and Discord. You have broken me.
+        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 = server->areas[current_area]->logger->getBuffer(); // I feel no shame for doing this
+        QString log;
+        while (!buffer.isEmpty()) {
+            log.append(buffer.dequeue() + "\n");
+        }
+        file.setBody(log.toUtf8());
+        construct->append(file);
+
+        nam->post(request, construct);
+    }
 }
 
 void Discord::onFinish(QNetworkReply *reply)

src/logger.cpp

@@ -113,3 +113,8 @@ void Logger::flush()
         }
     logfile.close();
 }
+
+QQueue<QString> Logger::getBuffer()
+{
+    return buffer;
+}

src/packets.cpp

@@ -328,8 +328,9 @@ void AOClient::pktModCall(AreaData* area, int argc, QStringList argv, AOPacket p
         if (ooc_name.isEmpty())
             name = current_char;
 
-        server->webhookRequest(name, area->name, packet.contents[0]);
+        server->webhookRequest(name, area->name, packet.contents[0], current_area);
     }
+    area->logger->flush();
 }
 
 void AOClient::pktAddEvidence(AreaData* area, int argc, QStringList argv, AOPacket packet)

src/server.cpp

@@ -302,6 +302,7 @@ void Server::loadServerConfig()
     config.beginGroup("Discord");
     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()