diff options
| author | Kegsay <kegsay@gmail.com> | 2016-05-19 14:13:11 +0100 |
|---|---|---|
| committer | Kegsay <kegsay@gmail.com> | 2016-05-19 14:13:11 +0100 |
| commit | 60ff2e7984154f3b4176e9446600b841caf99b3a (patch) | |
| tree | a7e5b9f911c047cb179f2d172be1643145eae76c /synapse/rest/client | |
| parent | Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convo (diff) | |
| parent | Allow clients to specify a server_name to avoid 'No known servers' (diff) | |
| download | synapse-60ff2e7984154f3b4176e9446600b841caf99b3a.tar.xz | |
Merge pull request #794 from matrix-org/kegan/join-with-server-name
Allow clients to specify a server_name to avoid 'No known servers'
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index cf478c6f79..644aa4e513 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -232,7 +232,10 @@ class JoinRoomAliasServlet(ClientV1RestServlet): if RoomID.is_valid(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): handler = self.handlers.room_member_handler room_alias = RoomAlias.from_string(room_identifier) |