make FederationHandler.do_invite_join async

This commit is contained in:
Richard van der Hoff 2020-02-03 16:13:13 +00:00
parent 94f7b4cd54
commit ebd6a15af3
2 changed files with 18 additions and 18 deletions

View file

@ -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)