diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:37:31 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 10:37:31 +0100 |
| commit | f6daa9f1703d0f924dc2c519151b841def4a051b (patch) | |
| tree | feebb74986533487afe19e91f3e52437d3fd1fad /synapse/handlers/federation.py | |
| parent | Add 'state_key' to valid_keys (diff) | |
| parent | URL renaming: Room state keys now use the format /rooms/$roomid/state/$event_... (diff) | |
| download | synapse-f6daa9f1703d0f924dc2c519151b841def4a051b.tar.xz | |
Merge branch 'client_server_url_rename' into develop
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 9cff444779..16bac95331 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -65,7 +65,7 @@ class FederationHandler(BaseHandler): content.update({"membership": Membership.JOIN}) new_event = self.event_factory.create_event( etype=RoomMemberEvent.TYPE, - target_user_id=event.user_id, + state_key=event.user_id, room_id=event.room_id, user_id=event.user_id, membership=Membership.JOIN, |