From 2c96e2683fb6ab56563ee760ad1bca7d8f0ae013 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 20 Sep 2021 21:09:28 +0200
Subject: [PATCH] Add optional color configuration

---
 bin/config_sample/discord.ini | 3 +++
 core/include/config_manager.h | 9 ++++++++-
 core/include/discord.h        | 2 --
 core/src/config_manager.cpp   | 5 +++++
 core/src/discord.cpp          | 6 +++---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bin/config_sample/discord.ini b/bin/config_sample/discord.ini
index ce3a496..83c41ac 100644
--- a/bin/config_sample/discord.ini
+++ b/bin/config_sample/discord.ini
@@ -28,3 +28,6 @@ webhook_uptime_time = 60
 
 ; The URL of the Uptime Webhook. Must contain the webhook ID and token.
 webhook_uptime_url=
+
+; The color code for the webhook. Allows customization of the color used in the embeed.
+webhook_color=
diff --git a/core/include/config_manager.h b/core/include/config_manager.h
index 9bf095c..74e80bc 100644
--- a/core/include/config_manager.h
+++ b/core/include/config_manager.h
@@ -321,10 +321,17 @@ class ConfigManager {
     /**
      * @brief Returns the Discord Uptime Webhook URL.
      * 
-     * @return See sshort description.
+     * @return See short description.
      */
     static QString discordUptimeWebhookUrl();
 
+    /**
+     * @brief Returns a user configurable color code for the embeed object.s
+     *
+     * @return See short description.
+     */
+    static QString discordWebhookColor();
+
     /**
      * @brief Returns true if password requirements should be enforced.
      *
diff --git a/core/include/discord.h b/core/include/discord.h
index 257df39..1f28009 100644
--- a/core/include/discord.h
+++ b/core/include/discord.h
@@ -141,8 +141,6 @@ private slots:
      */
     void postMultipartWebhook(QHttpMultiPart& f_multipart);
 
-
-
     /**
      * @brief Constructs a new JSON document for bans.
      *
diff --git a/core/src/config_manager.cpp b/core/src/config_manager.cpp
index ef5fc16..2a2b180 100644
--- a/core/src/config_manager.cpp
+++ b/core/src/config_manager.cpp
@@ -470,6 +470,11 @@ QString ConfigManager::discordUptimeWebhookUrl()
     return m_discord->value("Discord/webhook_uptime_url", "").toString();
 }
 
+QString ConfigManager::discordWebhookColor()
+{
+    return m_discord->value("Discord/webhook_color","13312842").toString();
+}
+
 bool ConfigManager::passwordRequirements()
 {
     return m_settings->value("Password/password_requirements", true).toBool();
diff --git a/core/src/discord.cpp b/core/src/discord.cpp
index e4eb4ee..9683ff7 100644
--- a/core/src/discord.cpp
+++ b/core/src/discord.cpp
@@ -66,7 +66,7 @@ QJsonDocument Discord::constructModcallJson(const QString &f_name, const QString
     QJsonObject l_json;
     QJsonArray l_array;
     QJsonObject l_object {
-        {"color", "13312842"},
+        {"color", ConfigManager::discordWebhookColor()},
         {"title", f_name + " filed a modcall in " + f_area},
         {"description", f_reason}
     };
@@ -85,7 +85,7 @@ QJsonDocument Discord::constructBanJson(const QString &f_ipid, const QString &f_
     QJsonObject l_json;
     QJsonArray l_array;
     QJsonObject l_object {
-        {"color", "13312842"},
+        {"color", ConfigManager::discordWebhookColor()},
         {"title", "Ban issued by " + f_moderator},
         {"description", "Client IPID : " + f_ipid + "\nBan ID: " + QString::number(f_banID) + "\nBan reason : " + f_reason +"\nBanned until : " +f_duration}
     };
@@ -100,7 +100,7 @@ QJsonDocument Discord::constructUptimeJson(const QString& f_timeExpired)
     QJsonObject l_json;
     QJsonArray l_array;
     QJsonObject l_object {
-        {"color", "13312842"},
+        {"color", ConfigManager::discordWebhookColor()},
         {"title", "Your server is online!"},
         {"description", "Your server has been online for " + f_timeExpired}
     };