summary refs log tree commit diff
path: root/synapse/events/utils.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-09-06 15:38:03 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-09-06 15:38:03 +0100
commit92bbe0ebe1da56a2bc5c26eeb6cc9e5ad3904ab5 (patch)
treebf53235b84c6d634dd9ac5a65d150d866e24aa72 /synapse/events/utils.py
parentMerge branch 'release-v1.42' of github.com:matrix-org/synapse into matrix-org... (diff)
parentMove the upgrade notes reminder up to rc2 (diff)
downloadsynapse-92bbe0ebe1da56a2bc5c26eeb6cc9e5ad3904ab5.tar.xz
Merge branch 'release-v1.42' into matrix-org-hotfixes
Diffstat (limited to 'synapse/events/utils.py')
-rw-r--r--synapse/events/utils.py2
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: