diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-15 09:16:13 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-15 09:16:13 +0100 |
commit | 6a5ded5988c8f333848bf83c3a0dbac8f2d866e3 (patch) | |
tree | 93001d50512211b1a67b1f117af4f1127b1766d8 /synapse/push | |
parent | Merge pull request #1117 from matrix-org/erikj/fix_state (diff) | |
download | synapse-6a5ded5988c8f333848bf83c3a0dbac8f2d866e3.tar.xz |
Ensure we don't mutate the cache of push rules
Diffstat (limited to 'synapse/push')
-rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index f1bbe57dcb..be55598c43 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -27,15 +27,6 @@ logger = logging.getLogger(__name__) @defer.inlineCallbacks -def _get_rules(room_id, user_ids, store): - rules_by_user = yield store.bulk_get_push_rules(user_ids) - - rules_by_user = {k: v for k, v in rules_by_user.items() if v is not None} - - defer.returnValue(rules_by_user) - - -@defer.inlineCallbacks def evaluator_for_event(event, hs, store, context): rules_by_user = yield store.bulk_get_push_rules_for_room( event, context @@ -48,6 +39,7 @@ def evaluator_for_event(event, hs, store, context): if invited_user and hs.is_mine_id(invited_user): has_pusher = yield store.user_has_pusher(invited_user) if has_pusher: + rules_by_user = dict(rules_by_user) rules_by_user[invited_user] = yield store.get_push_rules_for_user( invited_user ) |