Merge pull request #187 from GeneralPractitioner-GP/escape-double-quotes

Author: Drazzilb08

extra-scripts/backup_appdata.sh

@@ -562,20 +562,20 @@ send_notification() {
     # Get a random joke from the specified file
     # Check if the webhook is for discord
     if [[ "$webhook" =~ ^https://discord\.com/api/webhooks/ ]]; then
-        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
         discord_common_fields
         bot_name="Notification Bot"
         # Call the discord_payload function to construct the payload
         if [ ${#new_container[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
             new_container_notification
             new_container_response=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then
                 echo "$new_container_response"
             fi
         fi
         if [ ${#removed_containers[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
             removed_container_notification
             removed_container=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then
@@ -594,19 +594,19 @@ send_notification() {
     fi
     # Check if the webhook is for notifiarr
     if [[ $webhook =~ ^https://notifiarr\.com/api/v1/notification/passthrough ]]; then
-        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+        joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
         notifiarr_common_fields
         # Call the notifiarr_payload function to construct the payload
         if [ ${#new_container[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
             new_container_notification
             new_container_response=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then
                 echo "$new_container_response"
             fi
         fi
         if [ ${#removed_containers[@]} -gt 0 ]; then
-            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+            joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
             removed_container_notification
             removed_container=$(curl -s -H "Content-Type: application/json" -X POST -d "$payload" "$webhook")
             if [ "$dry_run" == "true" ]; then

extra-scripts/backup_folder.sh

@@ -202,7 +202,7 @@ send_notification() {
     # Get current time in UTC format
     get_ts=$(date -u -Iseconds)
     # Get a random joke from the specified file
-    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
+    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
     # Check if the webhook is for discord
     if [[ $webhook =~ ^https://discord\.com/api/webhooks/ ]]; then
         # Call the discord_payload function to construct the payload

extra-scripts/backup_plex.sh

@@ -223,11 +223,7 @@ field_builder() {
 build_payload(){
     get_ts=$(date -u -Iseconds)
     # Get a random joke from the specified file
-    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1)
-    # ensure joke is valid for json
-    # shellcheck disable=SC2001
-    joke=$(echo "$joke" | sed 's/"/\\"/g')    
-    # ensure jokes is valid for json
+    joke=$(curl -s https://raw.githubusercontent.com/Drazzilb08/daps/master/jokes.txt | shuf -n 1 | sed 's/"/\\"/g')
     if [[ $webhook =~ ^https://discord\.com/api/webhooks/ ]]; then
         bot_name="Notification Bot"
         title="name"

schemas/config-schema.json

@@ -466,7 +466,10 @@
                 },
                 "ignore_media":
                 {
-                    "type":"string"
+                    "type": [
+                        "array",
+                        "null"
+                    ]
                 },
                 "ignore_collections": {
                     "$ref": "#/definitions/uniqueArray"