policyeval/execute: set redact_events field on ban if applicable

See matrix-org/matrix-spec-proposals#4293

Author: tulir

go.mod

@@ -12,7 +12,7 @@ require (
 	go.mau.fi/zeroconfig v0.1.3
 	gopkg.in/yaml.v3 v3.0.1
 	maunium.net/go/mauflag v1.0.0
-	maunium.net/go/mautrix v0.24.1-0.20250527150456-f5746ee0f68d
+	maunium.net/go/mautrix v0.24.1-0.20250611161019-b8921397b82f
 )
 
 require (

go.sum

@@ -96,5 +96,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
-maunium.net/go/mautrix v0.24.1-0.20250527150456-f5746ee0f68d h1:xm5Dhdl+0kAPjh5olHfnvmsGUdIEsa9fYBNL8p5HXdA=
-maunium.net/go/mautrix v0.24.1-0.20250527150456-f5746ee0f68d/go.mod h1:HqA1HUutQYJkrYRPkK64itARDz79PCec1oWVEB72HVQ=
+maunium.net/go/mautrix v0.24.1-0.20250611161019-b8921397b82f h1:fBWlmxu8ehizMNxGXr85FPM4fym38aaWJgr5hALSduI=
+maunium.net/go/mautrix v0.24.1-0.20250611161019-b8921397b82f/go.mod h1:HqA1HUutQYJkrYRPkK64itARDz79PCec1oWVEB72HVQ=

policyeval/execute.go

@@ -48,9 +48,6 @@ func (pe *PolicyEvaluator) ApplyPolicy(ctx context.Context, userID id.UserID, po
 				Any("matches", policy).
 				Msg("Applying ban recommendation")
 			pe.policyServer.UpdateRecommendation(userID, pe.GetProtectedRooms(), PSRecommendationSpam)
-			for _, room := range rooms {
-				pe.ApplyBan(ctx, userID, room, recs.BanOrUnban)
-			}
 			shouldRedact := recs.BanOrUnban.Recommendation == event.PolicyRecommendationUnstableTakedown
 			if !shouldRedact && recs.BanOrUnban.Reason != "" {
 				for _, pattern := range pe.autoRedactPatterns {
@@ -60,6 +57,9 @@ func (pe *PolicyEvaluator) ApplyPolicy(ctx context.Context, userID id.UserID, po
 					}
 				}
 			}
+			for _, room := range rooms {
+				pe.ApplyBan(ctx, userID, room, recs.BanOrUnban, shouldRedact)
+			}
 			if shouldRedact {
 				go pe.RedactUser(context.WithoutCancel(ctx), userID, recs.BanOrUnban.Reason, true)
 			}
@@ -149,7 +149,13 @@ func (pe *PolicyEvaluator) maybeApplySuspend(ctx context.Context, userID id.User
 	}
 }
 
-func (pe *PolicyEvaluator) ApplyBan(ctx context.Context, userID id.UserID, roomID id.RoomID, policy *policylist.Policy) {
+func (pe *PolicyEvaluator) ApplyBan(
+	ctx context.Context,
+	userID id.UserID,
+	roomID id.RoomID,
+	policy *policylist.Policy,
+	shouldRedact bool,
+) {
 	ta := &database.TakenAction{
 		TargetUser: userID,
 		InRoomID:   roomID,
@@ -164,6 +170,8 @@ func (pe *PolicyEvaluator) ApplyBan(ctx context.Context, userID id.UserID, roomI
 		_, err = pe.Bot.BanUser(ctx, roomID, &mautrix.ReqBanUser{
 			Reason: filterReason(policy.Reason),
 			UserID: userID,
+
+			MSC4293RedactEvents: shouldRedact,
 		})
 	}
 	if err != nil {