From c8e58e96d4ff5b0983a9a1b6e6d7f27165c7bb2c Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 15 Sep 2021 21:41:11 +0100
Subject: [PATCH] alert description

---
 lgsm/functions/alert.sh              | 16 ++++++++--------
 lgsm/functions/alert_discord.sh      |  2 +-
 lgsm/functions/alert_gotify.sh       |  2 +-
 lgsm/functions/alert_ifttt.sh        |  2 +-
 lgsm/functions/alert_pushbullet.sh   |  2 +-
 lgsm/functions/alert_pushover.sh     |  2 +-
 lgsm/functions/alert_rocketchat.sh   |  2 +-
 lgsm/functions/alert_slack.sh        |  2 +-
 lgsm/functions/alert_telegram.sh     |  2 +-
 lgsm/functions/command_test_alert.sh |  5 ++++-
 lgsm/functions/info_messages.sh      |  2 +-
 11 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index afce81a15..7dcc4cf84 100755
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -38,12 +38,12 @@ fn_alert_test(){
 }
 
 fn_alert_restart(){
-	fn_script_log_info "Sending alert: Restarted: ${executable} not running"
+	fn_script_log_info "Sending alert: Restarted: ${selfname}, ${executable} is not running"
 	alertsubject="Alert - ${selfname} - Restarted"
 	alertemoji="🚨"
 	alertsound="2"
 	alerturl="not enabled"
-	alertbody="${selfname} ${executable} not running"
+	alertbody="${selfname} is not running. Game Server has been restarted."
 	# Red
 	alertcolourhex="#cd0000"
 	alertcolourdec="13434880"
@@ -55,19 +55,19 @@ fn_alert_restart_query(){
 	alertemoji="🚨"
 	alertsound="2"
 	alerturl="not enabled"
-	alertbody="Unable to query: ${selfname}"
+	alertbody="Unable to query ${selfname}. Game server has been restarted"
 	# Red
 	alertcolourhex="#cd0000"
 	alertcolourdec="13434880"
 }
 
 fn_alert_update(){
-	fn_script_log_info "Sending alert: Updated"
+	fn_script_log_info "Sending alert: Updated: ${selfname}"
 	alertsubject="Alert - ${selfname} - Updated"
 	alertemoji="🎮"
 	alertsound="1"
 	alerturl="not enabled"
-	alertbody="${gamename} received update"
+	alertbody="${selfname} has received an update"
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"
@@ -79,7 +79,7 @@ fn_alert_check_update(){
 	alertemoji="🎮"
 	alertsound="1"
 	alerturl="not enabled"
-	alertbody="${gamename} update available"
+	alertbody="Update availablefor ${selfname}"
 	# Blue
 	alertcolourhex="#1e90ff"
 	alertcolourdec="2003199"
@@ -100,7 +100,7 @@ fn_alert_permissions(){
 fn_alert_config(){
 	fn_script_log_info "Sending alert: New _default.cfg"
 	alertsubject="Alert - ${selfname} - New _default.cfg"
-	alertemoji="🎮"
+	alertemoji="📄"
 	alertsound="1"
 	alerturl="not enabled"
 	alertbody="${selfname} has received a new _default.cfg. Check file for changes."
@@ -110,7 +110,7 @@ fn_alert_config(){
 }
 
 fn_alert_wipe(){
-	fn_script_log_info "Sending alert: Wiped: ${executable} not running"
+	fn_script_log_info "Sending alert: Wiped: ${selfname} wiped"
 	alertsubject="Alert - ${selfname} - Wiped"
 	alertemoji="💿"
 	alertsound="1"
diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index e9d8c3ca4..10b5acd37 100755
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -51,7 +51,7 @@ json=$(cat <<EOF
 				},
 				{
 					"name": "Information",
-					"value": "${alertbody} \n More info: ${alerturl}"
+					"value": "${alertdescription} \n More info: ${alerturl}"
 				}
 			],
 			"thumbnail": {
diff --git a/lgsm/functions/alert_gotify.sh b/lgsm/functions/alert_gotify.sh
index d94a42d94..bb61c470e 100644
--- a/lgsm/functions/alert_gotify.sh
+++ b/lgsm/functions/alert_gotify.sh
@@ -10,7 +10,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 json=$(cat <<EOF
 {
 	"title": "${alertemoji} ${alertsubject} ${alertemoji}",
-	"message": "Server name\n${servername}\n\nMessage\n${alertbody}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}",
+	"message": "Server name\n${servername}\n\nMessage\n${alertdescription}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}",
 	"priority": 5
 }
 EOF
diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh
index 918a8a759..804e0c7e0 100755
--- a/lgsm/functions/alert_ifttt.sh
+++ b/lgsm/functions/alert_ifttt.sh
@@ -11,7 +11,7 @@ json=$(cat <<EOF
 {
 	"value1": "${selfname}",
 	"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}"
+	"value3": "Message: \n${alertdescription}\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_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh
index f9c797ed5..6206b00be 100755
--- a/lgsm/functions/alert_pushbullet.sh
+++ b/lgsm/functions/alert_pushbullet.sh
@@ -12,7 +12,7 @@ json=$(cat <<EOF
 	"channel_tag": "${channeltag}",
 	"type": "note",
 	"title": "${alertemoji} ${alertsubject} ${alertemoji}",
-	"body": "Server name\n${servername}\n\nMessage\n${alertbody}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}"
+	"body": "Server name\n${servername}\n\nMessage\n${alertdescription}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\nMore info\n${alerturl}"
 }
 EOF
 )
diff --git a/lgsm/functions/alert_pushover.sh b/lgsm/functions/alert_pushover.sh
index b8b866cb8..b4bc96fce 100755
--- a/lgsm/functions/alert_pushover.sh
+++ b/lgsm/functions/alert_pushover.sh
@@ -22,7 +22,7 @@ else
 	alertpriority="0"
 fi
 
-pushoversend=$(curl --connect-timeout 10 -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Server name</b><br>${servername}<br><br><b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
+pushoversend=$(curl --connect-timeout 10 -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Server name</b><br>${servername}<br><br><b>Message</b><br>${alertdescription}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
 
 if [ -n "${pushoversend}" ]; then
 	fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"
diff --git a/lgsm/functions/alert_rocketchat.sh b/lgsm/functions/alert_rocketchat.sh
index 23f43bce2..90cb0b25c 100755
--- a/lgsm/functions/alert_rocketchat.sh
+++ b/lgsm/functions/alert_rocketchat.sh
@@ -10,7 +10,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 json=$(cat <<EOF
 {
 	"alias": "LinuxGSM",
-	"text": "*${alertemoji} ${alertsubject} ${alertemoji}* \n *${servername}* \n ${alertbody} \n More info: ${alerturl}",
+	"text": "*${alertemoji} ${alertsubject} ${alertemoji}* \n *${servername}* \n ${alertdescription} \n More info: ${alerturl}",
 	"attachments": [
 		{
 			"fields": [
diff --git a/lgsm/functions/alert_slack.sh b/lgsm/functions/alert_slack.sh
index 437dbe819..a53767e80 100755
--- a/lgsm/functions/alert_slack.sh
+++ b/lgsm/functions/alert_slack.sh
@@ -24,7 +24,7 @@ json=$(cat <<EOF
 										"type": "section",
 										"text": {
 												"type": "mrkdwn",
-												"text": "*${alertemoji} ${alertsubject}* \n ${alertbody}"
+												"text": "*${alertemoji} ${alertsubject}* \n ${alertdescription}"
 										}
 								},
 								{
diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh
index de5dd2714..57eb84e49 100755
--- a/lgsm/functions/alert_telegram.sh
+++ b/lgsm/functions/alert_telegram.sh
@@ -11,7 +11,7 @@ json=$(cat <<EOF
 {
 	"chat_id": "${telegramchatid}",
 	"parse_mode": "HTML",
-	"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
+	"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Server name</b>\n${servername}\n\n<b>Message</b>\n${alertdescription}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
 	"disable_web_page_preview": "yes",
 EOF
 )
diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh
index 7fe61e48a..1cf41524e 100755
--- a/lgsm/functions/command_test_alert.sh
+++ b/lgsm/functions/command_test_alert.sh
@@ -13,7 +13,10 @@ fn_firstcommand_set
 fn_print_dots "${servername}"
 check.sh
 info_game.sh
-alert="test"
+alert="${userinput2}"
+if [ -z "${alert}" ]; then
+	alert="test"
+fi
 alert.sh
 
 core_exit.sh
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index 30c4bb724..f7c1bc752 100755
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -60,7 +60,7 @@ fn_info_message_head(){
 	echo -e "${lightyellow}Alert Summary${default}"
 	fn_messages_separator
 	echo -e "Message"
-	echo -e "${alertbody}"
+	echo -e "${alertdescription}"
 	echo -e ""
 	echo -e "Game"
 	echo -e "${gamename}"