Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-08 00:15:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Overlay the push_rules_enabled map for users, otherwise they won't be able to disable server default rules.

Browse source
This commit is contained in:
David Baker 2016-01-22 14:58:19 +00:00
parent 7a3fe48ba4
commit 52bdd1b834
2 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
synapse/push/bulk_push_rule_evaluator.py
View file

@ -36,6 +36,7 @@ def decode_rule_json(rule):
@defer.inlineCallbacks
def _get_rules(room_id, user_ids, store):
rules_by_user = yield store.bulk_get_push_rules(user_ids)
rules_enabled_by_user = yield store.bulk_get_push_rules_enabled(user_ids)
rules_by_user = {
uid: baserules.list_with_base_rules([
@ -44,6 +45,19 @@ def _get_rules(room_id, user_ids, store):
])
for uid in user_ids
}
# We apply the rules-enabled map here: bulk_get_push_rules doesn't
# fetch disabled rules, but this won't account for any server default
# rules the user has disabled, so we need to do this too.
for uid in user_ids:
user_enabled_map = rules_enabled_by_user[uid]
for rule in rules_by_user[uid]:
rule_id = rule['rule_id']
if rule_id in user_enabled_map:
rule['enabled'] = user_enabled_map[rule_id]
defer.returnValue(rules_by_user)