diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index b924c72c77..e75ebb168e 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1348,20 +1348,17 @@ class FederationHandler(BaseHandler):
"Error handling queued PDU %s from %s: %s", p.event_id, origin, e
)
- @defer.inlineCallbacks
- @log_function
- def on_make_join_request(self, origin, room_id, user_id):
+ async def on_make_join_request(
+ self, origin: str, room_id: str, user_id: str
+ ) -> EventBase:
""" We've received a /make_join/ request, so we create a partial
join event for the room and return that. We do *not* persist or
process it until the other server has signed it and sent it back.
Args:
- origin (str): The (verified) server name of the requesting server.
- room_id (str): Room to create join event in
- user_id (str): The user to create the join for
-
- Returns:
- Deferred[FrozenEvent]
+ origin: The (verified) server name of the requesting server.
+ room_id: Room to create join event in
+ user_id: The user to create the join for
"""
if get_domain_from_id(user_id) != origin:
logger.info(
@@ -1373,7 +1370,7 @@ class FederationHandler(BaseHandler):
event_content = {"membership": Membership.JOIN}
- room_version = yield self.store.get_room_version_id(room_id)
+ room_version = await self.store.get_room_version_id(room_id)
builder = self.event_builder_factory.new(
room_version,
@@ -1387,14 +1384,14 @@ class FederationHandler(BaseHandler):
)
try:
- event, context = yield self.event_creation_handler.create_new_client_event(
+ event, context = await self.event_creation_handler.create_new_client_event(
builder=builder
)
except AuthError as e:
logger.warning("Failed to create join to %s because %s", room_id, e)
raise e
- event_allowed = yield self.third_party_event_rules.check_event_allowed(
+ event_allowed = await self.third_party_event_rules.check_event_allowed(
event, context
)
if not event_allowed:
@@ -1405,7 +1402,7 @@ class FederationHandler(BaseHandler):
# The remote hasn't signed it yet, obviously. We'll do the full checks
# when we get the event back in `on_send_join_request`
- yield self.auth.check_from_context(
+ await self.auth.check_from_context(
room_version, event, context, do_sig_check=False
)
|
