summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@openmarket.com>2014-08-26 16:13:26 +0100
committerMark Haines <mark.haines@openmarket.com>2014-08-26 16:13:32 +0100
commita29d12a18a00821391c4b1dcd47b3be68e35ed33 (patch)
treed00a13e2909d7825f46ac677e171c5e932b1c3eb
parentFix pyflakes errors (diff)
downloadsynapse-a29d12a18a00821391c4b1dcd47b3be68e35ed33.tar.xz
Use state_key rather than target_user_id
-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
                 )