Merge remote-tracking branch 'upstream/release-v1.42'

This commit is contained in:
Tulir Asokan 2021-09-06 18:12:09 +03:00
commit 165a1096bc
9 changed files with 145 additions and 4 deletions

View file

@ -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: