From 1487bba226019d187f38ba8c98b710515cb9bdde Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Mar 2015 10:27:32 +0000
Subject: [PATCH] Suppress notices should trump content/room/sender rules.

---
 synapse/push/baserules.py | 26 +++++++++++++-------------
 1 file 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
@@ -70,6 +70,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': [
@@ -108,19 +121,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': [