diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-08 16:52:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-08 16:52:09 +0100 |
| commit | 5c688739d68ea8d87a668115a32acaee222dc3ca (patch) | |
| tree | b93cea250a9a748c3f9e3931f4ed08e26043a5ed /synapse/handlers/room.py | |
| parent | Add delta file (diff) | |
| parent | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard (diff) | |
| download | synapse-5c688739d68ea8d87a668115a32acaee222dc3ca.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_state_groups
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 |