From f64c96662ed794bbdd8960002658602a1b92eb2b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 3 Feb 2020 16:28:31 +0000
Subject: [PATCH] make FederationHandler.user_joined_room async
---
synapse/handlers/federation.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index e252e69888..c94573b547 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -2895,15 +2895,15 @@ class FederationHandler(BaseHandler):
else:
await self.store.clean_room_for_join(room_id)
- def user_joined_room(self, user, room_id):
+ async def user_joined_room(self, user: UserID, room_id: str) -> None:
"""Called when a new user has joined the room
"""
if self.config.worker_app:
- return self._notify_user_membership_change(
+ await self._notify_user_membership_change(
room_id=room_id, user_id=user.to_string(), change="joined"
)
else:
- return defer.succeed(user_joined_room(self.distributor, user, room_id))
+ user_joined_room(self.distributor, user, room_id)
@defer.inlineCallbacks
def get_room_complexity(self, remote_room_hosts, room_id):
--
GitLab