diff options
| -rw-r--r-- | CHANGES.rst | 1 | ||||
| -rw-r--r-- | synapse/push/baserules.py | 29 | ||||
| -rw-r--r-- | synapse/push/httppusher.py | 2 |
3 files changed, 19 insertions, 13 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 277e24416c..f89542a2bb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -13,7 +13,6 @@ General: * Notify when invited to a new room. * Notify for messages that don't match any rule. * Notify on incoming call. - * Notify if there were no matching rules. Federation: diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py index eddc7fcbe2..6d00ebd36d 100644 --- a/synapse/push/baserules.py +++ b/synapse/push/baserules.py @@ -113,6 +113,9 @@ def make_base_override_rules(): { 'set_tweak': 'sound', 'value': 'default' + }, { + 'set_tweak': 'highlight', + 'value': 'false' } ] } @@ -145,6 +148,9 @@ def make_base_underride_rules(user): { 'set_tweak': 'sound', 'value': 'default' + }, { + 'set_tweak': 'highlight', + 'value': 'false' } ] }, @@ -158,7 +164,10 @@ def make_base_underride_rules(user): } ], 'actions': [ - 'notify', + 'notify', { + 'set_tweak': 'highlight', + 'value': 'false' + } ] }, { @@ -171,7 +180,10 @@ def make_base_underride_rules(user): } ], 'actions': [ - 'notify', + 'notify', { + 'set_tweak': 'highlight', + 'value': 'false' + } ] }, { @@ -188,15 +200,10 @@ def make_base_underride_rules(user): { 'set_tweak': 'sound', 'value': 'ring' + }, { + 'set_tweak': 'highlight', + 'value': 'false' } ] - }, - { - 'rule_id': 'global/underride/.m.rule.fallback', - 'conditions': [ - ], - 'actions': [ - 'notify', - ] - }, + } ] diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index caca709f10..a02fed57b4 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -109,7 +109,7 @@ class HttpPusher(Pusher): try: resp = yield self.httpCli.post_json_get_json(self.url, notification_dict) except: - logger.exception("Failed to push %s ", self.url) + logger.warn("Failed to push %s ", self.url) defer.returnValue(False) rejected = [] if 'rejected' in resp: |