summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-03-06 19:36:12 +0000
committerDavid Baker <dave@matrix.org>2015-03-06 19:41:36 +0000
commit118c883429d1564f63ab37424a8e0bc602c10709 (patch)
tree6074843f0a606fa12f4e14c03f1479bbd040f9e2
parentMerge branch 'develop' into release-v0.8.0 (diff)
downloadsynapse-118c883429d1564f63ab37424a8e0bc602c10709.tar.xz
Call notifications should be override else they'll get clobbered by sender/room rules.
Diffstat (limited to '')
-rw-r--r--synapse/push/baserules.py42
1 files changed, 21 insertions, 21 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 6d00ebd36d..b33714f1f6 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -71,7 +71,27 @@ def make_base_content_rules(user):
 def make_base_override_rules():
     return [
         {
-            'rule_id': 'global/underride/.m.rule.suppress_notices',
+            'rule_id': 'global/override/.m.rule.call',
+            'conditions': [
+                {
+                    'kind': 'event_match',
+                    'key': 'type',
+                    'pattern': 'm.call.invite',
+                }
+            ],
+            'actions': [
+                'notify',
+                {
+                    'set_tweak': 'sound',
+                    'value': 'ring'
+                }, {
+                    'set_tweak': 'highlight',
+                    'value': 'false'
+                }
+            ]
+        },
+        {
+            'rule_id': 'global/override/.m.rule.suppress_notices',
             'conditions': [
                 {
                     'kind': 'event_match',
@@ -185,25 +205,5 @@ def make_base_underride_rules(user):
                     'value': 'false'
                 }
             ]
-        },
-        {
-            'rule_id': 'global/underride/.m.rule.call',
-            'conditions': [
-                {
-                    'kind': 'event_match',
-                    'key': 'type',
-                    'pattern': 'm.call.invite',
-                }
-            ],
-            'actions': [
-                'notify',
-                {
-                    'set_tweak': 'sound',
-                    'value': 'ring'
-                }, {
-                    'set_tweak': 'highlight',
-                    'value': 'false'
-                }
-            ]
         }
     ]