From a29d12a18a00821391c4b1dcd47b3be68e35ed33 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@openmarket.com>
Date: Tue, 26 Aug 2014 16:13:26 +0100
Subject: Use state_key rather than target_user_id

---
 synapse/handlers/federation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
                 )
-- 
cgit 1.4.1