NTFY work⤵

front/php/templates/language/en_us.json

@@ -499,7 +499,7 @@
         "HRS_TO_KEEP_NEWDEV_name" : "Keep new devices for",
         "HRS_TO_KEEP_NEWDEV_description" : "This is a maintenance setting. If enabled (<code>0</code> is disabled), devices marked as <b>New Device</b> will be deleted if their <b>First Session</b> time was older than the specified hours in this setting. Use this setting if you want to auto-delete <b>New Devices</b> after <code>X</code> hours.",
         "REPORT_DASHBOARD_URL_name" : "Pi.Alert URL",
-        "REPORT_DASHBOARD_URL_description" : "This URL is used as the base for generating links in the emails. Enter full URL starting with <code>http://</code> including the port number (no trailig slash <code>/</code>).",
+        "REPORT_DASHBOARD_URL_description" : "This URL is used as the base for generating links in HTML reports (e.g.: emails). Enter full URL starting with <code>http://</code> including the port number (no trailig slash <code>/</code>).",
         "DIG_GET_IP_ARG_name" : "Internet IP discovery",
         "DIG_GET_IP_ARG_description" : "Change the <a href=\"https://linux.die.net/man/1/dig\" target=\"_blank\">dig utility</a> arguments if you have issues resolving your Internet IP. Arguments are added at the end of the following command: <code>dig +short </code>.",
         "NETWORK_DEVICE_TYPES_name" : "Network device types",

front/plugins/_publisher_ntfy/ntfy.py

@@ -15,7 +15,7 @@ from base64 import b64encode
 sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
 
 import conf
-from plugin_helper import Plugin_Objects
+from plugin_helper import Plugin_Objects, handleEmpty
 from logger import mylog, append_line_to_file
 from helper import timeNowTZ, noti_obj, get_setting_value
 from notification import Notification_obj
@@ -60,7 +60,7 @@ def main():
             primaryId   = pluginName,
             secondaryId = timeNowTZ(),            
             watched1    = notification["GUID"],
-            watched2    = response_text,            
+            watched2    = handleEmpty(response_text),            
             watched3    = response_status_code,
             watched4    = 'null',
             extra       = 'null',
@@ -109,9 +109,13 @@ def send(html, text):
 
         response_status_code = response.status_code
 
+        
+
         # Check if the request was successful (status code 200)
         if response_status_code == 200:
-            response_text = response.text  # This captures the response body/message                    
+            response_text = response.text  # This captures the response body/message      
+        else:
+            response_text = json.dumps(response.text) 
 
     except requests.exceptions.RequestException as e:  
         mylog('none', [f'[{pluginName}] Error: ', e])