From f4038d4678a295979b9f475f19d11892b124a244 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Thu, 12 Aug 2021 22:55:27 +0200
Subject: [PATCH] Cleanup Discord class and fix reload error

---
 core/include/discord.h | 11 -----------
 core/include/server.h  |  2 +-
 core/src/discord.cpp   | 12 ++++--------
 core/src/server.cpp    |  2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/core/include/discord.h b/core/include/discord.h
index 439e485..d207308 100644
--- a/core/include/discord.h
+++ b/core/include/discord.h
@@ -141,17 +141,6 @@ private:
      */
     QTimer* m_uptimePostTimer;
 
-    /**
-     * @brief Stores how long the interval between postings is.
-     **/
-    int m_uptimeInterval;
-
-    /**
-     * @brief Proof that Salanto does not know what he is doing.
-     * @details Counts how often the server alive counter has been posted.
-     */
-    int m_uptimeCounter;
-
 private slots:
     /**
      * @brief Handles a network reply from a webhook POST request.
diff --git a/core/include/server.h b/core/include/server.h
index aefe125..b08f5a9 100644
--- a/core/include/server.h
+++ b/core/include/server.h
@@ -293,7 +293,7 @@ class Server : public QObject {
     /**
      * @brief Handles Discord webhooks.
      */
-    Discord* discord;
+    Discord* discord = nullptr;
 
     /**
      * @brief Handles HTTP server advertising.
diff --git a/core/src/discord.cpp b/core/src/discord.cpp
index 8d52292..f300cb5 100644
--- a/core/src/discord.cpp
+++ b/core/src/discord.cpp
@@ -26,12 +26,9 @@ Discord::Discord(QObject* parent) :
 
     if (ConfigManager::discordUptimeEnabled()){
         m_uptimePostTimer = new QTimer;
-        m_uptimeInterval = ConfigManager::discordUptimeTime() * 60000;
-        m_uptimeCounter = 0;
-
         connect(m_uptimePostTimer, &QTimer::timeout,
                 this, &Discord::onUptimeWebhookRequested);
-        m_uptimePostTimer->start(m_uptimeInterval);
+        m_uptimePostTimer->start(ConfigManager::discordUptimeTime() * 60000);
         onUptimeWebhookRequested();
     }
 }
@@ -57,7 +54,7 @@ void Discord::onBanWebhookRequested(const QString &f_ipid, const QString &f_mode
 
 void Discord::onUptimeWebhookRequested()
 {
-    ulong l_expiredTimeSeconds = (m_uptimeCounter * m_uptimeInterval) / 1000;
+    qint64 l_expiredTimeSeconds = ConfigManager::uptime() / 1000;
     int minutes = (l_expiredTimeSeconds / 60) % 60;
     int hours = (l_expiredTimeSeconds / (60 * 60)) % 24;
     int days = (l_expiredTimeSeconds / (60 * 60 * 24)) % 365;
@@ -66,7 +63,6 @@ void Discord::onUptimeWebhookRequested()
     QString f_timeExpired = QString::number(days) + " days, " + QString::number(hours) + " hours and " + QString::number(minutes) + " minutes.";
     QJsonDocument l_json = constructUptimeJson(f_timeExpired);
     postJsonWebhook(l_json);
-    m_uptimeCounter++;
 }
 
 QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString &f_area, const QString &f_reason) const
@@ -107,8 +103,8 @@ QJsonDocument Discord::constructUptimeJson(const QString& f_timeExpired)
     QJsonArray l_array;
     QJsonObject l_object {
         {"color", "13312842"},
-        {"title", "Your server is still running!"},
-        {"description", "Hello World!\nYour server has been online for " + f_timeExpired}
+        {"title", "Your server is online!"},
+        {"description", "Your server has been online for " + f_timeExpired}
     };
     l_array.append(l_object);
     l_json["embeds"] = l_array;
diff --git a/core/src/server.cpp b/core/src/server.cpp
index 7187874..dfe8c1b 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -287,7 +287,7 @@ void Server::handleDiscordIntegration()
 {
     if (discord != nullptr) {
         discord->deleteLater();
-        return;
+        discord = nullptr;
     }
 
     if (ConfigManager::discordWebhookEnabled()) {