diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-23 19:21:37 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-23 19:21:37 +0100 |
| commit | adfe29ec0bedf394772e30583c271f142bccd3ba (patch) | |
| tree | ba4759be562a0f9f9cddc514968fd16e7b0faa90 /synapse/storage/push_rule.py | |
| parent | incorporate review (diff) | |
| parent | Merge pull request #3584 from matrix-org/erikj/use_cached (diff) | |
| download | synapse-adfe29ec0bedf394772e30583c271f142bccd3ba.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/storage/push_rule.py')
| -rw-r--r-- | synapse/storage/push_rule.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index be655d287b..af564b1b4e 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -186,6 +186,7 @@ class PushRulesWorkerStore(ApplicationServiceWorkerStore, defer.returnValue(results) + @defer.inlineCallbacks def bulk_get_push_rules_for_room(self, event, context): state_group = context.state_group if not state_group: @@ -195,9 +196,11 @@ class PushRulesWorkerStore(ApplicationServiceWorkerStore, # To do this we set the state_group to a new object as object() != object() state_group = object() - return self._bulk_get_push_rules_for_room( - event.room_id, state_group, context.current_state_ids, event=event + current_state_ids = yield context.get_current_state_ids(self) + result = yield self._bulk_get_push_rules_for_room( + event.room_id, state_group, current_state_ids, event=event ) + defer.returnValue(result) @cachedInlineCallbacks(num_args=2, cache_context=True) def _bulk_get_push_rules_for_room(self, room_id, state_group, current_state_ids, |