Privatize Discord + use Signals better

None of this is called outside of Discord, so there's no point on having it public.

Bonus note on the slots :
But if you close your eyes,
Does it almost feel like
Nothing changed at all?

core/include/discord.h

@@ -46,6 +46,67 @@ public:
       */
     ~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<QString>& 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);
+
+    /**
+     * @brief Handles a uptime webhook request.
+     */
+    void onUptimeWebhookRequested();
+
+private:
+    /**
+     * @brief The QNetworkAccessManager for webhooks.
+     */
+    QNetworkAccessManager* m_nam;
+
+    /**
+     * @brief The QNetworkRequest for webhooks.
+     */
+    QNetworkRequest m_request;
+
+    /**
+     * @brief Timer to post a message that the server is still alive.
+     */
+    QTimer* m_uptimePostTimer;
+
+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.
      *
@@ -98,56 +159,6 @@ public:
      * @return A QHttpMultiPart containing the log file.
      */
     QHttpMultiPart* constructLogMultipart(const QQueue<QString>& f_buffer) const;
-
-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<QString>& 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);
-
-    /**
-     * @brief Handles a uptime webhook request.
-     */
-    void onUptimeWebhookRequested();
-
-private:
-    /**
-     * @brief The QNetworkAccessManager for webhooks.
-     */
-    QNetworkAccessManager* m_nam;
-
-    /**
-     * @brief The QNetworkRequest for webhooks.
-     */
-    QNetworkRequest m_request;
-
-    /**
-     * @brief Timer to post a message that the server is still alive.
-     */
-    QTimer* m_uptimePostTimer;
-
-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);
 };
 
 #endif // DISCORD_H

core/src/discord.cpp

@@ -24,13 +24,9 @@ Discord::Discord(QObject* parent) :
     connect(m_nam, &QNetworkAccessManager::finished,
             this, &Discord::onReplyFinished);
 
-    if (ConfigManager::discordUptimeEnabled()){
     m_uptimePostTimer = new QTimer;
     connect(m_uptimePostTimer, &QTimer::timeout,
         this, &Discord::onUptimeWebhookRequested);
-        m_uptimePostTimer->start(ConfigManager::discordUptimeTime() * 60000);
-        onUptimeWebhookRequested();
-    }
 }
 
 void Discord::onModcallWebhookRequested(const QString &f_name, const QString &f_area, const QString &f_reason, const QQueue<QString> &f_buffer)
@@ -162,3 +158,14 @@ Discord::~Discord()
 {
     m_nam->deleteLater();
 }
+
+void Discord::startUptimeTimer()
+{
+    m_uptimePostTimer->start(ConfigManager::discordUptimeTime() * 60000);
+    onUptimeWebhookRequested();
+}
+
+void Discord::stopUptimeTimer()
+{
+    m_uptimePostTimer->stop();
+}

core/src/packets.cpp

@@ -352,7 +352,7 @@ void AOClient::pktModCall(AreaData* area, int argc, QStringList argv, AOPacket p
     }
     area->log(current_char, ipid, packet);
 
-    if (ConfigManager::discordWebhookEnabled()) {
+    if (ConfigManager::discordModcallWebhookEnabled()) {
         QString name = ooc_name;
         if (ooc_name.isEmpty())
             name = current_char;

core/src/server.cpp

@@ -52,6 +52,7 @@ void Server::start()
         qDebug() << "Server listening on" << port;
     }
     
+    discord = new Discord(this);
     handleDiscordIntegration();
 
     if (ConfigManager::advertiseHTTPServer()) {
@@ -285,14 +286,10 @@ void Server::allowMessage()
 
 void Server::handleDiscordIntegration()
 {
-    if (discord != nullptr) {
+     // Prevent double connecting by preemtively disconnecting them.
-        discord->deleteLater();
+    disconnect(this, nullptr, discord, nullptr);
-        discord = nullptr;
-    }
 
     if (ConfigManager::discordWebhookEnabled()) {
-        discord = new Discord(this);
-
         if (ConfigManager::discordModcallWebhookEnabled())
             connect(this, &Server::modcallWebhookRequest,
                     discord, &Discord::onModcallWebhookRequested);
@@ -300,6 +297,11 @@ void Server::handleDiscordIntegration()
         if (ConfigManager::discordBanWebhookEnabled())
             connect(this, &Server::banWebhookRequest,
                     discord, &Discord::onBanWebhookRequested);
+
+        if (ConfigManager::discordUptimeEnabled())
+            discord->startUptimeTimer();
+        else
+            discord->stopUptimeTimer();
     }
     return;
 }