diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 16:29:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 16:29:44 +0100 |
| commit | 8885c8546c3493ada2f00b1626d45fa90109ab5f (patch) | |
| tree | 7dbe04a84413a4511bcc3ef62d227659052cefa7 /synapse/handlers/federation.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
| parent | Respect 'limit' param in initialSync api (diff) | |
| download | synapse-8885c8546c3493ada2f00b1626d45fa90109ab5f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
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 ) |