diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-15 13:27:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 13:27:18 +0100 |
| commit | b82fa849c8542b7571617762391ed76e2364e70b (patch) | |
| tree | 8be387b18e9fb45c2e46c93c2584890bb2b402a7 | |
| parent | Merge pull request #1121 from matrix-org/erikj/public_room_paginate (diff) | |
| parent | Ensure we don't mutate the cache of push rules (diff) | |
| download | synapse-b82fa849c8542b7571617762391ed76e2364e70b.tar.xz | |
Merge pull request #1120 from matrix-org/erikj/push_invite_cache
Ensure we don't mutate the cache of push rules
| -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 ) |