diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-21 14:50:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 14:50:54 +0000 |
| commit | 83f335bedf83c5b099d269b3ee241e7474bc1c57 (patch) | |
| tree | 2c844b79665fc32b0bfc49285586394edf367131 /synapse/federation/federation_server.py | |
| parent | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... (diff) | |
| download | synapse-83f335bedf83c5b099d269b3ee241e7474bc1c57.tar.xz | |
Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_server
Implement server side of MSC1794 - Federation v2 Invite API
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 98722ae543..37d29e7027 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -369,13 +369,13 @@ class FederationServer(FederationBase): }) @defer.inlineCallbacks - def on_invite_request(self, origin, content): + def on_invite_request(self, origin, content, room_version): pdu = event_from_pdu_json(content) origin_host, _ = parse_server_name(origin) yield self.check_server_matches_acl(origin_host, pdu.room_id) ret_pdu = yield self.handler.on_invite_request(origin, pdu) time_now = self._clock.time_msec() - defer.returnValue((200, {"event": ret_pdu.get_pdu_json(time_now)})) + defer.returnValue({"event": ret_pdu.get_pdu_json(time_now)}) @defer.inlineCallbacks def on_send_join_request(self, origin, content): |