summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 16:15:49 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 16:15:49 +0100
commit47c1a3d454f41a1f2643f1cfa7c1de8d5544a2ed (patch)
treedc278e0191aee5255351e21f03d8d34a5409e202 /synapse/handlers
parentUse state_key rather than target_user_id (diff)
parentUse state_key rather than target_user_id (diff)
downloadsynapse-47c1a3d454f41a1f2643f1cfa7c1de8d5544a2ed.tar.xz
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 2680678de7..bfc1ab86f2 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -114,7 +114,7 @@ class FederationHandler(BaseHandler):
 
         if event.type == RoomMemberEvent.TYPE:
             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(
                     "user_joined_room", user=user, room_id=event.room_id
                 )