Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:54:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Allow third_party_signed to be specified on /join

Browse source
This commit is contained in:
Daniel Wagner-Hall 2016-02-23 15:11:25 +00:00 • committed by review.rocks
parent a7b2ce32f7
commit 577951b032
7 changed files with 196 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/rest/client/v1/room.py
View file

@ -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, {}))