diff options
| author | Erik Johnston <erikj@jki.re> | 2016-12-12 17:00:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 17:00:10 +0000 |
| commit | 1574b839e02a38434371d1cd97559102319cf206 (patch) | |
| tree | 2dae67cf8872c2231d4f140b8517e37308a19f9f /synapse/federation/federation_client.py | |
| parent | Merge pull request #1694 from matrix-org/rav/no_get_e2e_keys (diff) | |
| parent | Rename network_id to instance_id on client side (diff) | |
| download | synapse-1574b839e02a38434371d1cd97559102319cf206.tar.xz | |
Merge pull request #1676 from matrix-org/erikj/room_list
Add new API appservice specific public room list
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index b255709165..6e23c207ee 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -655,12 +655,15 @@ class FederationClient(FederationBase): raise RuntimeError("Failed to send to any server.") def get_public_rooms(self, destination, limit=None, since_token=None, - search_filter=None): + search_filter=None, include_all_networks=False, + third_party_instance_id=None): if destination == self.server_name: return return self.transport_layer.get_public_rooms( - destination, limit, since_token, search_filter + destination, limit, since_token, search_filter, + include_all_networks=include_all_networks, + third_party_instance_id=third_party_instance_id, ) @defer.inlineCallbacks |