Browse Source
fix: update Pushover alert message formatting
The commit fixes the formatting of the Pushover alert message by removing unnecessary information and adding a conditional check for the presence of an alert URL.
pull/4345/head
Daniel Gibbs
2 years ago
No known key found for this signature in database
GPG Key ID: 2076B128385E8C55
1 changed files with
5 additions and
1 deletions
lgsm/modules/alert_pushover.sh
@ -22,7 +22,11 @@ else
alertpriority = "0"
alertpriority = "0"
fi
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 } ${ alerttitle } ${ alertemoji } " -F message = " <b>Server name</b><br> ${ servername } <br><br><b>Message</b><br> ${ alertmessage } <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 [ -z " ${ alerturl } " ] ; then
pushoversend = $( curl --connect-timeout 10 -sS -F token = " ${ pushovertoken } " -F user = " ${ pushoveruserkey } " -F html = "1" -F sound = " ${ alertsound } " -F priority = " ${ alertpriority } " -F title = " ${ alerttitle } " -F 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 } " "https://api.pushover.net/1/messages.json" | grep errors)
else
pushoversend = $( curl --connect-timeout 10 -sS -F token = " ${ pushovertoken } " -F user = " ${ pushoveruserkey } " -F html = "1" -F sound = " ${ alertsound } " -F priority = " ${ alertpriority } " -F title = " ${ alerttitle } " -F 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><b>More info</b><br><a href=' ${ alerturl } '> ${ alerturl } </a> " "https://api.pushover.net/1/messages.json" | grep errors)
fi
if [ -n " ${ pushoversend } " ] ; then
if [ -n " ${ pushoversend } " ] ; then
fn_print_fail_nl " Sending Pushover alert: ${ pushoversend } "
fn_print_fail_nl " Sending Pushover alert: ${ pushoversend } "