From 8fbcb07267fc8d705a7362d37d965c9939692427 Mon Sep 17 00:00:00 2001
From: Douglas Maitelli <dougmaitelli@gmail.com>
Date: Sun, 27 Jul 2025 23:09:20 +0000
Subject: [PATCH] Review comments

---
 front/php/templates/language/de_de.json     |  8 ++++++++
 front/php/templates/language/en_us.json     | 10 ----------
 front/plugins/_publisher_apprise/apprise.py | 12 +++---------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json
index d9f75dd1..ef4a2417 100644
--- a/front/php/templates/language/de_de.json
+++ b/front/php/templates/language/de_de.json
@@ -5,6 +5,14 @@
     "API_TOKEN_name": "API-Schlüssel",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
+    "APPRISE_HOST_description": "Apprise host URL starting with <code>http://</code> or <code>https://</code>. (do not forget to include <code>/notify</code> at the end)",
+    "APPRISE_HOST_name": "Apprise host URL",
+    "APPRISE_PAYLOAD_description": "Select the payload type sent to Apprise. For example <code>html</code> works well with emails, <code>text</code> with chat apps, such as Telegram.",
+    "APPRISE_PAYLOAD_name": "Payload type",
+    "APPRISE_SIZE_description": "The maximum size of the apprise payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended.",
+    "APPRISE_SIZE_name": "Max payload size",
+    "APPRISE_URL_description": "Apprise notification target URL. For example for Telegram it would be <code>tgram://{bot_token}/{chat_id}</code>.",
+    "APPRISE_URL_name": "Apprise notification URL",
     "About_Design": "Entworfen für:",
     "About_Exit": "Abmelden",
     "About_Title": "Netzwerksicherheitsscanner und Benachrichtigungsframework",
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index f34113c0..37cea711 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -5,16 +5,6 @@
     "API_TOKEN_name": "API token",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
-    "APPRISE_HOST_description": "Apprise host URL starting with <code>http://</code> or <code>https://</code>. (do not forget to include <code>/notify</code> at the end)",
-    "APPRISE_HOST_name": "Apprise host URL",
-    "APPRISE_PAYLOAD_description": "Select the payload type sent to Apprise. For example <code>html</code> works well with emails, <code>text</code> with chat apps, such as Telegram.",
-    "APPRISE_PAYLOAD_name": "Payload type",
-    "APPRISE_SIZE_description": "The maximum size of the apprise payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended.",
-    "APPRISE_SIZE_name": "Max payload size",
-    "APPRISE_TAG_description": "Apprise notification target type.",
-    "APPRISE_TAG_name": "Apprise notification target type",
-    "APPRISE_URL_description": "Apprise notification target URL. For example for Telegram it would be <code>tgram://{bot_token}/{chat_id}</code>.",
-    "APPRISE_URL_name": "Apprise notification URL",
     "About_Design": "Designed for:",
     "About_Exit": "Sign out",
     "About_Title": "Network security scanner & notification framework",
diff --git a/front/plugins/_publisher_apprise/apprise.py b/front/plugins/_publisher_apprise/apprise.py
index b6cc3766..2d4c6079 100755
--- a/front/plugins/_publisher_apprise/apprise.py
+++ b/front/plugins/_publisher_apprise/apprise.py
@@ -106,21 +106,15 @@ def send(html, text):
 
     # Define Apprise compatible payload (https://github.com/caronc/apprise-api#stateless-solution)
 
+    target_key = "tags" if get_setting_value('APPRISE_TARGETTYPE') == 'tag' else "urls"
+
     _json_payload = {
-        "urls": get_setting_value('APPRISE_URL'),
+        target_key: get_setting_value('APPRISE_URL'),
         "title": "NetAlertX Notifications",
         "format": get_setting_value('APPRISE_PAYLOAD'),
         "body": payloadData
     }
 
-    if get_setting_value('APPRISE_TARGETTYPE') == 'tag':
-        _json_payload = {
-            "tag": get_setting_value('APPRISE_URL'),
-            "title": "NetAlertX Notifications",
-            "format": get_setting_value('APPRISE_PAYLOAD'),
-            "body": payloadData
-        }
-
     try:
         # try runnning a subprocess
         p = subprocess.Popen(["curl","-i","-X", "POST" ,"-H", "Content-Type:application/json" ,"-d", json.dumps(_json_payload), get_setting_value('APPRISE_HOST')], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)