fix (alerts): Alerts on update uses the old game server version not the new one

.shellcheckrc

@@ -1 +1 @@
-disable=SC2154
+disable=SC2154,SC2034

lgsm/modules/alert.sh

@@ -10,13 +10,9 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 # Generates alert log of the details at the time of the alert.
 # Used with email alerts.
 fn_alert_log() {
-	info_distro.sh
-	info_game.sh
-	info_messages.sh
 	if [ -f "${alertlog}" ]; then
 		rm -f "${alertlog:?}"
 	fi
-
 	{
 		fn_info_messages_head
 		fn_info_messages_distro
@@ -97,45 +93,66 @@ fn_alert_monitor_query() {
 
 # Update alerts
 fn_alert_update() {
-	fn_script_log_info "Sending alert: ${selfname} has received a game server update: ${localbuild}"
+	# If previousbuild is set show transition, else fallback to single version.
+	if [ -n "${previousbuild:-}" ] && [ -n "${localbuild:-}" ]; then
+		fn_script_log_info "Sending alert: ${selfname} updated: ${previousbuild} -> ${localbuild}"
+		alertmessage="${selfname} updated: ${previousbuild} -> ${localbuild}."
+	else
+		fn_script_log_info "Sending alert: ${selfname} updated to ${localbuild}"
+		alertmessage="${selfname} updated to ${localbuild}."
+	fi
 	alertaction="Updated"
 	alertemoji="🎉"
 	alertsound="1"
-	alertmessage="${selfname} has received a game server update: ${localbuild}."
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"
 }
 
-fn_alert_update_request() {
-	fn_script_log_info "Sending alert: ${selfname} has requested an update and needs to be restarted."
-	alertaction="Updating"
+# Update failure alert
+fn_alert_update_failed() {
+	# Expect updatefailureexpected (target version) and updatefailuregot (actual localbuild) if set
+	local updateexpected="${updatefailureexpected:-${remotebuild:-unknown}}"
+	local updategot="${updatefailuregot:-${localbuild:-unknown}}"
+	fn_script_log_error "Sending alert: ${selfname} update failed: expected ${updateexpected}, got ${updategot}"
+	alertaction="Update Failed"
+	alertemoji="❌"
+	alertsound="2"
+	alertmessage="${selfname} update failed: expected ${updateexpected}, got ${updategot}. Manual intervention required."
+	# Red
+	alertcolourhex="#cd0000"
+	alertcolourdec="13434880"
+}
+
+fn_alert_update_restart_request() {
+	fn_script_log_info "Sending alert: ${selfname} restart requested"
+	alertaction="Restart Requested"
 	alertemoji="🎉"
 	alertsound="1"
-	alertmessage="${selfname} has requested an update and needs to be restarted."
+	alertmessage="${selfname} has requested a restart for an update to be applied. Restarting now."
 	# Blue
 	alertcolourhex="#1e90ff"
 	alertcolourdec="2003199"
 }
 
 fn_alert_check_update() {
-	fn_script_log_info "Sending alert: ${gamename} update available: ${remotebuildversion}"
-	alertaction="Update available"
+	fn_script_log_info "Sending alert: ${gamename} update available: ${localbuild} -> ${remotebuild}"
+	alertaction="Update Available"
 	alertemoji="🎉"
 	alertsound="1"
-	alertmessage="${gamename} update available: ${remotebuildversion}"
+	alertmessage="${gamename} update available: ${localbuild} -> ${remotebuild}"
 	# Blue
 	alertcolourhex="#1e90ff"
 	alertcolourdec="2003199"
 }
 
 fn_alert_update_linuxgsm() {
-	fn_script_log_info "Sending alert: ${selfname} has received an LinuxGSM update"
+	fn_script_log_info "Sending alert: ${selfname} has received a LinuxGSM update"
 	alertaction="Updated"
 	alertemoji="🎉"
 	alertsound="1"
 	alertbody="${gamename} update available"
-	alertmessage="${selfname} has received an LinuxGSM update and been restarted."
+	alertmessage="${selfname} has received a LinuxGSM update and been restarted."
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"
@@ -197,8 +214,9 @@ fn_alert_info() {
 	alertcolourdec="2003199"
 }
 
-# Images
-alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/gameicons/${shortname}-icon.png"
+info_distro.sh
+info_game.sh
+info_messages.sh
 
 if [ "${alert}" == "permissions" ]; then
 	fn_alert_permissions
@@ -210,8 +228,10 @@ elif [ "${alert}" == "test" ]; then
 	fn_alert_test
 elif [ "${alert}" == "update" ]; then
 	fn_alert_update
-elif [ "${alert}" == "update-request" ]; then
-	fn_alert_update_request
+elif [ "${alert}" == "update-failed" ]; then
+	fn_alert_update_failed
+elif [ "${alert}" == "update-restart-request" ]; then
+	fn_alert_update_restart_request
 elif [ "${alert}" == "check-update" ]; then
 	fn_alert_check_update
 elif [ "${alert}" == "config" ]; then
@@ -237,6 +257,7 @@ else
 fi
 
 alerttitle="${alertemoji} ${alertaction} - ${servername} ${alertemoji}"
+alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/gameicons/${shortname}-icon.png"
 
 # Generate alert log.
 fn_alert_log

lgsm/modules/alert_discord.sh

@@ -43,39 +43,38 @@ json=$(
 					"inline": true
 				},
 				{
-					"name": "Server Time",
-					"value": "$(date)",
+					"name": "Server IP",
+					"value": "\`${alertip}:${port}\`",
 					"inline": true
 				},
 				{
-					"name": "More info",
-					"value": "${alerturl}",
+					"name": "Server Time",
+					"value": "$(date)",
 					"inline": true
 				}
 EOF
 )
 
-if [ -n "${querytype}" ]; then
+if [ -n "${alerturl}" ]; then
 	json+=$(
 		cat << EOF
 				,
 				{
-					"name": "Is my Game Server Online?",
-					"value": "https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}",
+					"name": "More info",
+					"value": "${alerturl}",
 					"inline": true
 				}
 EOF
 	)
 fi
 
-if [ -n "${alerturl}" ]; then
+if [ -n "${querytype}" ]; then
 	json+=$(
 		cat << EOF
 				,
 				{
-					"name": "More info",
-					"value": "${alerturl}",
-					"inline": true
+					"name": "Is my Game Server Online?",
+					"value": "https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}"
 				}
 EOF
 	)

lgsm/modules/alert_gotify.sh

@@ -11,7 +11,7 @@ json=$(
 	cat << EOF
 {
 	"title": "${alerttitle}",
-	"message": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n
+	"message": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
 EOF
 )
 

lgsm/modules/alert_ifttt.sh

@@ -12,7 +12,7 @@ json=$(
 {
 	"value1": "${selfname}",
 	"value2": "${alerttitle}",
-	"value3": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n
+	"value3": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
 EOF
 )
 

lgsm/modules/alert_ntfy.sh

@@ -35,23 +35,31 @@ else
 	tags="${alertemoji}"
 fi
 
-# Construct the message body
-message="Server Name: ${servername}
-Information: ${alertmessage}
-Game: ${gamename}
-Server IP: ${alertip}:${port}
-Hostname: ${HOSTNAME}
-Server Time: $(date)"
+# Construct the message body (keep formatting consistent with other plain-text alerts)
+message="Server Name
+${servername}
+
+Information
+${alertmessage}
+
+Game
+${gamename}
+
+Server IP
+${alertip}:${port}
+
+Server Time
+$(date)"
 
 # Add optional links if available
 if [ -n "${querytype}" ]; then
-	message+="\nIs my Game Server Online?: https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}"
+	message+="\n\nIs my Game Server Online?\nhttps://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}"
 fi
 
 # Use alerturl for the click action if available
 clickurl=""
 if [ -n "${alerturl}" ]; then
-	message+="\nMore info: ${alerturl}"
+	message+="\n\nMore info\n${alerturl}"
 	clickurl="${alerturl}"
 fi
 

lgsm/modules/alert_pushbullet.sh

@@ -13,7 +13,7 @@ json=$(
 	"channel_tag": "${channeltag}",
 	"type": "note",
 	"title": "${alerttitle}",
-	"body": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n
+	"body": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
 EOF
 )
 

lgsm/modules/alert_pushover.sh

@@ -22,7 +22,7 @@ else
 	alertpriority="0"
 fi
 
-message=" <b>Server name</b><br>${servername}<br><br><b>Information</b><br>${alertmessage}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br>${alertip}:${port}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br>"
+message=" <b>Server Name</b><br>${servername}<br><br><b>Information</b><br>${alertmessage}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br>${alertip}:${port}<br><br>"
 
 if [ -n "${querytype}" ]; then
 	message+="<b>Is my Game Server Online?</b><br><a href='https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}'>Check here</a><br><br>"
@@ -32,7 +32,7 @@ if [ -n "${alerturl}" ]; then
 	message+="<b>More info</b><br><a href='${alerturl}'>${alerturl}</a><br><br>"
 fi
 
-message+="Server Time<br>$(date)"
+message+="<b>Server Time</b><br>$(date)"
 
 pushoversend=$(curl --connect-timeout 3 -sS \
 	-F token="${pushovertoken}" \

lgsm/modules/alert_rocketchat.sh

@@ -40,94 +40,40 @@ json=$(
 				{
 					"short": false,
 					"title": "Server IP",
-					"value": "${alertip}:${port}"
-				},
-				{
-					"short": false,
-					"title": "Hostname",
-					"value": "${HOSTNAME}"
-				},
-				{
-					"short": false,
-					"title": "More info",
-					"value": "${alerturl}"
-				},
-				{
-					"short": false,
-					"title": "Server Time",
-					"value": "$(date)"
+					"value": "\`${alertip}:${port}\`"
 				}
-			]
-		}
-	]
-}
 EOF
 )
 
 if [ -n "${querytype}" ]; then
 	json+=$(
 		cat << EOF
+				,
 				{
 					"short": false,
 					"title": "Is my Game Server Online?",
 					"value": "<https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}|Check here>"
-				},
+				}
 EOF
 	)
 fi
 
 if [ -n "${alerturl}" ]; then
 	json+=$(
 		cat << EOF
+				,
 				{
 					"short": false,
 					"title": "More info",
 					"value": "${alerturl}"
-				},
+				}
 EOF
 	)
 fi
 
 json+=$(
 	cat << EOF
-{
-	"alias": "LinuxGSM",
-	"text": "*${alerttitle}*",
-	"attachments": [
-		{
-			"title": "",
-			"color": "${alertcolourhex}",
-			"author_name": "LinuxGSM Alert",
-			"author_link": "https://linuxgsm.com",
-			"author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
-			"thumb_url": "${alerticon}",
-			"text": "",
-			"fields": [
-				{
-					"short": false,
-					"title": "Server Name",
-					"value": "${servername}"
-				},
-				{
-					"short": false,
-					"title": "Information",
-					"value": "${alertmessage}"
-				},
-				{
-					"short": false,
-					"title": "Game",
-					"value": "${gamename}"
-				},
-				{
-					"short": false,
-					"title": "Server IP",
-					"value": "${alertip}:${port}"
-				},
-				{
-					"short": false,
-					"title": "Hostname",
-					"value": "${HOSTNAME}"
-				},
+				,
 				{
 					"short": false,
 					"title": "Server Time",