diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-09-06 16:29:59 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-09-06 16:29:59 +0100 |
| commit | 287108fb2e0ef2dbdc37f6fbf3d05b2f43ffb635 (patch) | |
| tree | e279de690bfd47c4ef2df96d3769931fd2c9fb3e /synapse/events | |
| parent | Add logging to help debug #9424 (#10704) (diff) | |
| parent | Improve changelog wording (diff) | |
| download | synapse-287108fb2e0ef2dbdc37f6fbf3d05b2f43ffb635.tar.xz | |
Merge tag 'v1.42.0rc2' into develop
Synapse 1.42.0rc2 (2021-09-06) ============================== This version of Synapse removes deprecated room-management admin APIs, removes out-of-date email pushers, and improves error handling for fallback templates for user-interactive authentication. For more information on these points, server administrators are encouraged to read [the upgrade notes](docs/upgrade.md#upgrading-to-v1420). Features -------- - Support room version 9 from [MSC3375](https://github.com/matrix-org/matrix-doc/pull/3375). ([\#10747](https://github.com/matrix-org/synapse/issues/10747)) Internal Changes ---------------- - Print a warning when using one of the deprecated `template_dir` settings. ([\#10768](https://github.com/matrix-org/synapse/issues/10768))
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 738a151cef..fb22337e27 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -104,6 +104,8 @@ def prune_event_dict(room_version: RoomVersion, event_dict: dict) -> dict: if event_type == EventTypes.Member: add_fields("membership") + if room_version.msc3375_redaction_rules: + add_fields("join_authorised_via_users_server") elif event_type == EventTypes.Create: # MSC2176 rules state that create events cannot be redacted. if room_version.msc2176_redaction_rules: |