diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-17 15:50:13 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-17 15:50:13 +0000 |
| commit | 591af2d074044a70a48b033c4dfc322f58189d3e (patch) | |
| tree | 9b8c6a470e30fd7f06fc1ff4253ea5ea555f8610 /synapse/rest/client/v1 | |
| parent | Respond to federated invite with non-empty context (diff) | |
| download | synapse-591af2d074044a70a48b033c4dfc322f58189d3e.tar.xz | |
Some cleanup
I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :(
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 179fe9a010..1f5ee09dcc 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -230,11 +230,11 @@ class JoinRoomAliasServlet(ClientV1RestServlet): if RoomID.is_valid(room_identifier): room_id = room_identifier - room_hosts = None + remote_room_hosts = None elif RoomAlias.is_valid(room_identifier): handler = self.handlers.room_member_handler room_alias = RoomAlias.from_string(room_identifier) - room_id, room_hosts = yield handler.lookup_room_alias(room_alias) + room_id, remote_room_hosts = yield handler.lookup_room_alias(room_alias) room_id = room_id.to_string() else: raise SynapseError(400, "%s was not legal room ID or room alias" % ( @@ -247,7 +247,7 @@ class JoinRoomAliasServlet(ClientV1RestServlet): room_id=room_id, action="join", txn_id=txn_id, - room_hosts=room_hosts, + remote_room_hosts=remote_room_hosts, ) defer.returnValue((200, {"room_id": room_id})) |