diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-08 16:04:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 16:04:22 +0100 |
| commit | 257025ac89f1a71173d6262248e7344b7aba9984 (patch) | |
| tree | 033ae6c9b7f837a383c575bb8cd7f89d5f71df17 /synapse/handlers | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Use parse_string (diff) | |
| download | synapse-257025ac89f1a71173d6262248e7344b7aba9984.tar.xz | |
Merge pull request #1082 from matrix-org/erikj/remote_public_rooms
Add server param to /publicRooms
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/room.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index bf6b1c1535..8758af4ca1 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -444,6 +444,16 @@ class RoomListHandler(BaseHandler): self.remote_list_cache = yield deferred @defer.inlineCallbacks + def get_remote_public_room_list(self, server_name): + res = yield self.hs.get_replication_layer().get_public_rooms( + [server_name] + ) + + if server_name not in res: + raise SynapseError(404, "Server not found") + defer.returnValue(res[server_name]) + + @defer.inlineCallbacks def get_aggregated_public_room_list(self): """ Get the public room list from this server and the servers |