Server default rules now of all kinds rather than all being at lowest prio.

3 files changed, 66 insertions, 12 deletions

diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 8c6f0a6571..7293715293 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -77,15 +77,15 @@ class Pusher(object):
             if ev['state_key'] != self.user_name:
                 defer.returnValue(['dont_notify'])
 
-        rules = yield self.store.get_push_rules_for_user_name(self.user_name)
+        rawrules = yield self.store.get_push_rules_for_user_name(self.user_name)
 
-        for r in rules:
+        for r in rawrules:
             r['conditions'] = json.loads(r['conditions'])
             r['actions'] = json.loads(r['actions'])
 
-        user_name_localpart = UserID.from_string(self.user_name).localpart
+        user = UserID.from_string(self.user_name)
 
-        rules.extend(baserules.make_base_rules(user_name_localpart))
+        rules = baserules.list_with_base_rules(rawrules, user)
 
         # get *our* member event for display name matching
         member_events_for_room = yield self.store.get_current_state(
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 376d1d4d33..191909ad4d 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -1,20 +1,68 @@
-def make_base_rules(user_name):
-    rules = [
+from synapse.push.rulekinds import PRIORITY_CLASS_MAP, PRIORITY_CLASS_INVERSE_MAP
+
+def list_with_base_rules(rawrules, user_name):
+    ruleslist = []
+
+    # shove the server default rules for each kind onto the end of each
+    current_prio_class = 1
+    for r in rawrules:
+        if r['priority_class'] > current_prio_class:
+            while current_prio_class < r['priority_class']:
+                ruleslist.extend(make_base_rules(
+                        user_name,
+                        PRIORITY_CLASS_INVERSE_MAP[current_prio_class])
+                    )
+                current_prio_class += 1
+
+        ruleslist.append(r)
+
+    while current_prio_class <= PRIORITY_CLASS_INVERSE_MAP.keys()[-1]:
+        ruleslist.extend(make_base_rules(
+            user_name,
+            PRIORITY_CLASS_INVERSE_MAP[current_prio_class])
+        )
+        current_prio_class += 1
+
+    return ruleslist
+
+
+def make_base_rules(user, kind):
+    rules = []
+
+    if kind == 'override':
+        rules = make_base_override_rules()
+    elif kind == 'content':
+        rules = make_base_content_rules(user)
+
+    for r in rules:
+        r['priority_class'] = PRIORITY_CLASS_MAP[kind]
+
+    return rules
+
+
+def make_base_content_rules(user):
+    return [
         {
             'conditions': [
                 {
                     'kind': 'event_match',
                     'key': 'content.body',
-                    'pattern': '*%s*' % (user_name,), # Matrix ID match
+                    'pattern': user.localpart,  # Matrix ID match
                 }
             ],
             'actions': [
                 'notify',
                 {
-                    'set_sound': 'default'
+                    'set_tweak': 'sound',
+                    'value': 'default',
                 }
             ]
         },
+    ]
+
+
+def make_base_override_rules():
+    return [
         {
             'conditions': [
                 {
@@ -24,7 +72,8 @@ def make_base_rules(user_name):
             'actions': [
                 'notify',
                 {
-                    'set_sound': 'default'
+                    'set_tweak': 'sound',
+                    'value': 'default'
                 }
             ]
         },
@@ -44,6 +93,3 @@ def make_base_rules(user_name):
             ]
         }
     ]
-    for r in rules:
-        r['priority_class'] = 0
-    return rules
\ No newline at end of file
diff --git a/synapse/push/rulekinds.py b/synapse/push/rulekinds.py
new file mode 100644
index 0000000000..763bdee58e
--- /dev/null
+++ b/synapse/push/rulekinds.py
@@ -0,0 +1,8 @@
+PRIORITY_CLASS_MAP = {
+        'underride': 1,
+        'sender': 2,
+        'room': 3,
+        'content': 4,
+        'override': 5,
+    }
+PRIORITY_CLASS_INVERSE_MAP = {v: k for k, v in PRIORITY_CLASS_MAP.items()}