diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-02-23 15:11:35 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-02-23 15:11:35 +0000 |
| commit | 28ad246bb46c6227f17f86788f6f438eaf48328d (patch) | |
| tree | 5179d927a8d339151131a1faf79cd79fb8265179 /synapse/rest/client/v1/room.py | |
| parent | Merge pull request #600 from matrix-org/erikj/presence (diff) | |
| parent | Allow third_party_signed to be specified on /join (diff) | |
| download | synapse-28ad246bb46c6227f17f86788f6f438eaf48328d.tar.xz | |
Merge pull request #584 from matrix-org/daniel/ephemeralthreepids
Allow third_party_signed to be specified on /join
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index e6f5c5614a..07a2a5dd82 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -228,6 +228,8 @@ class JoinRoomAliasServlet(ClientV1RestServlet): allow_guest=True, ) + content = _parse_json(request) + if RoomID.is_valid(room_identifier): room_id = room_identifier remote_room_hosts = None @@ -248,6 +250,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet): action="join", txn_id=txn_id, remote_room_hosts=remote_room_hosts, + third_party_signed=content.get("third_party_signed", None), ) defer.returnValue((200, {"room_id": room_id})) @@ -451,6 +454,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet): room_id=room_id, action=membership_action, txn_id=txn_id, + third_party_signed=content.get("third_party_signed", None), ) defer.returnValue((200, {})) |