From 4ee4ead9a5397a3141561fa6c269f59e2f20c5df Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Mon, 21 Aug 2017 20:22:29 +0100
Subject: [PATCH] Pushbullet now uses json

---
 lgsm/functions/alert_pushbullet.sh | 42 ++++++++++--------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/lgsm/functions/alert_pushbullet.sh b/lgsm/functions/alert_pushbullet.sh
index b228796f6..4b5e3eab9 100644
--- a/lgsm/functions/alert_pushbullet.sh
+++ b/lgsm/functions/alert_pushbullet.sh
@@ -2,44 +2,30 @@
 # LinuxGSM alert_pushbullet.sh function
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
-# Description: Sends Pushbullet alert.
+# Description: Sends Pushbullet Messenger alert.
 
 local commandname="ALERT"
 local commandaction="Alert"
 local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
-# converts text to ascii then passes to curl. allowing special characters to be sent e.g %
-# http://stackoverflow.com/a/10660730
-fn_rawurlencode() {
-	local string="${1}"
-	local strlen=${#string}
-	local encoded=""
-	local pos c o
-
-	for (( pos=0 ; pos<strlen ; pos++ )); do
-		 c=${string:$pos:1}
-		 case "$c" in
-				[-_.~a-zA-Z0-9] ) o="${c}" ;;
-				* )               printf -v o '%%%02x' "'$c"
-		 esac
-		 encoded+="${o}"
-	done
-	echo "${encoded}"
+json=$(cat <<EOF
+{
+	"channel_tag": "${channeltag}",
+	"type": "note",
+	"title": "${alertemoji} ${alertsubject} ${alertemoji}",
+	"body": "${alertbody}"
 }
-
-pbalertbody=$(fn_rawurlencode "Message: ${alertbody} - More Info: ${alerturl}")
-pbalertsubject=$(fn_rawurlencode "${alertsubject}")
+EOF
+)
 
 fn_print_dots "Sending Pushbullet alert"
 sleep 0.5
-pushbulletsend=$(curl --silent -u """${pushbullettoken}"":" -d channel_tag="${channeltag}" -d type="note" -d body="${pbalertbody}" -d title="${alertemoji} ${pbalertsubject} ${alertemoji}" 'https://api.pushbullet.com/v2/pushes')
+pushbulletsend=$(curl -sSL -u """${pushbullettoken}"":" -H "Content-Type: application/json" -X POST -d """${json}""" "https://api.pushbullet.com/v2/pushes" | grep "error_code")
 
-pberror=$(echo "${pushbulletsend}" |grep "error_code")
-pberrormsg=$(echo "${pushbulletsend}" |sed -n -e 's/^.*error_code//p' | tr -d '=\";,:{}')
-if [ -n "${pberror}" ]; then
-	fn_print_fail_nl "Sending Pushbullet alert: ${pberrormsg}"
-	fn_script_log_fatal "Sending Pushbullet alert: ${pberrormsg}"
+if [ -n "${pushbulletsend}" ]; then
+	fn_print_fail_nl "Sending Pushbullet alert: ${pushbulletsend}"
+	fn_script_log_fatal "Sending Pushbullet alert: ${pushbulletsend}"
 else
 	fn_print_ok_nl "Sending Pushbullet alert"
 	fn_script_log_pass "Sent Pushbullet alert"
-fi
\ No newline at end of file
+fi