From dcfe95a2f22cb64ec691ebd4536382f12be4ed30 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 5 Dec 2020 18:49:47 +0200
Subject: [PATCH] Fixes to spammer.

- Restart in case of an error. Should be more robust for handling errors
and is a bit simpler.
- Better decoding of messages (forgot I wrote that one).
---
 Documents/bin/spammer | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Documents/bin/spammer b/Documents/bin/spammer
index d1f9fc0..dab9fd8 100755
--- a/Documents/bin/spammer
+++ b/Documents/bin/spammer
@@ -1,23 +1,19 @@
 #!/bin/sh
 set -eu
 
+# In case of an error, backof and reexec.
+trap 'echo "Caught error, restarting..." >&2; sleep 1; exec $HOME/Documents/bin/spammer' EXIT
+
 export PATH="$HOME/Documents/bin:$PATH"
 URL='https://patchbay.pub/pubsub/1446c969-9a54-4b5b-83e0-bf88f22f289d'
 
 while true
 do
-    message="$(curl --silent "$URL" || true)"
-    exitstatus="$?"
-    # Backoff in case of an error.
-    if [ -z "${message:-}" ] || [ "$exitstatus" -gt '0' ]
-    then
-        sleep 1
-        break
-    fi
+    message="$(curl --silent "$URL")"
     logger --tag "spammer" "$message"
     if echo "$message" | grep --silent '^message='
     then
-        message="$(echo "$message" | sed 's/message=//; s/+/ /g')"
+        message="$(echo "$message" | urldecode | sed 's/message=//')"
     fi
     echo "$message" | notify \
         --urgency low \
-- 
GitLab