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

Add caches to bulk_get_push_rules*

Browse source
This commit is contained in:
Erik Johnston 2016-05-31 13:46:58 +01:00
parent b007ee4606
commit e5b0bbcd33
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/push/bulk_push_rule_evaluator.py
View file

@ -29,6 +29,7 @@ logger = logging.getLogger(__name__)
def decode_rule_json(rule):
rule = dict(rule)
rule['conditions'] = json.loads(rule['conditions'])
rule['actions'] = json.loads(rule['actions'])
return rule
@ -39,6 +40,8 @@ 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 = {k: v for k, v in rules_by_user.items() if v is not None}
rules_by_user = {
uid: list_with_base_rules([
decode_rule_json(rule_list)
@ -51,11 +54,10 @@ def _get_rules(room_id, user_ids, store):
# 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:
if uid not in rules_enabled_by_user:
user_enabled_map = rules_enabled_by_user.get(uid)
if not user_enabled_map:
continue
user_enabled_map = rules_enabled_by_user[uid]
for i, rule in enumerate(rules_by_user[uid]):
rule_id = rule['rule_id']