From 14196ed68da4bb959e2bd3a33a6e42ad3f4d6bba Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 17 Oct 2021 22:08:58 +0100
Subject: [PATCH] add server date

---
 lgsm/functions/alert.sh            | 23 +++++++++++++++++------
 lgsm/functions/alert_discord.sh    | 11 +++++++----
 lgsm/functions/alert_rocketchat.sh | 17 +++++++++++------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index 5ff954e3a..d79d5dec7 100644
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -64,27 +64,38 @@ fn_alert_restart_query(){
 }
 
 fn_alert_update(){
-	fn_script_log_info "Sending alert: Updated: ${selfname}"
-	alerttitle="Alert - ${selfname} - Updated"
+	fn_script_log_info "Sending alert: Game server updated: ${selfname}"
+	alerttitle="Alert - ${selfname} - Game server updated"
 	alertemoji="🎉"
 	alertsound="1"
-	alerttriggermessage="${selfname} has received an update."
+	alerttriggermessage="${selfname} has received an game server update."
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"
 }
 
 fn_alert_check_update(){
-	fn_script_log_info "Sending alert: Update available"
-	alerttitle="Alert - ${selfname} - Update available"
+	fn_script_log_info "Sending alert: Game server update available"
+	alerttitle="Alert - ${selfname} - Game server Update available"
 	alertemoji="💿"
 	alertsound="1"
-	alerttriggermessage="Update available for ${selfname}."
+	alerttriggermessage="Game server update available for ${selfname}."
 	# Blue
 	alertcolourhex="#1e90ff"
 	alertcolourdec="2003199"
 }
 
+fn_alert_update_linuxgsm(){
+	fn_script_log_info "Sending alert: LinuxGSM updated: ${selfname}"
+	alerttitle="Alert - ${selfname} - LinuxGSM updated"
+	alertemoji="🎉"
+	alertsound="1"
+	alerttriggermessage="${selfname} has received a LinuxGSM update."
+	# Green
+	alertcolourhex="#00cd00"
+	alertcolourdec="52480"
+}
+
 fn_alert_permissions(){
 	fn_script_log_info "Sending alert: Permissions error"
 	alerttitle="Alert - ${selfname}: Permissions error"
diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 4e938d5c2..8bf3268c0 100755
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -25,9 +25,8 @@ json=$(cat <<EOF
 			"color": "${alertcolourdec}",
 			"fields": [
 				{
-				"name": "Game",
-				"value": "${gamename}",
-				"inline": true
+					"name": "Game",
+					"value": "${gamename}"
 				},
 				{
 				"name": "${alertplayerstitle}",
@@ -54,6 +53,10 @@ json=$(cat <<EOF
 				"value": "${alertversion}",
 				"inline": true
 				},
+				"name": "Server time",
+				"value": "$(date)",
+				"inline": true
+				},
 				{
 					"name": "Trigger Message",
 					"value": "${alerttriggermessage}"
@@ -70,7 +73,7 @@ json=$(cat <<EOF
 				"url": "${alertimage}"
 			},
 			"footer": {
-				"text": "Powered by LinuxGSM ${version}",
+				"text": "Powered by LinuxGSM ${version} - $(date)",
 				"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
 			}
 		}
diff --git a/lgsm/functions/alert_rocketchat.sh b/lgsm/functions/alert_rocketchat.sh
index 936c2c683..355d8ccf0 100755
--- a/lgsm/functions/alert_rocketchat.sh
+++ b/lgsm/functions/alert_rocketchat.sh
@@ -10,24 +10,24 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 json=$(cat <<EOF
 {
 	"alias": "LinuxGSM",
-	"text": "*${servername}*\n${alertemoji} ${alerttitle} ${alertemoji}\n\n*Trigger Message*\n${alerttriggermessage}\n\n*More info*\n${alertmoreinfourl}",
+	"text": "*${servername}*\n${alertemoji} ${alerttitle} ${alertemoji}\n\n*Trigger Message*\n${alerttriggermessage}\n\n*More info*\n${alertmoreinfourl}\n\n*Game*\n${gamename}",
 	"attachments": [
 		{
 			"fields": [
 				{
 					"short": true,
-					"title": "Game",
-					"value": "${gamename}"
+					"title": "Map",
+					"value": "${alertmap}"
 				},
 				{
 					"short": true,
 					"title": "${alertplayerstitle}",
-					"value": "${gamename}"
+					"value": "${alertmap}"
 				},
 				{
 					"short": true,
-					"title": "Map",
-					"value": "${alertmap}"
+					"title": "Server Time",
+					"value": "$(date)"
 				},
 				{
 					"short": true,
@@ -44,6 +44,11 @@ json=$(cat <<EOF
 					"title": "Version",
 					"value": "${alertversion}"
 				}
+				{
+					"short": true,
+					"title": "Version",
+					"value": "${alertversion}"
+				}
 			]
 		}
 	]