summary refs log tree commit diff
path: root/synapse/push/baserules.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-03-06 10:27:32 +0000
committerDavid Baker <dave@matrix.org>2015-03-06 10:27:32 +0000
commit1487bba226019d187f38ba8c98b710515cb9bdde (patch)
tree15e36d0c3218c5ffdd46e56bc2cbed2a6c35e40a /synapse/push/baserules.py
parentAdd the highlight tweak where messages should be highlighted a different colo... (diff)
downloadsynapse-1487bba226019d187f38ba8c98b710515cb9bdde.tar.xz
Suppress notices should trump content/room/sender rules.
Diffstat (limited to '')
-rw-r--r--synapse/push/baserules.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 4b4c14816b..fcc6633156 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -71,6 +71,19 @@ def make_base_content_rules(user):
 def make_base_override_rules():
     return [
         {
+            'rule_id': 'global/underride/.m.rule.suppress_notices',
+            'conditions': [
+                {
+                    'kind': 'event_match',
+                    'key': 'content.msgtype',
+                    'pattern': 'm.notice',
+                }
+            ],
+            'actions': [
+                'dont-notify',
+            ]
+        },
+        {
             'rule_id': 'global/override/.m.rule.contains_display_name',
             'conditions': [
                 {
@@ -109,19 +122,6 @@ def make_base_override_rules():
 def make_base_underride_rules():
     return [
         {
-            'rule_id': 'global/underride/.m.rule.suppress_notices',
-            'conditions': [
-                {
-                    'kind': 'event_match',
-                    'key': 'content.msgtype',
-                    'pattern': 'm.notice',
-                }
-            ],
-            'actions': [
-                'dont-notify',
-            ]
-        },
-        {
             'rule_id': 'global/underride/.m.rule.fallback',
             'conditions': [
             ],