diff options
| author | David Baker <dave@matrix.org> | 2016-09-09 19:11:34 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-09-09 19:11:34 +0100 |
| commit | b91e2833b3b59d6a8d104d8f6304383e68de2086 (patch) | |
| tree | 4df820b06f89d7cb98ec6f75a99be4eebbd92ef6 /synapse/handlers/room.py | |
| parent | Add index to event_push_actions (diff) | |
| parent | Merge pull request #1096 from matrix-org/markjh/get_access_token (diff) | |
| download | synapse-b91e2833b3b59d6a8d104d8f6304383e68de2086.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast
Diffstat (limited to 'synapse/handlers/room.py')
| -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 |