diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-20 10:32:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 10:32:02 +0000 |
| commit | fa780e9721c940479a72eed9877ccad4fef78160 (patch) | |
| tree | 2953c373ed13a1b72d4bb3a827db280c2087870c /synapse/storage | |
| parent | Explode on duplicate delta file names. (#6565) (diff) | |
| download | synapse-fa780e9721c940479a72eed9877ccad4fef78160.tar.xz | |
Change EventContext to use the Storage class (#6564)
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/data_stores/main/push_rule.py | 2 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/roommember.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/data_stores/main/push_rule.py b/synapse/storage/data_stores/main/push_rule.py index 5ba13aa973..e2673ae073 100644 --- a/synapse/storage/data_stores/main/push_rule.py +++ b/synapse/storage/data_stores/main/push_rule.py @@ -244,7 +244,7 @@ class PushRulesWorkerStore( # To do this we set the state_group to a new object as object() != object() state_group = object() - current_state_ids = yield context.get_current_state_ids(self) + current_state_ids = yield context.get_current_state_ids() result = yield self._bulk_get_push_rules_for_room( event.room_id, state_group, current_state_ids, event=event ) diff --git a/synapse/storage/data_stores/main/roommember.py b/synapse/storage/data_stores/main/roommember.py index 92e3b9c512..70ff5751b6 100644 --- a/synapse/storage/data_stores/main/roommember.py +++ b/synapse/storage/data_stores/main/roommember.py @@ -477,7 +477,7 @@ class RoomMemberWorkerStore(EventsWorkerStore): # To do this we set the state_group to a new object as object() != object() state_group = object() - current_state_ids = yield context.get_current_state_ids(self) + current_state_ids = yield context.get_current_state_ids() result = yield self._get_joined_users_from_context( event.room_id, state_group, current_state_ids, event=event, context=context ) |