diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:29 +0100 |
| commit | 484a0ebdfcae39be59ff8d8da948a62f5cce110c (patch) | |
| tree | 2848d6347df8b04faa727c325c6ed19826061b91 /synapse/federation/transport/client.py | |
| parent | Update workers.rst with new paths (diff) | |
| parent | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff) | |
| download | synapse-484a0ebdfcae39be59ff8d8da948a62f5cce110c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 4529d454af..b4fbe2c9d5 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -195,7 +195,7 @@ class TransportLayerClient(object): @defer.inlineCallbacks @log_function - def make_membership_event(self, destination, room_id, user_id, membership): + def make_membership_event(self, destination, room_id, user_id, membership, params): """Asks a remote server to build and sign us a membership event Note that this does not append any events to any graphs. @@ -205,6 +205,8 @@ class TransportLayerClient(object): room_id (str): room to join/leave user_id (str): user to be joined/left membership (str): one of join/leave + params (dict[str, str|Iterable[str]]): Query parameters to include in the + request. Returns: Deferred: Succeeds when we get a 2xx HTTP response. The result @@ -241,6 +243,7 @@ class TransportLayerClient(object): content = yield self.client.get_json( destination=destination, path=path, + args=params, retry_on_dns_fail=retry_on_dns_fail, timeout=20000, ignore_backoff=ignore_backoff, |