From 839032a59fa95ec436b248a64384753635b91e64 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Tue, 24 Sep 2024 22:45:25 +0100 Subject: [PATCH] bug --- lgsm/modules/alert_discord.sh | 3 +-- lgsm/modules/alert_gotify.sh | 6 +++--- lgsm/modules/alert_ifttt.sh | 6 +++--- lgsm/modules/alert_pushbullet.sh | 8 ++++---- lgsm/modules/alert_rocketchat.sh | 20 ++++++++++---------- lgsm/modules/alert_slack.sh | 28 ++++++++++++++-------------- lgsm/modules/alert_telegram.sh | 12 ++++++------ 7 files changed, 41 insertions(+), 42 deletions(-) diff --git a/lgsm/modules/alert_discord.sh b/lgsm/modules/alert_discord.sh index 08fd8d969..20d7a145a 100644 --- a/lgsm/modules/alert_discord.sh +++ b/lgsm/modules/alert_discord.sh @@ -86,8 +86,7 @@ jsonnoinfo=$( "inline": true }, EOF - ) -fi +) json+=$( cat << EOF diff --git a/lgsm/modules/alert_gotify.sh b/lgsm/modules/alert_gotify.sh index 8673ebc23..6ba1106e1 100644 --- a/lgsm/modules/alert_gotify.sh +++ b/lgsm/modules/alert_gotify.sh @@ -10,8 +10,8 @@ module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" 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 + "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 EOF ) @@ -34,7 +34,7 @@ fi json+=$( cat << EOF Server Time\n$(date)", - "priority": 5 + "priority": 5 } EOF ) diff --git a/lgsm/modules/alert_ifttt.sh b/lgsm/modules/alert_ifttt.sh index 2e23a1bab..16d78c807 100644 --- a/lgsm/modules/alert_ifttt.sh +++ b/lgsm/modules/alert_ifttt.sh @@ -10,9 +10,9 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$( cat << EOF { - "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 + "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 EOF ) diff --git a/lgsm/modules/alert_pushbullet.sh b/lgsm/modules/alert_pushbullet.sh index 56b329b15..10407026f 100644 --- a/lgsm/modules/alert_pushbullet.sh +++ b/lgsm/modules/alert_pushbullet.sh @@ -10,10 +10,10 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$( cat << EOF { - "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 + "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 EOF ) diff --git a/lgsm/modules/alert_rocketchat.sh b/lgsm/modules/alert_rocketchat.sh index acd1e58f9..7d9b67e66 100644 --- a/lgsm/modules/alert_rocketchat.sh +++ b/lgsm/modules/alert_rocketchat.sh @@ -67,11 +67,11 @@ EOF if [ -n "${querytype}" ]; then json+=$( cat << EOF - { - "short": false, - "title": "Is my Game Server Online?", - "value": "" - }, + { + "short": false, + "title": "Is my Game Server Online?", + "value": "" + }, EOF ) fi @@ -79,11 +79,11 @@ fi if [ -n "${alerturl}" ]; then json+=$( cat << EOF - { - "short": false, - "title": "More info", - "value": "${alerturl}" - }, + { + "short": false, + "title": "More info", + "value": "${alerturl}" + }, EOF ) fi diff --git a/lgsm/modules/alert_slack.sh b/lgsm/modules/alert_slack.sh index 691160123..15e7d5036 100644 --- a/lgsm/modules/alert_slack.sh +++ b/lgsm/modules/alert_slack.sh @@ -90,13 +90,13 @@ EOF if [ -n "${querytype}" ]; then json+=$( cat << EOF - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "*Is my Game Server Online?*\n" - } - }, + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "*Is my Game Server Online?*\n" + } + }, EOF ) fi @@ -104,13 +104,13 @@ fi if [ -n "${alerturl}" ]; then json+=$( cat << EOF - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "*More info*\n<${alerturl}|${alerturl}>" - } - }, + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "*More info*\n<${alerturl}|${alerturl}>" + } + }, EOF ) fi diff --git a/lgsm/modules/alert_telegram.sh b/lgsm/modules/alert_telegram.sh index c3394898b..138b4b3f6 100644 --- a/lgsm/modules/alert_telegram.sh +++ b/lgsm/modules/alert_telegram.sh @@ -10,11 +10,11 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" json=$( cat << EOF { - "chat_id": "${telegramchatid}", - "message_thread_id": "${telegramthreadid}", - "parse_mode": "HTML", - "disable_notification": "${telegramdisablenotification}", - "text": "${alerttitle}\n\nServer name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n + "chat_id": "${telegramchatid}", + "message_thread_id": "${telegramthreadid}", + "parse_mode": "HTML", + "disable_notification": "${telegramdisablenotification}", + "text": "${alerttitle}\n\nServer name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n EOF ) @@ -37,7 +37,7 @@ fi json+=$( cat << EOF Server Time\n$(date)", - "disable_web_page_preview": "yes" + "disable_web_page_preview": "yes" } EOF )