diff options
| author | Kegan Dougal <kegan@matrix.org> | 2016-08-23 16:32:04 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2016-08-23 16:32:04 +0100 |
| commit | 4b31426a02d32b26b97bd04328426df1666f756d (patch) | |
| tree | 015f70068aa38404943f6b7ae8b53195901c8f2e /synapse/rest/client | |
| parent | Merge pull request #1038 from matrix-org/erikj/receved_txn_purge (diff) | |
| download | synapse-4b31426a02d32b26b97bd04328426df1666f756d.tar.xz | |
Pass through user-supplied content in /join/$room_id
It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 89c3895118..0d81757010 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -268,6 +268,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet): action="join", txn_id=txn_id, remote_room_hosts=remote_room_hosts, + content=content, third_party_signed=content.get("third_party_signed", None), ) |