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/api/auth.py | |
| 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/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 40dc62ef6c..b53e8451e5 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -127,8 +127,10 @@ class Auth(object): if current_state: member = current_state.get((EventTypes.Member, user_id), None) else: - member = yield self.state.get_current_state( - room_id=room_id, event_type=EventTypes.Member, state_key=user_id + member = yield defer.ensureDeferred( + self.state.get_current_state( + room_id=room_id, event_type=EventTypes.Member, state_key=user_id + ) ) membership = member.membership if member else None @@ -665,8 +667,10 @@ class Auth(object): ) return member_event.membership, member_event.event_id except AuthError: - visibility = yield self.state.get_current_state( - room_id, EventTypes.RoomHistoryVisibility, "" + visibility = yield defer.ensureDeferred( + self.state.get_current_state( + room_id, EventTypes.RoomHistoryVisibility, "" + ) ) if ( visibility |