From 3b43b7987d81dcbf4f846a0a51e660f3edc396cd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 17 Sep 2020 14:15:51 +0100
Subject: [PATCH] remove escaped

---
 lgsm/functions/alert.sh            | 4 ----
 lgsm/functions/alert_discord.sh    | 6 +++---
 lgsm/functions/alert_ifttt.sh      | 2 +-
 lgsm/functions/alert_pushbullet.sh | 2 +-
 lgsm/functions/alert_pushover.sh   | 2 +-
 lgsm/functions/alert_rocketchat.sh | 4 ++--
 lgsm/functions/alert_slack.sh      | 4 ++--
 lgsm/functions/alert_telegram.sh   | 5 +----
 8 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index 364d76f10..d428e527e 100755
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -79,10 +79,6 @@ info_distro.sh
 info_config.sh
 info_messages.sh
 
-# JSON-safe escaping string. - use this is json based alerts
-escaped_servername=$(echo -n "${servername}" | jq -sRr "@json")
-escaped_alertbody=$(echo -n "${alertbody}" | jq -sRr "@json")
-
 if [ "${alert}" == "permissions" ]; then
 	fn_alert_permissions
 elif [ "${alert}" == "restart" ]; then
diff --git a/lgsm/functions/alert_discord.sh b/lgsm/functions/alert_discord.sh
index 3a35cdc60..b2075a883 100755
--- a/lgsm/functions/alert_discord.sh
+++ b/lgsm/functions/alert_discord.sh
@@ -22,8 +22,8 @@ json=$(cat <<EOF
     "author": {
       "name": "${alertemoji} ${alertsubject} ${alertemoji}",
       "icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.png"},
-    "title": "${escaped_servername}",
-    "description": ${escaped_alertbody},
+    "title": "${servername}",
+    "description": "${alertbody}",
     "url": "",
     "type": "content",
     "thumbnail": {},
@@ -41,7 +41,7 @@ json=$(cat <<EOF
       },
       {
         "name": "Server Name",
-        "value": ${escaped_servername},
+        "value": "${servername}",
         "inline": true
       }
     ]
diff --git a/lgsm/functions/alert_ifttt.sh b/lgsm/functions/alert_ifttt.sh
index 324f7ceff..ceb494f67 100755
--- a/lgsm/functions/alert_ifttt.sh
+++ b/lgsm/functions/alert_ifttt.sh
@@ -10,7 +10,7 @@ json=$(cat <<EOF
 {
   "value1": "${selfname}",
   "value2": "${alertemoji} ${alertsubject} ${alertemoji}",
-  "value3": "Message: \n${escaped_alertbody}\n\nGame: \n${gamename}\n\nServer name: \n${escaped_servername}\n\nHostname: \n${HOSTNAME}\n\nServer IP: \n${alertip}:${port}\n\nMore info: \n${alerturl}"
+  "value3": "Message: \n${alertbody}\n\nGame: \n${gamename}\n\nServer name: \n${servername}\n\nHostname: \n${HOSTNAME}\n\nServer IP: \n${alertip}:${port}\n\nMore info: \n${alerturl}"
 }
 EOF
 )
diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh
index eba8a664b..c7a34549f 100755
--- a/lgsm/functions/alert_pushbullet.sh
+++ b/lgsm/functions/alert_pushbullet.sh
@@ -11,7 +11,7 @@ json=$(cat <<EOF
   "channel_tag": "${channeltag}",
   "type": "note",
   "title": "${alertemoji} ${alertsubject} ${alertemoji}",
-  "body": "Message\n${escaped_alertbody}\n\nGame\n${gamename}\n\nServer name\n${escaped_servername}\n\nHostname\n${HOSTNAME}\n\nServer IP\n${alertip}:${port}\n\nMore info\n${alerturl}"
+  "body": "Message\n${alertbody}\n\nGame\n${gamename}\n\nServer name\n${servername}\n\nHostname\n${HOSTNAME}\n\nServer IP\n${alertip}:${port}\n\nMore info\n${alerturl}"
 }
 EOF
 )
diff --git a/lgsm/functions/alert_pushover.sh b/lgsm/functions/alert_pushover.sh
index 5c75e94de..1a768e6fa 100755
--- a/lgsm/functions/alert_pushover.sh
+++ b/lgsm/functions/alert_pushover.sh
@@ -21,7 +21,7 @@ else
 	alertpriority="0"
 fi
 
-pushoversend=$(curl -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Message</b><br>${escaped_alertbody}<br><br><b>Game</b><br>${escaped_gamename}<br><br><b>Server name</b><br>${servername}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
+pushoversend=$(curl -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}"  -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server name</b><br>${servername}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
 
 if [ "${pushoversend}" ]; then
 	fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"
diff --git a/lgsm/functions/alert_rocketchat.sh b/lgsm/functions/alert_rocketchat.sh
index 187c352f1..77cb56dc8 100755
--- a/lgsm/functions/alert_rocketchat.sh
+++ b/lgsm/functions/alert_rocketchat.sh
@@ -14,7 +14,7 @@ fi
 json=$(cat <<EOF
 {
   "alias": "LinuxGSM",
-  "text": "*${alertemoji} ${alertsubject} ${alertemoji}* + \n ${escaped_alertbody}",
+  "text": "*${alertemoji} ${alertsubject} ${alertemoji}* + \n ${alertbody}",
   "attachments": [
     {
       "title": "Linuxgsm Alert",
@@ -34,7 +34,7 @@ json=$(cat <<EOF
         {
           "short": true,
           "title": "Server Name:",
-          "value": "${escaped_servername}"
+          "value": "${servername}"
         }
       ]
     }
diff --git a/lgsm/functions/alert_slack.sh b/lgsm/functions/alert_slack.sh
index df9544aee..8a12f2d90 100755
--- a/lgsm/functions/alert_slack.sh
+++ b/lgsm/functions/alert_slack.sh
@@ -28,7 +28,7 @@ json=$(cat <<EOF
           "type": "section",
           "text": {
             "type": "mrkdwn",
-            "text": "*${alertemoji} ${alertsubject} ${alertemoji}* \n ${escaped_alertbody}"
+            "text": "*${alertemoji} ${alertsubject} ${alertemoji}* \n ${alertbody}"
           }
         },
         {
@@ -47,7 +47,7 @@ json=$(cat <<EOF
             },
             {
               "type": "mrkdwn",
-              "text": "*Server Name:* \n ${escaped_servername}"
+              "text": "*Server Name:* \n ${servername}"
             }
           ]
         },
diff --git a/lgsm/functions/alert_telegram.sh b/lgsm/functions/alert_telegram.sh
index 6c36492b0..2cf5792aa 100755
--- a/lgsm/functions/alert_telegram.sh
+++ b/lgsm/functions/alert_telegram.sh
@@ -6,14 +6,11 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-escaped_servername=$(echo -n "${servername}" | jq -sRr "@json")
-escaped_alertbody=$(echo -n "${alertbody}" | jq -sRr "@json")
-
 json=$(cat <<EOF
 {
   "chat_id": "${telegramchatid}",
   "parse_mode": "HTML",
-  "text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Message</b>\n${escaped_alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${escaped_servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
+  "text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
   "disable_web_page_preview": "yes",
 EOF
 )