diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-11-29 10:43:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 15:43:20 +0000 |
| commit | 9d1971a5c440fe2bb92ea092d17ac00d37e36466 (patch) | |
| tree | 8cbecb1151ef15ce7a5d73d93c6f11981c3020d9 /synapse/federation/federation_server.py | |
| parent | Update the media repository documentation (#11415) (diff) | |
| download | synapse-9d1971a5c440fe2bb92ea092d17ac00d37e36466.tar.xz | |
Return the stable `event` field from `/send_join` per MSC3083. (#11413)
This does not remove the unstable field and still parses both. Handling of the unstable field will need to be removed in the future.
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 9a8758e9a6..8fbc75aa65 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -613,8 +613,11 @@ class FederationServer(FederationBase): state = await self.store.get_events(state_ids) time_now = self._clock.time_msec() + event_json = event.get_pdu_json() return { - "org.matrix.msc3083.v2.event": event.get_pdu_json(), + # TODO Remove the unstable prefix when servers have updated. + "org.matrix.msc3083.v2.event": event_json, + "event": event_json, "state": [p.get_pdu_json(time_now) for p in state.values()], "auth_chain": [p.get_pdu_json(time_now) for p in auth_chain], } |