diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 6e333a3d21..bf6ee67100 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -6,36 +6,63 @@ def list_with_base_rules(rawrules, user_name):
# shove the server default rules for each kind onto the end of each
current_prio_class = PRIORITY_CLASS_INVERSE_MAP.keys()[-1]
+
+ ruleslist.extend(make_base_prepend_rules(
+ user_name, PRIORITY_CLASS_INVERSE_MAP[current_prio_class]
+ ))
+
for r in rawrules:
if r['priority_class'] < current_prio_class:
while r['priority_class'] < current_prio_class:
- ruleslist.extend(make_base_rules(
+ ruleslist.extend(make_base_append_rules(
user_name,
PRIORITY_CLASS_INVERSE_MAP[current_prio_class]
))
current_prio_class -= 1
+ if current_prio_class > 0:
+ ruleslist.extend(make_base_prepend_rules(
+ user_name,
+ PRIORITY_CLASS_INVERSE_MAP[current_prio_class]
+ ))
ruleslist.append(r)
while current_prio_class > 0:
- ruleslist.extend(make_base_rules(
+ ruleslist.extend(make_base_append_rules(
user_name,
PRIORITY_CLASS_INVERSE_MAP[current_prio_class]
))
current_prio_class -= 1
+ if current_prio_class > 0:
+ ruleslist.extend(make_base_prepend_rules(
+ user_name,
+ PRIORITY_CLASS_INVERSE_MAP[current_prio_class]
+ ))
return ruleslist
-def make_base_rules(user, kind):
+def make_base_append_rules(user, kind):
rules = []
if kind == 'override':
- rules = make_base_override_rules()
+ rules = make_base_append_override_rules()
elif kind == 'underride':
- rules = make_base_underride_rules(user)
+ rules = make_base_append_underride_rules(user)
elif kind == 'content':
- rules = make_base_content_rules(user)
+ rules = make_base_append_content_rules(user)
+
+ for r in rules:
+ r['priority_class'] = PRIORITY_CLASS_MAP[kind]
+ r['default'] = True # Deprecated, left for backwards compat
+
+ return rules
+
+def make_base_prepend_rules(user, kind):
+ rules = []
+
+ if kind == 'override':
+ rules = make_base_prepend_override_rules()
for r in rules:
r['priority_class'] = PRIORITY_CLASS_MAP[kind]
@@ -44,7 +71,7 @@ def make_base_rules(user, kind):
return rules
-def make_base_content_rules(user):
+def make_base_append_content_rules(user):
return [
{
'rule_id': 'global/content/.m.rule.contains_user_name',
@@ -68,7 +95,20 @@ def make_base_content_rules(user):
]
-def make_base_override_rules():
+def make_base_prepend_override_rules():
+ return [
+ {
+ 'rule_id': 'global/override/.m.rule.master',
+ 'enabled': False,
+ 'conditions': [],
+ 'actions': [
+ "dont_notify"
+ ]
+ }
+ ]
+
+
+def make_base_append_override_rules():
return [
{
'rule_id': 'global/override/.m.rule.call',
@@ -142,7 +182,7 @@ def make_base_override_rules():
]
-def make_base_underride_rules(user):
+def make_base_append_underride_rules(user):
return [
{
'rule_id': 'global/underride/.m.rule.invite_for_me',
|
