Skip to content

Implement MSC4169: backwards-compatible redaction sending for rooms < v11 using the /send endpoint #18898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 22, 2025
Merged

Implement MSC4169: backwards-compatible redaction sending for rooms < v11 using the /send endpoint #18898

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dfd18bb
Fix sending redactions on rooms < v11 using the /send endpoint
SpiritCroc Sep 4, 2025
4964d32
Add changelog
SpiritCroc Sep 8, 2025
888c29c
Add credits and period to changelog entry
SpiritCroc Sep 8, 2025
b42aab2
Move rather than copy "redacts" field
SpiritCroc Sep 9, 2025
f535d49
Merge remote-tracking branch 'element/develop' into redaction-send-co…
SpiritCroc Sep 9, 2025
89695d8
Fix sending messages that do not redact
SpiritCroc Sep 9, 2025
17989b3
Make changes an opt-in to MSC-4169
SpiritCroc Sep 9, 2025
86706c5
Fix typo in comment
SpiritCroc Sep 9, 2025
b0f919c
Refactor to make logic independent of the ratelimit path
tulir Sep 9, 2025
2bc9d28
Lint
SpiritCroc Sep 9, 2025
cf89b25
Update synapse/handlers/message.py
reivilibre Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/18898.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix error trying to send redaction events using the `/send` API in room versions prior to v11. Contributed by @SpiritCroc @ Beeper.
9 changes: 8 additions & 1 deletion synapse/handlers/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,14 @@ async def create_and_send_nonmember_event(
if room_version.updated_redaction_rules:
redacts = event_dict["content"].get("redacts")
else:
redacts = event_dict.get("redacts")
# Legacy room versions need the "redacts" field outside of the event's
# content. However clients may still send it within the content, so copy
# the field if necessary for compatibility.
redacts = event_dict.get("redacts") or event_dict["content"].get(
"redacts"
)
if redacts and "redacts" not in event_dict:
event_dict["redacts"] = redacts

is_admin_redaction = await self.is_admin_redaction(
event_type=event_dict["type"],
Expand Down
Loading