diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh index 8810b5329..3ad62d89a 100644 --- a/lgsm/functions/alert.sh +++ b/lgsm/functions/alert.sh @@ -36,7 +36,7 @@ fn_alert_test(){ alertemoji="๐Ÿšง" alertsound="1" alerturl="not enabled" - alertmessage="Testing LinuxGSM Alert. No action to be taken." + alerttriggermessage="Testing LinuxGSM Alert. No action to be taken." # Green alertcolourhex="#cdcd00" alertcolourdec="13487360" @@ -48,7 +48,7 @@ fn_alert_restart(){ alertemoji="๐Ÿšจ" alertsound="2" alerturl="not enabled" - alertmessage="${selfname} is not running. Game Server has been restarted." + alerttriggermessage="${selfname} is not running. Game Server has been restarted." # Red alertcolourhex="#cd0000" alertcolourdec="13434880" @@ -60,7 +60,7 @@ fn_alert_restart_query(){ alertemoji="๐Ÿšจ" alertsound="2" alerturl="not enabled" - alertmessage="Unable to query ${selfname}. Game server has been restarted" + alerttriggermessage="Unable to query ${selfname}. Game server has been restarted." # Red alertcolourhex="#cd0000" alertcolourdec="13434880" @@ -72,7 +72,7 @@ fn_alert_update(){ alertemoji="๐ŸŽ‰" alertsound="1" alerturl="not enabled" - alertmessage="${selfname} has received an update" + alerttriggermessage="${selfname} has received an update." # Green alertcolourhex="#00cd00" alertcolourdec="52480" @@ -84,7 +84,7 @@ fn_alert_check_update(){ alertemoji="๐Ÿ’ฟ" alertsound="1" alerturl="not enabled" - alertmessage="Update availablefor ${selfname}" + alerttriggermessage="Update available for ${selfname}." # Blue alertcolourhex="#1e90ff" alertcolourdec="2003199" @@ -96,7 +96,7 @@ fn_alert_permissions(){ alertemoji="โ—" alertsound="2" alerturl="not enabled" - alertmessage="${selfname} has permissions issues" + alerttriggermessage="${selfname} has permissions issues." # Red alertcolourhex="#cd0000" alertcolourdec="13434880" @@ -108,7 +108,7 @@ fn_alert_config(){ alertemoji="๐Ÿ“„" alertsound="1" alerturl="not enabled" - alertmessage="${selfname} has received a new _default.cfg. Check file for changes." + alerttriggermessage="${selfname} has received a new _default.cfg. Check file for changes." # Blue alertcolourhex="#1e90ff" alertcolourdec="2003199" @@ -120,7 +120,7 @@ fn_alert_wipe(){ alertemoji="๐Ÿงน" alertsound="1" alerturl="not enabled" - alertmessage="${selfname} as been wiped." + alerttriggermessage="${selfname} as been wiped." # Green alertcolourhex="#00cd00" alertcolourdec="52480" diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh index dfb1d46ed..69cde964c 100755 --- a/lgsm/functions/alert_discord.sh +++ b/lgsm/functions/alert_discord.sh @@ -55,8 +55,8 @@ json=$(cat <${servername}

Message
${alertmessage}

Game
${gamename}

${alertplayerstitle}
${alertplayers}

Map
${alertmap}

Server IP
${alertip}:${port}

Hostname
${HOSTNAME}

More info
${alerturl}" + "value3": "Server name
${servername}

Trigger Message
${alerttriggermessage}

Game
${gamename}

${alertplayerstitle}
${alertplayers}

Map
${alertmap}

Server IP
${alertip}:${port}

Hostname
${HOSTNAME}

More info
${alerturl}" } EOF ) diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh index cea5f85d1..acb10e608 100755 --- a/lgsm/functions/alert_pushbullet.sh +++ b/lgsm/functions/alert_pushbullet.sh @@ -12,7 +12,7 @@ json=$(cat <