summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-10-04 14:17:05 +0100
commitebbd37b66db2c5ed700d50dd00e3e108d7f1268c (patch)
tree235bd75367c221a98d10c03eb86d63173e875bb2 /synapse/events
parentMerge branch 'release-v1.44' into matrix-org-hotfixes (diff)
parentFix error in `get_user_ip_and_agents` when fetching from the database (#10968) (diff)
downloadsynapse-ebbd37b66db2c5ed700d50dd00e3e108d7f1268c.tar.xz
Merge branch 'release-v1.44' into matrix-org-hotfixes
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py

index f86113a448..38fccd1efc 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py
@@ -105,7 +105,7 @@ 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") + add_fields(EventContentFields.AUTHORISING_USER) elif event_type == EventTypes.Create: # MSC2176 rules state that create events cannot be redacted. if room_version.msc2176_redaction_rules: