summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-08 11:53:05 +0100
committerErik Johnston <erik@matrix.org>2016-09-08 11:53:05 +0100
commit791658b57677cc60b02b969ab3cb617da8cc62f9 (patch)
tree411d20b22cca6159cc55c52dff164958f973a1ac /synapse/handlers
parentMerge pull request #1079 from matrix-org/erikj/state_seqscan (diff)
downloadsynapse-791658b57677cc60b02b969ab3cb617da8cc62f9.tar.xz
Add server param to /publicRooms
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py10
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