diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-06-01 15:32:52 +0100 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-06-01 15:32:52 +0100 |
| commit | 00c487a8dbba7b7767ed207dcf835d4cb408ccd9 (patch) | |
| tree | d0510818ac8d57ecfb7f6b6cf33c20676fd14060 /synapse/rest/client/v1 | |
| parent | Merge pull request #810 from matrix-org/dbkr/limit_email_notifs (diff) | |
| parent | Inject fake room list handler in tests (diff) | |
| download | synapse-00c487a8dbba7b7767ed207dcf835d4cb408ccd9.tar.xz | |
Merge pull request #808 from matrix-org/dbkr/room_list_spider
Add secondary_directory_servers option to fetch room list from other 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)) |