diff options
| author | David Baker <dave@matrix.org> | 2016-05-31 17:20:07 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-05-31 17:20:07 +0100 |
| commit | d240796dedcfae1f6929c1501e7e335df417cfaf (patch) | |
| tree | e7d6544a111fe4856b74a05d9e08d4b0af5524de /synapse/rest/client/v1 | |
| parent | Fix c+p fail (diff) | |
| download | synapse-d240796dedcfae1f6929c1501e7e335df417cfaf.tar.xz | |
Basic, un-cached support for secondary_directory_servers
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 2d22bbdaa3..db52a1fc39 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -280,7 +280,8 @@ class PublicRoomListRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request): handler = self.hs.get_room_list_handler() - data = yield handler.get_public_room_list() + data = yield handler.get_aggregated_public_room_list() + defer.returnValue((200, data)) |