From c8893c23cfe5945f763ec1770ebc388adb364bc3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 15 Oct 2023 22:55:20 +0100
Subject: [PATCH] feat: add alert icon and footer to Discord alerts

- Added a new variable `alerticon` to store the URL of the alert icon image.
- Included the `alerticon` in the JSON payload for both short info and no info alerts.
- Added a footer with text "Sent by LinuxGSM v23.5.3" to the JSON payload for both short info and no info alerts.

This commit enhances the appearance of Discord alerts by adding an icon, a footer, and additional information about the sender.
---
 lgsm/modules/alert.sh         |   3 +
 lgsm/modules/alert_discord.sh | 145 +++++++++++++++++++---------------
 2 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/lgsm/modules/alert.sh b/lgsm/modules/alert.sh
index cbd040cbd..634d6c815 100644
--- a/lgsm/modules/alert.sh
+++ b/lgsm/modules/alert.sh
@@ -174,6 +174,9 @@ fn_alert_info() {
 	alertcolourdec="2003199"
 }
 
+# Images
+alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/gameicons/${shortname}-icon.png"
+
 if [ "${alert}" == "permissions" ]; then
 	fn_alert_permissions
 elif [ "${alert}" == "monitor-session" ]; then
diff --git a/lgsm/modules/alert_discord.sh b/lgsm/modules/alert_discord.sh
index 19df5da2b..2a1b3fceb 100644
--- a/lgsm/modules/alert_discord.sh
+++ b/lgsm/modules/alert_discord.sh
@@ -10,38 +10,46 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 jsonshortinfo=$(
 	cat << EOF
 {
-	"username":"LinuxGSM",
-	"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
-	"file":"content",
-	"embeds": [{
-		"color": "2067276",
-		"author": {
-			"name": "${alertemoji} ${alertsubject} ${alertemoji}",
-			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
-		},
-		"title": "${servername}",
-		"description": "${alertbody} \n More info: ${alerturl}",
-		"url": "",
-		"type": "content",
-		"thumbnail": {},
-		"fields": [
-			{
-				"name": "Game",
-				"value": "${gamename}",
-				"inline": true
-			},
-			{
-				"name": "Server IP",
-				"value": "[${alertip}:${port}](https://www.gametracker.com/server_info/${alertip}:${port})",
-				"inline": true
-			},
-			{
-				"name": "Hostname",
-				"value": "${HOSTNAME}",
-				"inline": true
-			}
-		]
-	}]
+    "username": "LinuxGSM",
+    "avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
+    "file": "content",
+    "embeds": [
+        {
+            "author": {
+                "name": "${alertemoji} ${alertsubject} ${alertemoji}",
+                "url": "",
+                "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
+            },
+            "title": "${servername}",
+            "url": "",
+            "description": "${alertbody} \n More info: ${alerturl}",
+            "color": "${alertcolourdec}",
+            "type": "content",
+            "thumbnail": {
+                "url": "${alerticon}"
+            },
+            "fields": [
+                {
+                    "name": "Game",
+                    "value": "${gamename}",
+                    "inline": true
+                },
+                {
+                    "name": "Server IP",
+                    "value": "${alertip}:${port}",
+                    "inline": true
+                },
+                {
+                    "name": "Hostname",
+                    "value": "${HOSTNAME}",
+                    "inline": true
+                }
+            ],
+            "footer": {
+                "text": "Sent by LinuxGSM ${version}"
+            }
+        }
+    ]
 }
 EOF
 )
@@ -49,39 +57,46 @@ EOF
 jsonshortnoinfo=$(
 	cat << EOF
 {
-	"username":"LinuxGSM",
-	"avatar_url":"https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
-	"file":"content",
-	"embeds": [{
-		"color": "2067276",
-		"author": {
-			"name": "${alertemoji} ${alertsubject} ${alertemoji}",
-			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
-		},
-		"title": "${servername}",
-		"description": "${alertbody}",
-		"color": "${alertcolourdec}",
-		"url": "",
-		"type": "content",
-		"thumbnail": {},
-		"fields": [
-			{
-				"name": "Game",
-				"value": "${gamename}",
-				"inline": true
-			},
-			{
-				"name": "Server IP",
-				"value": "${alertip}:${port}",
-				"inline": true
-			},
-			{
-				"name": "Hostname",
-				"value": "${HOSTNAME}",
-				"inline": true
-			}
-		]
-	}]
+    "username": "LinuxGSM",
+    "avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
+    "file": "content",
+    "embeds": [
+        {
+            "author": {
+                "name": "${alertemoji} ${alertsubject} ${alertemoji}",
+                "url": "",
+                "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
+            },
+            "title": "${servername}",
+            "url": "",
+            "description": "${alertbody}",
+            "color": "${alertcolourdec}",
+            "type": "content",
+            "thumbnail": {
+                "url": "${alerticon}"
+            },
+            "fields": [
+                {
+                    "name": "Game",
+                    "value": "${gamename}",
+                    "inline": true
+                },
+                {
+                    "name": "Server IP",
+                    "value": "${alertip}:${port}",
+                    "inline": true
+                },
+                {
+                    "name": "Hostname",
+                    "value": "${HOSTNAME}",
+                    "inline": true
+                }
+            ],
+            "footer": {
+                "text": "Sent by LinuxGSM ${version}"
+            }
+        }
+    ]
 }
 EOF
 )