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": "",
+ "APPRISE_HOST_description": "Apprise host URL starting with http:// or https://. (do not forget to include /notify at the end)",
+ "APPRISE_HOST_name": "Apprise host URL",
+ "APPRISE_PAYLOAD_description": "Select the payload type sent to Apprise. For example html works well with emails, text 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 (text was truncated) message is appended.",
+ "APPRISE_SIZE_name": "Max payload size",
+ "APPRISE_URL_description": "Apprise notification target URL. For example for Telegram it would be tgram://{bot_token}/{chat_id}.",
+ "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": "",
- "APPRISE_HOST_description": "Apprise host URL starting with http:// or https://. (do not forget to include /notify at the end)",
- "APPRISE_HOST_name": "Apprise host URL",
- "APPRISE_PAYLOAD_description": "Select the payload type sent to Apprise. For example html works well with emails, text 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 (text was truncated) 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 tgram://{bot_token}/{chat_id}.",
- "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)