diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-17 11:08:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-17 11:10:37 +0100 |
| commit | 816988baaa31210b36c49ad207eecf30d0223595 (patch) | |
| tree | 7f10b3a6a890d4bbb7d33a76d5f26e0acc2b7497 /synapse/federation/transport/client.py | |
| parent | Drop some unused indices (diff) | |
| parent | Merge pull request #1162 from larroy/master (diff) | |
| download | synapse-816988baaa31210b36c49ad207eecf30d0223595.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 2b138526ba..db45c7826c 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -248,12 +248,22 @@ class TransportLayerClient(object): @defer.inlineCallbacks @log_function - def get_public_rooms(self, remote_server): + def get_public_rooms(self, remote_server, limit, since_token, + search_filter=None): path = PREFIX + "/publicRooms" + args = {} + if limit: + args["limit"] = [str(limit)] + if since_token: + args["since"] = [since_token] + + # TODO(erikj): Actually send the search_filter across federation. + response = yield self.client.get_json( destination=remote_server, path=path, + args=args, ) defer.returnValue(response) |