token= and push_key= support added

caronc · Aug 19, 2023 · b630b7a · b630b7a
1 parent 4e1eee9
commit b630b7a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/apprise/plugins/NotifyPushMe.py b/apprise/plugins/NotifyPushMe.py
@@ -74,6 +74,16 @@ class NotifyPushMe(NotifyBase):
         },
     })
 
+    # Define our template arguments
+    template_args = dict(NotifyBase.template_args, **{
+        'token': {
+            'alias_of': 'token',
+        },
+        'push_key': {
+            'alias_of': 'token',
+        },
+    })
+
     def __init__(self, token, **kwargs):
         """
         Initialize PushMe Object
@@ -185,4 +195,12 @@ def parse_url(url):
         # Store our token using the host
         results['token'] = NotifyPushMe.unquote(results['host'])
 
+        # The 'token' makes it easier to use yaml configuration
+        if 'token' in results['qsd'] and len(results['qsd']['token']):
+            results['token'] = NotifyPushMe.unquote(results['qsd']['token'])
+
+        elif 'push_key' in results['qsd'] and len(results['qsd']['push_key']):
+            # Support 'push_key' if specified
+            results['token'] = NotifyPushMe.unquote(results['qsd']['push_key'])
+
         return results
diff --git a/test/test_plugin_pushme.py b/test/test_plugin_pushme.py
@@ -54,6 +54,20 @@
         # Our expected url(privacy=True) startswith() response:
         'privacy_url': 'pushme://a...a/',
     }),
+    # Token specified
+    ('pushme://?token=%s' % ('b' * 6), {
+        'instance': NotifyPushMe,
+
+        # Our expected url(privacy=True) startswith() response:
+        'privacy_url': 'pushme://b...b/',
+    }),
+    # Token specified
+    ('pushme://?push_key=%s' % ('p' * 6), {
+        'instance': NotifyPushMe,
+
+        # Our expected url(privacy=True) startswith() response:
+        'privacy_url': 'pushme://p...p/',
+    }),
     ('pushme://%s' % ('c' * 6), {
         'instance': NotifyPushMe,
         # force a failure