diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-08 17:10:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 17:10:53 +0100 |
| commit | 8521ae13e33301e06eb1fb5b36a8eef4e7f6453f (patch) | |
| tree | fa2749c97eb5ada93e0d7dd620e429b19d00664f /synapse/federation/transport/client.py | |
| parent | Merge pull request #3662 from matrix-org/neilj/reserved_users (diff) | |
| parent | Don't expose default_room_version as config opt (diff) | |
| download | synapse-8521ae13e33301e06eb1fb5b36a8eef4e7f6453f.tar.xz | |
Merge pull request #3654 from matrix-org/rav/room_versions
Support for room versioning
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, |