From 524fc4c7c9d244f0d23efce14ea35dd6165ca166 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 17 Sep 2020 12:53:59 +0100
Subject: [PATCH] standardised subject

---
 lgsm/functions/alert_discord.sh    | 6 ++++--
 lgsm/functions/alert_email.sh      | 4 ++--
 lgsm/functions/alert_ifttt.sh      | 2 +-
 lgsm/functions/alert_rocketchat.sh | 2 +-
 lgsm/functions/alert_telegram.sh   | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 3ed12fe97..ac9923d09 100755
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -22,8 +22,10 @@ json=$(cat <<EOF
 	"file":"content",
 	"embeds": [{
 		"color": "2067276",
-		"author": {"name": "${alertemoji} ${alertsubject}", "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
-		"title": "",
+		"author": {
+			"name": "${alertemoji} ${alertsubject} ${alertemoji}",
+			"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
+		"title": "${escaped_servername}",
 		"description": ${escaped_alertbody},
 		"url": "",
 		"type": "content",
diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh
index f69f8f408..508002303 100755
--- a/lgsm/functions/alert_email.sh
+++ b/lgsm/functions/alert_email.sh
@@ -10,9 +10,9 @@ fn_print_dots "Sending Email alert: ${email}"
 fn_sleep_time
 
 if [ "${emailfrom}" ]; then
-	mail -s "${alertsubject}" -r "${emailfrom}" "${email}" < "${alertlog}"
+	mail -s "${alertemoji} ${alertsubject} ${alertemoji}" -r "${emailfrom}" "${email}" < "${alertlog}"
 else
-	mail -s "${alertsubject}" "${email}" < "${alertlog}"
+	mail -s "${alertemoji} ${alertsubject} ${alertemoji}" "${email}" < "${alertlog}"
 fi
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then
diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh
index 376dfed3a..eb1e7daea 100755
--- a/lgsm/functions/alert_ifttt.sh
+++ b/lgsm/functions/alert_ifttt.sh
@@ -9,7 +9,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 json=$(cat <<EOF
 {
 	"value1": "${selfname}",
-	"value2": "${alertsubject}",
+	"value2": "${alertemoji} ${alertsubject} ${alertemoji}",
 	"value3": "Message\n${alertbody}\n\nGame\n${gamename}\n\nServer name\n${servername}\n\nHostname\n${HOSTNAME}\n\nServer IP\n${alertip}:${port}\n\nMore info\n${alerturl}"
 }
 EOF
diff --git a/lgsm/functions/alert_rocketchat.sh b/lgsm/functions/alert_rocketchat.sh
index 5e062bb3d..082471e9b 100755
--- a/lgsm/functions/alert_rocketchat.sh
+++ b/lgsm/functions/alert_rocketchat.sh
@@ -14,7 +14,7 @@ fi
 json=$(cat <<EOF
 {
    "alias":"LinuxGSM",
-   "text":"* ${alertemoji} ${alertsubject}* + \n ${alertbody}",
+   "text":"*${alertemoji} ${alertsubject} ${alertemoji}* + \n ${alertbody}",
    "attachments":[
       {
          "title":"Linuxgsm Alert",
diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh
index 33662b756..341d79cb5 100755
--- a/lgsm/functions/alert_telegram.sh
+++ b/lgsm/functions/alert_telegram.sh
@@ -10,7 +10,7 @@ json=$(cat <<EOF
 {
 	"chat_id": "${telegramchatid}",
 	"parse_mode": "HTML",
-	"text": "${alertemoji} <b>${alertsubject}</b> ${alertemoji}\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
+	"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
 	"disable_web_page_preview": "yes",
 EOF
 )