diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-07-24 10:59:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 10:59:51 -0400 |
| commit | b975fa2e9952f1f8ac2cddb15c287768bf9b0b4e (patch) | |
| tree | 7d1965dcddbd0a028b4b1c378830fb3dedbe5685 /synapse/storage/data_stores | |
| parent | Fix up types and comments that refer to Deferreds. (#7945) (diff) | |
| download | synapse-b975fa2e9952f1f8ac2cddb15c287768bf9b0b4e.tar.xz | |
Convert state resolution to async/await (#7942)
Diffstat (limited to 'synapse/storage/data_stores')
| -rw-r--r-- | synapse/storage/data_stores/main/push_rule.py | 2 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/roommember.py | 2 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/user_directory.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/synapse/storage/data_stores/main/push_rule.py b/synapse/storage/data_stores/main/push_rule.py index d181488db7..c229248101 100644 --- a/synapse/storage/data_stores/main/push_rule.py +++ b/synapse/storage/data_stores/main/push_rule.py @@ -259,7 +259,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() + current_state_ids = yield defer.ensureDeferred(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 29765890ee..a92e401e88 100644 --- a/synapse/storage/data_stores/main/roommember.py +++ b/synapse/storage/data_stores/main/roommember.py @@ -497,7 +497,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() + current_state_ids = yield defer.ensureDeferred(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 ) diff --git a/synapse/storage/data_stores/main/user_directory.py b/synapse/storage/data_stores/main/user_directory.py index 6b8130bf0f..942e51fd3a 100644 --- a/synapse/storage/data_stores/main/user_directory.py +++ b/synapse/storage/data_stores/main/user_directory.py @@ -198,7 +198,9 @@ class UserDirectoryBackgroundUpdateStore(StateDeltasStore): room_id ) - users_with_profile = yield state.get_current_users_in_room(room_id) + users_with_profile = yield defer.ensureDeferred( + state.get_current_users_in_room(room_id) + ) user_ids = set(users_with_profile) # Update each user in the user directory. |