From fb1caf6cee9e82e928be760c4affd05981514e17 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Wed, 12 May 2021 00:12:46 +0200
Subject: [PATCH 1/4] Add optional content field for Webhook

Allows the usage of pings with the webhook. Only added to the hook message if configured.
---
 include/server.h | 6 ++++++
 src/discord.cpp  | 2 ++
 src/server.cpp   | 1 +
 3 files changed, 9 insertions(+)

diff --git a/include/server.h b/include/server.h
index c76417b..35c8c00 100644
--- a/include/server.h
+++ b/include/server.h
@@ -317,11 +317,17 @@ class Server : public QObject {
      * @brief The minimum time between IC messages, in milliseconds.
      */
     int message_floodguard;
+
     /**
      * @brief URL send to the client during handshake to set the remote repository URL.
      */
     QUrl asset_url;
 
+    /**
+     * @brief Opional text to be send with the Discord embeed. Can be used to configure pings.
+     */
+    QString webhook_content;
+
   public slots:
     /**
      * @brief Handles a new connection.
diff --git a/src/discord.cpp b/src/discord.cpp
index e18f784..437cb6a 100644
--- a/src/discord.cpp
+++ b/src/discord.cpp
@@ -42,6 +42,8 @@ void Discord::postModcallWebhook(QString name, QString reason, int current_area)
     };
     jsonArray.append(jsonObject);
     json["embeds"] = jsonArray;
+    if (server->webhook_content != NULL)
+      json["content"] = server->webhook_content;
 
     nam->post(request, QJsonDocument(json).toJson());
 
diff --git a/src/server.cpp b/src/server.cpp
index 2afdbe6..02e7922 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -311,6 +311,7 @@ void Server::loadServerConfig()
     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();
+    webhook_content = config.value("webhook_content", NULL).toString();
     config.endGroup();
 }
 

From d55f4b58cf604bf7ccf51739ab5a46aee6e60518 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Wed, 12 May 2021 00:13:22 +0200
Subject: [PATCH 2/4] Somehow this got not commited

---
 bin/config_sample/config.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/config_sample/config.ini b/bin/config_sample/config.ini
index dcbff37..2b7c327 100644
--- a/bin/config_sample/config.ini
+++ b/bin/config_sample/config.ini
@@ -30,3 +30,4 @@ max_dice=100
 webhook_enabled=false
 webhook_url=Your webhook url here.
 webhook_sendfile=false
+webhook_content=

From 53290b0d537fe0ee034e43a175fcd1794ab44316 Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Wed, 12 May 2021 00:25:13 +0200
Subject: [PATCH 3/4] Apparently Linux does not like this.

---
 src/discord.cpp | 2 +-
 src/server.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/discord.cpp b/src/discord.cpp
index 437cb6a..d3e27c1 100644
--- a/src/discord.cpp
+++ b/src/discord.cpp
@@ -42,7 +42,7 @@ void Discord::postModcallWebhook(QString name, QString reason, int current_area)
     };
     jsonArray.append(jsonObject);
     json["embeds"] = jsonArray;
-    if (server->webhook_content != NULL)
+    if (server->webhook_content != "")
       json["content"] = server->webhook_content;
 
     nam->post(request, QJsonDocument(json).toJson());
diff --git a/src/server.cpp b/src/server.cpp
index 02e7922..6dfe42c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -311,7 +311,7 @@ void Server::loadServerConfig()
     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();
-    webhook_content = config.value("webhook_content", NULL).toString();
+    webhook_content = config.value("webhook_content", "").toString();
     config.endGroup();
 }
 

From ec4e9cc9f2528abc3a981bc59d0eaa3e221e3ceb Mon Sep 17 00:00:00 2001
From: Salanto <support@salanto.de>
Date: Thu, 13 May 2021 17:07:15 +0200
Subject: [PATCH 4/4] Update discord.cpp

---
 src/discord.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/discord.cpp b/src/discord.cpp
index d3e27c1..22864a2 100644
--- a/src/discord.cpp
+++ b/src/discord.cpp
@@ -42,7 +42,7 @@ void Discord::postModcallWebhook(QString name, QString reason, int current_area)
     };
     jsonArray.append(jsonObject);
     json["embeds"] = jsonArray;
-    if (server->webhook_content != "")
+    if (!server->webhook_content.isEmpty())
       json["content"] = server->webhook_content;
 
     nam->post(request, QJsonDocument(json).toJson());