test coverage

Author: caronc

README.md

@@ -92,6 +92,7 @@ The table below identifies the services this tool supports and some example serv
 | [Nextcloud](https://github.com/caronc/apprise/wiki/Notify_nextcloud) | ncloud:// or nclouds:// | (TCP) 80 or 443 | ncloud://adminuser:pass@host/User<br/>nclouds://adminuser:pass@host/User1/User2/UserN
 | [NextcloudTalk](https://github.com/caronc/apprise/wiki/Notify_nextcloudtalk) | nctalk:// or nctalks:// | (TCP) 80 or 443 | nctalk://user:pass@host/RoomId<br/>nctalks://user:pass@host/RoomId1/RoomId2/RoomIdN
 | [Notica](https://github.com/caronc/apprise/wiki/Notify_notica) | notica://  | (TCP) 443   | notica://Token/
+| [NotificationAPI](https://github.com/caronc/apprise/wiki/Notify_notificationapi) | napi://  | (TCP) 443   | napi://ClientID/ClientSecret/Target<br />napi://ClientID/ClientSecret/Target1/Target2/TargetN<br />napi://MessageType@ClientID/ClientSecret/Target
 | [Notifiarr](https://github.com/caronc/apprise/wiki/Notify_notifiarr) | notifiarr:// | (TCP) 443 | notifiarr://apikey/#channel<br />notifiarr://apikey/#channel1/#channel2/#channeln
 | [Notifico](https://github.com/caronc/apprise/wiki/Notify_notifico) | notifico://  | (TCP) 443   | notifico://ProjectID/MessageHook/
 | [ntfy](https://github.com/caronc/apprise/wiki/Notify_ntfy) | ntfy://  | (TCP) 80 or 443   | ntfy://topic/<br/>ntfys://topic/

apprise/config/base.py

@@ -667,7 +667,7 @@ def config_parse_text(
         valid_line_re = re.compile(
             r"^\s*(?P<line>([;#]+(?P<comment>.*))|"
             r"(\s*(?P<tags>[a-z0-9, \t_-]+)\s*=|=)?\s*"
-            r"((?P<url>[a-z0-9]{1,12}://.*)|(?P<assign>[a-z0-9, \t_-]+))|"
+            r"((?P<url>[a-z0-9]{1,32}://.*)|(?P<assign>[a-z0-9, \t_-]+))|"
             r"include\s+(?P<config>.+))?\s*$",
             re.I,
         )

apprise/plugins/notificationapi.py

@@ -32,6 +32,7 @@
 
 import base64
 from email.utils import formataddr
+from itertools import chain
 from json import dumps, loads
 import re
 
@@ -51,7 +52,7 @@
 
 # Used to detect ID
 IS_VALID_ID_RE = re.compile(
-    r"^\s*(@|%40)?(?P<id>[\w_-]+)\s*", re.I)
+    r"^\s*(@|%40)?(?P<id>[\w_-]+)\s*$", re.I)
 
 
 class NotificationAPIRegion:
@@ -85,7 +86,7 @@ class NotificationAPIChannel:
     INAPP = "inapp"
     WEB_PUSH = "web_push"
     MOBILE_PUSH = "mobile_push"
-    SLACK = "mobile_push"
+    SLACK = "slack"
 
 
 # A List of our channels we can use for verification
@@ -209,10 +210,6 @@ class NotifyNotificationAPI(NotifyBase):
             "type": "choice:string",
             "values": NOTIFICATIONAPI_MODES,
         },
-        "base_url": {
-            "name": _("Base URL Override"),
-            "type": "string",
-        },
         "to": {
             "alias_of": "targets",
         },
@@ -328,7 +325,6 @@ def __init__(self, client_id, client_secret, message_type=None,
             self.message_type = self.default_message_type
 
         else:
-            # Validate information
             self.message_type = validate_regex(
                 message_type, *self.template_tokens["type"]["regex"])
             if not self.message_type:
@@ -382,6 +378,9 @@ def __init__(self, client_id, client_secret, message_type=None,
                 raise TypeError(msg) from None
             self.channels.add(channel)
 
+        # Used for URL generation afterwards only
+        self._invalid_targets = []
+
         if targets:
             current_target = {}
             for entry in parse_list(targets, sort=False):
@@ -417,7 +416,7 @@ def __init__(self, client_id, client_secret, message_type=None,
                 if result:
                     if "number" not in current_target:
                         current_target["number"] = \
-                            ('+' if entry[0] == '+' else '') + result["full"]
+                            ("+" if entry[0] == "+" else "") + result["full"]
                         if not self.channels:
                             self.channels.add(NotificationAPIChannel.SMS)
                             self.logger.info(
@@ -448,17 +447,17 @@ def __init__(self, client_id, client_secret, message_type=None,
                         current_target["id"] = result.group("id")
                         continue
 
-                    elif "id" in current_target:
-                        # Store and move on
-                        self.targets.append(current_target)
-                        current_target = {
-                            "id": result.group("id")
-                        }
-                        continue
+                    # Store id in next target and move on
+                    self.targets.append(current_target)
+                    current_target = {
+                        "id": result.group("id")
+                    }
+                    continue
 
                 self.logger.warning(
-                    "Ignoring invalid NotificationAPI target "
+                    "Dropped invalid NotificationAPI target "
                     f"({entry}) specified")
+                self._invalid_targets.append(entry)
                 continue
 
             if "id" in current_target:
@@ -509,14 +508,6 @@ def __init__(self, client_id, client_secret, message_type=None,
         if isinstance(tokens, dict):
             self.tokens.update(tokens)
 
-        elif tokens:
-            msg = (
-                "The specified NotificationAPI Template Tokens "
-                f"({tokens}) are not identified as a dictionary."
-            )
-            self.logger.warning(msg)
-            raise TypeError(msg)
-
         return
 
     @property
@@ -572,7 +563,7 @@ def url(self, privacy=False, *args, **kwargs):
 
         if self.channels:
             # Prepare our default channel
-            params["channels"] = self.channels
+            params["channels"] = ",".join(self.channels)
 
         if self.region != self.template_args["region"]["default"]:
             # Prepare our default region
@@ -589,8 +580,8 @@ def url(self, privacy=False, *args, **kwargs):
 
         targets = []
         for target in self.targets:
-            if "id" in target:
-                targets.append(f"@{target['id']}")
+            # ID is always present
+            targets.append(f"@{target['id']}")
             if "number" in target:
                 targets.append(f"{target['number']}")
             if "email" in target:
@@ -603,7 +594,8 @@ def url(self, privacy=False, *args, **kwargs):
             mtype=mtype,
             cid=self.pprint(self.client_id, privacy, safe=""),
             secret=self.pprint(self.client_secret, privacy, safe=""),
-            targets=NotifyNotificationAPI.quote("/".join(targets), safe="/"),
+            targets=NotifyNotificationAPI.quote("/".join(
+                chain(targets, self._invalid_targets)), safe="/"),
             params=NotifyNotificationAPI.urlencode(params),
         )
 
@@ -649,9 +641,9 @@ def gen_payload(self, body, title="", notify_type=NotifyType.INFO,
                 if self.notify_format == NotifyFormat.HTML else body
 
             for channel in self.channels:
-                # Python v3.10 supports `match/case` but since Apprise aims to be
-                # compatible with Python v3.9+, we must use if/else for the time
-                # being
+                # Python v3.10 supports `match/case` but since Apprise aims to
+                # be compatible with Python v3.9+, we must use if/else for the
+                # time being
                 if channel == NotificationAPIChannel.SMS:
                     _payload.update({
                         NotificationAPIChannel.SMS: {
@@ -703,7 +695,7 @@ def gen_payload(self, body, title="", notify_type=NotifyType.INFO,
                         },
                     })
 
-                elif channel == NotificationAPIChannel.SLACK:
+                else:  # channel == NotificationAPIChannel.SLACK
                     _payload.update({
                         NotificationAPIChannel.SLACK: {
                             "text": (title + "\n" + text_body)
@@ -883,8 +875,10 @@ def parse_url(url):
         results["client_secret"] = None
 
         # Prepare our targets (starting with our host)
-        results["targets"] = [
-            NotifyNotificationAPI.unquote(results["host"])]
+        results["targets"] = []
+        if results["host"]:
+            results["targets"].append(
+                NotifyNotificationAPI.unquote(results["host"]))
 
         # For tracking email sources
         results["from_addr"] = None
@@ -919,13 +913,9 @@ def parse_url(url):
             results["region"] = \
                 NotifyNotificationAPI.unquote(results["qsd"]["region"])
 
-        if "channel" in results["qsd"] and len(results["qsd"]["channel"]):
-            results["channel"] = \
-                NotifyNotificationAPI.unquote(results["qsd"]["channel"])
-
-        if "type" in results["qsd"] and len(results["qsd"]["type"]):
-            results["message_type"] = \
-                NotifyNotificationAPI.unquote(results["qsd"]["type"])
+        if "channels" in results["qsd"] and len(results["qsd"]["channels"]):
+            results["channels"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["channels"])
 
         if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
             results["mode"] = \
@@ -935,6 +925,11 @@ def parse_url(url):
             results["reply_to"] = \
                 NotifyNotificationAPI.unquote(results["qsd"]["reply"])
 
+        # Handling of Message Type
+        if "type" in results["qsd"] and len(results["qsd"]["type"]):
+            results["message_type"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["type"])
+
         elif results["user"]:
             # Pull from user
             results["message_type"] = \

apprise/utils/parse.py

@@ -58,14 +58,14 @@
 NOTIFY_CUSTOM_COLON_TOKENS = re.compile(r"^:(?P<key>.*)\s*")
 
 # Used for attempting to acquire the schema if the URL can't be parsed.
-GET_SCHEMA_RE = re.compile(r"\s*(?P<schema>[a-z0-9]{1,12})://.*$", re.I)
+GET_SCHEMA_RE = re.compile(r"\s*(?P<schema>[a-z0-9]{1,32})://.*$", re.I)
 
 # Used for validating that a provided entry is indeed a schema
 # this is slightly different then the GET_SCHEMA_RE above which
 # insists the schema is only valid with a :// entry.  this one
 # extrapolates the individual entries
 URL_DETAILS_RE = re.compile(
-    r"\s*(?P<schema>[a-z0-9]{1,12})(://(?P<base>.*))?$", re.I
+    r"\s*(?P<schema>[a-z0-9]{1,32})(://(?P<base>.*))?$", re.I
 )
 
 # Regular expression based and expanded from:
@@ -124,7 +124,7 @@
 
 # Regular expression used to destinguish between multiple URLs
 URL_DETECTION_RE = re.compile(
-    r"([a-z0-9]+?:\/\/.*?)(?=$|[\s,]+[a-z0-9]{1,12}?:\/\/)", re.I
+    r"([a-z0-9]+?:\/\/.*?)(?=$|[\s,]+[a-z0-9]{1,32}?:\/\/)", re.I
 )
 
 EMAIL_DETECTION_RE = re.compile(
@@ -1100,7 +1100,7 @@ def parse_list(*args, cast=None, allow_whitespace=True, sort=True):
             )
         )
     return (
-        [x for x in filter(bool, list(result))]
+        list(filter(bool, list(result)))
         if allow_whitespace
         else [x.strip() for x in filter(bool, list(result)) if x.strip()]
     )

packaging/redhat/python-apprise.spec

@@ -64,9 +64,9 @@ notification services. It supports sending alerts to platforms such as: \
 `Kumulos`, `LaMetric`, `Lark`, `Line`, `MacOSX`, `Mailgun`, `Mastodon`, \
 `Mattermost`, `Matrix`, `MessageBird`, `Microsoft Windows`, \
 `Microsoft Teams`, `Misskey`, `MQTT`, `MSG91`, `MyAndroid`, `Nexmo`, \
-`Nextcloud`, `NextcloudTalk`, `Notica`, `Notifiarr`, `Notifico`, `ntfy`, \
-`Office365`, `OneSignal`, `Opsgenie`, `PagerDuty`, `PagerTree`, \
-`ParsePlatform`, `Plivo`, `PopcornNotify`, `Prowl`, `Pushalot`, \
+`Nextcloud`, `NextcloudTalk`, `Notica`, `NotificationAPI`, `Notifiarr`,
+`Notifico`, `ntfy`, \ `Office365`, `OneSignal`, `Opsgenie`, `PagerDuty`, \
+`PagerTree`, `ParsePlatform`, `Plivo`, `PopcornNotify`, `Prowl`, `Pushalot`, \
 `PushBullet`, `Pushjet`, `PushMe`, `Pushover`, `Pushplus`, `PushSafer`, \
 `Pushy`, `PushDeer`, `QQ Push`, `Revolt`, `Reddit`, `Resend`, `Rocket.Chat`, \
 `RSyslog`, `SendGrid`, `SendPulse`, `ServerChan`, `Seven`, `SFR`, `Signal`, \

pyproject.toml

@@ -109,6 +109,7 @@ keywords = [
     "Nextcloud",
     "NextcloudTalk",
     "Notica",
+    "NoticationAPI",
     "Notifiarr",
     "Notifico",
     "Ntfy",