From 6345cc499ecc8abd0e6d7dd61cf0af124c248a69 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 18 Oct 2021 23:26:30 +0100
Subject: [PATCH] testing alert short

---
 lgsm/functions/alert.sh         |  2 ++
 lgsm/functions/alert_discord.sh | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index fbd601243..bdd7d8653 100644
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -43,6 +43,7 @@ fn_alert_test(){
 
 fn_alert_stopping(){
 	fn_script_log_info "Sending alert: Stopping"
+	alerttype="short"
 	alerttitle="Alert - ${selfname} - Stopping"
 	alertemoji="🟡"
 	alertsound="1"
@@ -54,6 +55,7 @@ fn_alert_stopping(){
 
 fn_alert_stopped(){
 	fn_script_log_info "Sending alert: Stopped"
+	alerttype="short"
 	alerttitle="Alert - ${selfname} - Stopped"
 	alertemoji="🔴"
 	alertsound="1"
diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index e64d85d27..533e2afd4 100755
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -7,6 +7,35 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
+jsonshort=$(cat <<EOF
+{
+	"username": "LinuxGSM Alert",
+	"avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
+	"content": "",
+	"embeds": [
+		{
+			"author": {
+				"name": "LinuxGSM Alert",
+				"url": "",
+				"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
+			},
+			"title": "${servername}",
+			"url": "",
+			"description": "${alertemoji} ${alerttitle} ${alertemoji}",
+			"color": "${alertcolourdec}",
+			"thumbnail": {
+				"url": "${alerticon}"
+			},
+			"footer": {
+				"text": "Powered by LinuxGSM ${version}",
+				"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
+			}
+		}
+	]
+}
+EOF
+)
+
 json=$(cat <<EOF
 {
 	"username": "LinuxGSM Alert",
@@ -83,6 +112,10 @@ json=$(cat <<EOF
 EOF
 )
 
+if [ "${alerttype}" == "${short}" ]; then
+	json="${jsonshort}"
+fi
+
 fn_print_dots "Sending Discord alert"
 
 discordsend=$(curl --connect-timeout 10 -sSL -H "Content-Type: application/json" -X POST -d "$(echo -n "${json}" | jq -c .)" "${discordwebhook}")