diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:15:12 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:15:12 +0100 |
| commit | 4f5cc8e4e796153cbdc09517e521fc3a23eb66c2 (patch) | |
| tree | ccaa25ba8cec666b88ac217f6495cf59663550b0 /synapse/storage/roommember.py | |
| parent | Remove redundant checks on room forgottenness (diff) | |
| parent | Merge pull request #3582 from matrix-org/erikj/fixup_stateless (diff) | |
| download | synapse-4f5cc8e4e796153cbdc09517e521fc3a23eb66c2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room
Diffstat (limited to 'synapse/storage/roommember.py')
| -rw-r--r-- | synapse/storage/roommember.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 9eb5b18144..01697ab2c9 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -232,6 +232,7 @@ class RoomMemberWorkerStore(EventsWorkerStore): defer.returnValue(user_who_share_room) + @defer.inlineCallbacks def get_joined_users_from_context(self, event, context): state_group = context.state_group if not state_group: @@ -241,11 +242,13 @@ class RoomMemberWorkerStore(EventsWorkerStore): # To do this we set the state_group to a new object as object() != object() state_group = object() - return self._get_joined_users_from_context( - event.room_id, state_group, context.current_state_ids, + current_state_ids = yield context.get_current_state_ids(self) + result = yield self._get_joined_users_from_context( + event.room_id, state_group, current_state_ids, event=event, context=context, ) + defer.returnValue(result) def get_joined_users_from_state(self, room_id, state_entry): state_group = state_entry.state_group |