diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-23 16:50:06 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-23 16:51:46 +0000 |
| commit | 67cd4dad81ed2932009472da2d13648ca11eab73 (patch) | |
| tree | 2e95db3676cc00b59b2853c6066b91b65bfb91a0 /synapse/federation/federation_server.py | |
| parent | isort (diff) | |
| download | synapse-67cd4dad81ed2932009472da2d13648ca11eab73.tar.xz | |
Implement MSC 1813 - Add room version to make APIs
We also implement `make_membership_event` converting the returned room version to an event format version.
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 37d29e7027..17eccaaea0 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -400,8 +400,14 @@ class FederationServer(FederationBase): origin_host, _ = parse_server_name(origin) yield self.check_server_matches_acl(origin_host, room_id) pdu = yield self.handler.on_make_leave_request(room_id, user_id) + + room_version = yield self.store.get_room_version(room_id) + time_now = self._clock.time_msec() - defer.returnValue({"event": pdu.get_pdu_json(time_now)}) + defer.returnValue({ + "event": pdu.get_pdu_json(time_now), + "room_version": room_version, + }) @defer.inlineCallbacks def on_send_leave_request(self, origin, content): |