diff --git a/apprise/URLBase.py b/apprise/URLBase.py index 57c6317e..6d6f7ba9 100644 --- a/apprise/URLBase.py +++ b/apprise/URLBase.py @@ -636,6 +636,8 @@ class URLBase(object): results['qsd'].get('verify', True)) # Password overrides + if 'password' in results['qsd']: + results['password'] = results['qsd']['password'] if 'pass' in results['qsd']: results['password'] = results['qsd']['pass'] diff --git a/apprise/__init__.py b/apprise/__init__.py index 8dcd0b99..477bd178 100644 --- a/apprise/__init__.py +++ b/apprise/__init__.py @@ -23,7 +23,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -__title__ = 'apprise' +__title__ = 'Apprise' __version__ = '0.9.1' __author__ = 'Chris Caron' __license__ = 'MIT' diff --git a/apprise/plugins/NotifyGitter.py b/apprise/plugins/NotifyGitter.py index d94d4146..57795983 100644 --- a/apprise/plugins/NotifyGitter.py +++ b/apprise/plugins/NotifyGitter.py @@ -284,7 +284,7 @@ class NotifyGitter(NotifyBase): # By default set wait to None wait = None - if self.ratelimit_remaining == 0: + if self.ratelimit_remaining <= 0: # Determine how long we should wait for or if we should wait at # all. This isn't fool-proof because we can't be sure the client # time (calling this script) is completely synced up with the diff --git a/apprise/plugins/NotifyTwist.py b/apprise/plugins/NotifyTwist.py index 39bec5ea..d6354de4 100644 --- a/apprise/plugins/NotifyTwist.py +++ b/apprise/plugins/NotifyTwist.py @@ -562,6 +562,7 @@ class NotifyTwist(NotifyBase): if not len(self.channel_ids): # We have nothing to notify + self.logger.warning('There are no Twist targets to notify') return False # Notify all of our identified channels diff --git a/test/test_notify_base.py b/test/test_notify_base.py index 9e779333..81cf0ea6 100644 --- a/test/test_notify_base.py +++ b/test/test_notify_base.py @@ -282,6 +282,19 @@ def test_notify_base_urls(): assert 'password' in results assert results['password'] == "newpassword" + # password keyword can also optionally be used + results = NotifyBase.parse_url( + 'https://user:pass@localhost?password=passwd') + assert 'password' in results + assert results['password'] == "passwd" + + # pass= override password= + # password keyword can also optionally be used + results = NotifyBase.parse_url( + 'https://user:pass@localhost?pass=pw1&password=pw2') + assert 'password' in results + assert results['password'] == "pw1" + # Options results = NotifyBase.parse_url('https://localhost?format=invalid') assert 'format' not in results