diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-23 17:27:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-23 17:27:43 +0000 |
| commit | fd654a4d54e812857fff273609ac6d14ae5d28aa (patch) | |
| tree | 62b3d8217b482f0b62daee407ebc649b494b340d /synapse/federation/federation_server.py | |
| parent | Update newsfile (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-fd654a4d54e812857fff273609ac6d14ae5d28aa.tar.xz | |
Merge branch 'erikj/msc_1813' into erikj/require_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): |