PLUGINS, NTFY, handleEmpty work⤵

pialert/conf.py

@@ -45,18 +45,6 @@ REPORT_DASHBOARD_URL    = 'http://pi.alert/'
 # Notification gateways
 # -------------------------------------------
 
-# Email
-REPORT_MAIL     = False 
-SMTP_SERVER     = '' 
-SMTP_PORT       = 587 
-REPORT_TO       = 'user@gmail.com'
-REPORT_FROM     = 'Pi.Alert <user@gmail.com>' 
-SMTP_SKIP_LOGIN = False 
-SMTP_USER       = '' 
-SMTP_PASS       = '' 
-SMTP_SKIP_TLS   = False 
-SMTP_FORCE_SSL  = False 
-
 # Webhooks
 REPORT_WEBHOOK  = False 
 WEBHOOK_URL     = '' 
@@ -64,12 +52,6 @@ WEBHOOK_PAYLOAD = 'json'
 WEBHOOK_REQUEST_METHOD = 'GET' 
 WEBHOOK_SECRET  = ''
 
-# NTFY
-REPORT_NTFY     = False 
-NTFY_HOST       = 'https://ntfy.sh'
-NTFY_TOPIC      = '' 
-NTFY_USER       = '' 
-NTFY_PASSWORD   = '' 
 
 # PUSHSAFER
 REPORT_PUSHSAFER    = False 

pialert/initialise.py

@@ -128,13 +128,6 @@ def importConfigs (db):
     conf.WEBHOOK_SIZE = ccd('WEBHOOK_SIZE', 1024 , c_d, 'Payload size', 'integer', '', 'Webhooks')
     conf.WEBHOOK_SECRET = ccd('WEBHOOK_SECRET', '' , c_d, 'Secret', 'text', '', 'Webhooks')
 
-    # NTFY
-    conf.REPORT_NTFY = ccd('REPORT_NTFY', False , c_d, 'Enable NTFY', 'boolean', '', 'NTFY', ['test'])
-    conf.NTFY_HOST = ccd('NTFY_HOST', 'https://ntfy.sh' , c_d, 'NTFY host URL', 'text', '', 'NTFY')
-    conf.NTFY_TOPIC = ccd('NTFY_TOPIC', '' , c_d, 'NTFY topic', 'text', '', 'NTFY')
-    conf.NTFY_USER = ccd('NTFY_USER', '' , c_d, 'NTFY user', 'text', '', 'NTFY')
-    conf.NTFY_PASSWORD = ccd('NTFY_PASSWORD', '' , c_d, 'NTFY password', 'password', '', 'NTFY')
-
     # PUSHSAFER
     conf.REPORT_PUSHSAFER = ccd('REPORT_PUSHSAFER', False , c_d, 'Enable PUSHSAFER', 'boolean', '', 'PUSHSAFER', ['test'])
     conf.PUSHSAFER_TOKEN = ccd('PUSHSAFER_TOKEN', 'ApiKey' , c_d, 'PUSHSAFER token', 'text', '', 'PUSHSAFER')

pialert/publishers/ntfy.py

@@ -1,43 +0,0 @@
-
-import conf
-import requests
-from base64 import b64encode
-
-from logger import mylog
-from helper import noti_obj
-
-#-------------------------------------------------------------------------------
-def check_config():
-    if conf.NTFY_HOST == '' or conf.NTFY_TOPIC == '':
-        mylog('none', ['[Check Config] Error: NTFY service not set up correctly. Check your pialert.conf NTFY_* variables.'])
-        return False
-    else:
-        return True
-    
-#-------------------------------------------------------------------------------
-def send  (msg: noti_obj):
-
-    headers = {
-        "Title": "Pi.Alert Notification",
-        "Actions": "view, Open Dashboard, "+ conf.REPORT_DASHBOARD_URL,
-        "Priority": "urgent",
-        "Tags": "warning"
-    }
-    # if username and password are set generate hash and update header
-    if conf.NTFY_USER != "" and conf.NTFY_PASSWORD != "":
-	# Generate hash for basic auth
-        # usernamepassword = "{}:{}".format(conf.NTFY_USER,conf.NTFY_PASSWORD)
-        basichash = b64encode(bytes(conf.NTFY_USER + ':' + conf.NTFY_PASSWORD, "utf-8")).decode("ascii")
-
-	# add authorization header with hash
-        headers["Authorization"] = "Basic {}".format(basichash)
-
-    try:
-        requests.post("{}/{}".format( conf.NTFY_HOST, conf.NTFY_TOPIC),
-                                        data=msg.text,
-                                        headers=headers)
-    except requests.exceptions.RequestException as e:  
-        mylog('none', ['[NTFY] Error: ', e])
-        return -1
-
-    return 0    

pialert/reporting.py

@@ -24,8 +24,6 @@ from const import pialertPath, logPath, apiPath
 from helper import noti_obj, generate_mac_links, removeDuplicateNewLines, timeNowTZ, hide_email,  updateState, get_file_content, write_file
 from logger import logResult, mylog, print_log
 
-from publishers.ntfy  import (check_config as ntfy_check_config,
-                              send as send_ntfy )
 from publishers.webhook import (check_config as webhook_check_config,
                                 send as send_webhook) 
 from publishers.pushsafer import (check_config as pushsafer_check_config,