Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow clients to specify a server_name to avoid 'No known servers' 

Multiple server_names are supported via ?server_name=foo&server_name=bar
This commit is contained in:
Kegan Dougal 2016-05-19 13:50:52 +01:00
parent 6fb51eaf7b
commit 332d7e9b97
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/rest/client/v1/room.py
View File

@ -232,7 +232,10 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
if RoomID.is_valid(room_identifier): if RoomID.is_valid(room_identifier):
room_id = room_identifier room_id = room_identifier
remote_room_hosts = None try:
remote_room_hosts = request.args["server_name"]
except:
remote_room_hosts = None
elif RoomAlias.is_valid(room_identifier): elif RoomAlias.is_valid(room_identifier):
handler = self.handlers.room_member_handler handler = self.handlers.room_member_handler
room_alias = RoomAlias.from_string(room_identifier) room_alias = RoomAlias.from_string(room_identifier)