diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-08-03 17:51:46 -0700 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-08-03 17:51:46 -0700 |
| commit | 7f2e76bef9e216c4ed34c45d40e09126cb72c0df (patch) | |
| tree | c6ecb4eb2c3e10321b82d6948e1f107d772d4c71 /synapse/api | |
| parent | Merge commit '4876af06d' into anoa/dinsic_release_1_18_x (diff) | |
| parent | 1.18.0rc1 (diff) | |
| download | synapse-7f2e76bef9e216c4ed34c45d40e09126cb72c0df.tar.xz | |
Merge commit 'f88c48f3b' into anoa/dinsic_release_1_18_x
* commit 'f88c48f3b': 1.18.0rc1 Fix error reporting when using `opentracing.trace` (#7961) Fix typing replication not being handled on master (#7959) Remove hacky error handling for inlineDeferreds. (#7950) Convert tests/rest/admin/test_room.py to unix file endings (#7953) Support oEmbed for media previews. (#7920) Convert state resolution to async/await (#7942) Fix up types and comments that refer to Deferreds. (#7945) Do not convert async functions to Deferreds in the interactive_auth_handler (#7944) Convert more of the media code to async/await (#7873) Return an empty body for OPTIONS requests. (#7886) Downgrade warning on client disconnect to INFO (#7928) Convert presence handler helpers to async/await. (#7939) Update the auth providers to be async. (#7935) Put a cache on `/state_ids` (#7931)
Diffstat (limited to 'synapse/api')
| -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 768b840b6a..1bbb7b607f 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 @@ -670,8 +672,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 |