SYN-267 Add a fallback rule as an explicit server default rule and make the default dont-notify so you effectively have a "notify for everything else" switch you can turn on and off.

2 files changed, 16 insertions, 1 deletions

diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 40fae91ab5..d4da05f093 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -32,7 +32,7 @@ class Pusher(object):
     INITIAL_BACKOFF = 1000
     MAX_BACKOFF = 60 * 60 * 1000
     GIVE_UP_AFTER = 24 * 60 * 60 * 1000
-    DEFAULT_ACTIONS = ['notify']
+    DEFAULT_ACTIONS = ['dont-notify']
 
     INEQUALITY_EXPR = re.compile("^([=<>]*)([0-9]*)$")
 
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index f4d2be11f6..09878b63c1 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -32,6 +32,8 @@ def make_base_rules(user, kind):
 
     if kind == 'override':
         rules = make_base_override_rules()
+    elif kind == 'underride':
+        rules = make_base_underride_rules()
     elif kind == 'content':
         rules = make_base_content_rules(user)
 
@@ -98,3 +100,16 @@ def make_base_override_rules():
             ]
         }
     ]
+
+
+def make_base_underride_rules():
+    return [
+        {
+            'rule_id': 'global/underride/.m.rule.fallback',
+            'conditions': [
+            ],
+            'actions': [
+                'notify',
+            ]
+        },
+    ]