From 6e2a3a0fca4728a4edbfa8bb265268752e4ef3a0 Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
 <58055358+MangosArentLiterature@users.noreply.github.com>
Date: Mon, 21 Jun 2021 22:05:59 -0500
Subject: [PATCH] Fix crash relating to ConfigManager changes

---
 core/include/discord.h | 13 ++-----------
 core/src/discord.cpp   | 16 +++++++---------
 core/src/server.cpp    |  2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/core/include/discord.h b/core/include/discord.h
index e8ef51d..b9150e8 100644
--- a/core/include/discord.h
+++ b/core/include/discord.h
@@ -20,6 +20,7 @@
 
 #include <QtNetwork>
 #include <QCoreApplication>
+#include "config_manager.h"
 
 /**
  * @brief A class for handling all Discord webhook requests.
@@ -36,7 +37,7 @@ public:
      * @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(const QUrl& f_webhook_url, const QString& f_webhook_content, const bool& f_webhook_sendfile, QObject* parent = nullptr);
+    Discord(QObject* parent = nullptr);
 
     /**
       * @brief Deconstructor for the Discord class.
@@ -101,16 +102,6 @@ private:
      */
     QNetworkRequest m_request;
 
-    /**
-     * @brief The content to include in the webhook POST request.
-     */
-    const QString& m_webhook_content;
-
-    /**
-     * @brief Whether or not to send a file containing area logs with the webhook POST request.
-     */
-    const bool& m_webhook_sendfile;
-
 private slots:
     /**
      * @brief Handles a network reply from a webhook POST request.
diff --git a/core/src/discord.cpp b/core/src/discord.cpp
index f3dac80..0cecaea 100644
--- a/core/src/discord.cpp
+++ b/core/src/discord.cpp
@@ -17,17 +17,15 @@
 //////////////////////////////////////////////////////////////////////////////////////
 #include "include/discord.h"
 
-Discord::Discord(const QUrl &f_webhook_url, const QString &f_webhook_content, const bool &f_webhook_sendfile, QObject* parent) :
-    QObject(parent),
-    m_webhook_content(f_webhook_content),
-    m_webhook_sendfile(f_webhook_sendfile)
+Discord::Discord(QObject* parent) :
+    QObject(parent)
 {
-    if (!QUrl(f_webhook_url).isValid())
+    if (!QUrl(ConfigManager::discordWebhookUrl()).isValid())
         qWarning("Invalid webhook URL!");
     m_nam = new QNetworkAccessManager();
     connect(m_nam, &QNetworkAccessManager::finished,
             this, &Discord::onReplyFinished);
-    m_request.setUrl(f_webhook_url);
+    m_request.setUrl(QUrl(ConfigManager::discordWebhookUrl()));
 }
 
 void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_area, const QString &f_reason, const QQueue<QString> &f_buffer)
@@ -35,7 +33,7 @@ void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_
     QJsonDocument l_json = constructModcallJson(f_name, f_area, f_reason);
     postJsonWebhook(l_json);
 
-    if (m_webhook_sendfile) {
+    if (ConfigManager::discordWebhookSendFile()) {
         QHttpMultiPart *l_multipart = constructLogMultipart(f_buffer);
         postMultipartWebhook(*l_multipart);
     }
@@ -52,8 +50,8 @@ QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString
     };
     l_array.append(l_object);
     l_json["embeds"] = l_array;
-    if (!m_webhook_content.isEmpty())
-        l_json["content"] = m_webhook_content;
+    if (!ConfigManager::discordWebhookContent().isEmpty())
+        l_json["content"] = ConfigManager::discordWebhookContent();
 
     return QJsonDocument(l_json);
 }
diff --git a/core/src/server.cpp b/core/src/server.cpp
index b0d3039..a3a209e 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -52,7 +52,7 @@ void Server::start()
     }
     
     if (ConfigManager::discordWebhookEnabled()) {
-        discord = new Discord(webhook_url, webhook_content, webhook_sendfile, this);
+        discord = new Discord(this);
         connect(this, &Server::modcallWebhookRequest,
                 discord, &Discord::onModcallWebhookRequested);
     }