maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make FederationHandler.do_invite_join async

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

30
synapse/handlers/federation.py
View file

@ -1206,9 +1206,9 @@ class FederationHandler(BaseHandler):
) )
return list(auth) return list(auth)
@log_function async def do_invite_join(
@defer.inlineCallbacks self, target_hosts: Iterable[str], room_id: str, joinee: str, content: JsonDict
def do_invite_join(self, target_hosts, room_id, joinee, content): ) -> None:
""" Attempts to join the `joinee` to the room `room_id` via the """ Attempts to join the `joinee` to the room `room_id` via the
servers contained in `target_hosts`. servers contained in `target_hosts`.
@ -1221,17 +1221,17 @@ class FederationHandler(BaseHandler):
have finished processing the join. have finished processing the join.
Args: Args:
target_hosts (Iterable[str]): List of servers to attempt to join the room with. target_hosts: List of servers to attempt to join the room with.
room_id (str): The ID of the room to join. room_id: The ID of the room to join.
joinee (str): The User ID of the joining user. joinee: The User ID of the joining user.
content (dict): The event content to use for the join event. content: The event content to use for the join event.
""" """
logger.debug("Joining %s to %s", joinee, room_id) logger.debug("Joining %s to %s", joinee, room_id)
origin, event, room_version_obj = yield self._make_and_verify_event( origin, event, room_version_obj = await self._make_and_verify_event(
target_hosts, target_hosts,
room_id, room_id,
joinee, joinee,
@ -1247,7 +1247,7 @@ class FederationHandler(BaseHandler):
self.room_queues[room_id] = [] self.room_queues[room_id] = []
yield self._clean_room_for_join(room_id) await self._clean_room_for_join(room_id)
handled_events = set() handled_events = set()
@ -1261,7 +1261,7 @@ class FederationHandler(BaseHandler):
pass pass
event_format_version = room_version_obj.event_format event_format_version = room_version_obj.event_format
ret = yield self.federation_client.send_join( ret = await self.federation_client.send_join(
target_hosts, event, event_format_version target_hosts, event, event_format_version
) )
@ -1280,7 +1280,7 @@ class FederationHandler(BaseHandler):
logger.debug("do_invite_join event: %s", event) logger.debug("do_invite_join event: %s", event)
try: try:
yield self.store.store_room( await self.store.store_room(
room_id=room_id, room_id=room_id,
room_creator_user_id="", room_creator_user_id="",
is_public=False, is_public=False,
@ -1290,13 +1290,13 @@ class FederationHandler(BaseHandler):
# FIXME # FIXME
pass pass
yield self._persist_auth_tree( await self._persist_auth_tree(
origin, auth_chain, state, event, room_version_obj origin, auth_chain, state, event, room_version_obj
) )
# Check whether this room is the result of an upgrade of a room we already know # Check whether this room is the result of an upgrade of a room we already know
# about. If so, migrate over user information # about. If so, migrate over user information
predecessor = yield self.store.get_room_predecessor(room_id) predecessor = await self.store.get_room_predecessor(room_id)
if not predecessor or not isinstance(predecessor.get("room_id"), str): if not predecessor or not isinstance(predecessor.get("room_id"), str):
return return
old_room_id = predecessor["room_id"] old_room_id = predecessor["room_id"]
@ -1306,7 +1306,7 @@ class FederationHandler(BaseHandler):
# We retrieve the room member handler here as to not cause a cyclic dependency # We retrieve the room member handler here as to not cause a cyclic dependency
member_handler = self.hs.get_room_member_handler() member_handler = self.hs.get_room_member_handler()
yield member_handler.transfer_room_state_on_room_upgrade( await member_handler.transfer_room_state_on_room_upgrade(
old_room_id, room_id old_room_id, room_id
) )
@ -1323,8 +1323,6 @@ class FederationHandler(BaseHandler):
run_in_background(self._handle_queued_pdus, room_queue) run_in_background(self._handle_queued_pdus, room_queue)
return True
async def _handle_queued_pdus(self, room_queue): async def _handle_queued_pdus(self, room_queue):
"""Process PDUs which got queued up while we were busy send_joining. """Process PDUs which got queued up while we were busy send_joining.

6
synapse/handlers/room_member.py
View file

@ -944,8 +944,10 @@ class RoomMemberMasterHandler(RoomMemberHandler):
# join dance for now, since we're kinda implicitly checking # join dance for now, since we're kinda implicitly checking
# that we are allowed to join when we decide whether or not we # that we are allowed to join when we decide whether or not we
# need to do the invite/join dance. # need to do the invite/join dance.
yield self.federation_handler.do_invite_join( yield defer.ensureDeferred(
remote_room_hosts, room_id, user.to_string(), content self.federation_handler.do_invite_join(
remote_room_hosts, room_id, user.to_string(), content
)
) )
yield self._user_joined_room(user, room_id) yield self._user_joined_room(user, room_id)