Make admin api redactions use the requester to send the redaction (#18029)

morguldir · web-flow · commit 7c2284b2f22d · 2024-12-23T11:19:35.000Z
diff --git a/changelog.d/18029.bugfix b/changelog.d/18029.bugfix
@@ -0,0 +1 @@
+Fix a bug preventing the admin redaction endpoint from working on messages from remote users.
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py
@@ -473,7 +473,7 @@ async def _redact_all_events(
                     "type": EventTypes.Redaction,
                     "content": {"reason": reason} if reason else {},
                     "room_id": room,
-                    "sender": user_id,
+                    "sender": requester.user.to_string(),
                 }
                 if room_version.updated_redaction_rules:
                     event_dict["content"]["redacts"] = event.event_id

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix a bug preventing the admin redaction endpoint from working on messages from remote users.`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ async def _redact_all_events(`
`473`	`473`	`"type": EventTypes.Redaction,`
`474`	`474`	`"content": {"reason": reason} if reason else {},`
`475`	`475`	`"room_id": room,`
`476`		`- "sender": user_id,`
	`476`	`+ "sender": requester.user.to_string(),`
`477`	`477`	`}`
`478`	`478`	`if room_version.updated_redaction_rules:`
`479`	`479`	`event_dict["content"]["redacts"] = event.event_id`