Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix server default rule injection (downwards, not upwards!)

This commit is contained in:
David Baker 2015-02-09 14:17:52 +00:00
parent ecb0f78063
commit 784d714a3f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/push/baserules.py
View File

@ -4,24 +4,24 @@ def list_with_base_rules(rawrules, user_name):
ruleslist = [] ruleslist = []
# shove the server default rules for each kind onto the end of each # shove the server default rules for each kind onto the end of each
current_prio_class = 1 current_prio_class = PRIORITY_CLASS_INVERSE_MAP.keys()[-1]
for r in rawrules: for r in rawrules:
if r['priority_class'] > current_prio_class: if r['priority_class'] < current_prio_class:
while current_prio_class < r['priority_class']: while r['priority_class'] < current_prio_class:
ruleslist.extend(make_base_rules( ruleslist.extend(make_base_rules(
user_name, user_name,
PRIORITY_CLASS_INVERSE_MAP[current_prio_class]) PRIORITY_CLASS_INVERSE_MAP[current_prio_class])
) )
current_prio_class += 1 current_prio_class -= 1
ruleslist.append(r) ruleslist.append(r)
while current_prio_class <= PRIORITY_CLASS_INVERSE_MAP.keys()[-1]: while current_prio_class > 0:
ruleslist.extend(make_base_rules( ruleslist.extend(make_base_rules(
user_name, user_name,
PRIORITY_CLASS_INVERSE_MAP[current_prio_class]) PRIORITY_CLASS_INVERSE_MAP[current_prio_class])
) )
current_prio_class += 1 current_prio_class -= 1
return ruleslist return ruleslist