Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 17:49:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into storage_transactions

Browse Source
This commit is contained in:
Mark Haines 2014-08-26 16:15:49 +01:00
commit 47c1a3d454
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/federation.py
View File

@ -114,7 +114,7 @@ class FederationHandler(BaseHandler):
if event.type == RoomMemberEvent.TYPE: if event.type == RoomMemberEvent.TYPE:
if event.membership == Membership.JOIN: if event.membership == Membership.JOIN:
user = self.hs.parse_userid(event.target_user_id) user = self.hs.parse_userid(event.state_key)
self.distributor.fire( self.distributor.fire(
"user_joined_room", user=user, room_id=event.room_id "user_joined_room", user=user, room_id=event.room_id
) )