Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make FederationHandler.user_joined_room async

This commit is contained in:
Richard van der Hoff 2020-02-03 16:28:31 +00:00
parent 52642860da
commit f64c96662e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/federation.py
View File

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