diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-02-03 16:13:13 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-02-03 16:13:13 +0000 |
| commit | ebd6a15af3994d803b8deb2172dbd0deaeb59915 (patch) | |
| tree | fc7d15d9437ccbb4821f40d80a98a1c5a00b7445 /synapse/handlers/room_member.py | |
| parent | make FederationHandler.on_event_auth async (diff) | |
| download | synapse-ebd6a15af3994d803b8deb2172dbd0deaeb59915.tar.xz | |
make FederationHandler.do_invite_join async
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 15e8aa5249..ce8150db6e 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -944,8 +944,10 @@ class RoomMemberMasterHandler(RoomMemberHandler): # join dance for now, since we're kinda implicitly checking # that we are allowed to join when we decide whether or not we # need to do the invite/join dance. - yield self.federation_handler.do_invite_join( - remote_room_hosts, room_id, user.to_string(), content + yield defer.ensureDeferred( + self.federation_handler.do_invite_join( + remote_room_hosts, room_id, user.to_string(), content + ) ) yield self._user_joined_room(user, room_id) |