policyeval/commands: Add "redact user" shortcut in deactivate command

go.mod

@@ -14,11 +14,11 @@ require (
 	golang.org/x/sync v0.19.0
 	gopkg.in/yaml.v3 v3.0.1
 	maunium.net/go/mauflag v1.0.0
-	maunium.net/go/mautrix v0.26.3
+	maunium.net/go/mautrix v0.26.4-0.20260228175716-e0125d54f462
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
+	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coder/websocket v1.8.14 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/yuin/goldmark v1.7.16 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
+	golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
 	golang.org/x/net v0.50.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect
 	golang.org/x/text v0.34.0 // indirect

go.sum

@@ -1,5 +1,5 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
+filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
 github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -79,8 +79,8 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
 golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
-golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a h1:ovFr6Z0MNmU7nH8VaX5xqw+05ST2uO1exVfZPVqRC5o=
-golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
+golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
+golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
 golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
 golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
@@ -103,5 +103,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.26.3 h1:tWZih6Vjw0qGTWuPmg9JUrQPzViTNDPGQLVc5UXC4nk=
-maunium.net/go/mautrix v0.26.3/go.mod h1:v5ZdDoCwUpNqEj5OrhEoUa3L1kEddKPaAya9TgGXN38=
+maunium.net/go/mautrix v0.26.4-0.20260228175716-e0125d54f462 h1:kftvLWLT5W8uGqDJZmSYISIn0kJgURUSmhzt9ip6HGg=
+maunium.net/go/mautrix v0.26.4-0.20260228175716-e0125d54f462/go.mod h1:lJvXCZya2dGT2KW7LUO7Ucna7Ohs6hl2+7v8Ji6R3iM=

policyeval/commands.go

@@ -39,7 +39,10 @@ type MjolnirShortcodeEventContent struct {
 
 var StateMjolnirShortcode = event.Type{Type: "org.matrix.mjolnir.shortcode", Class: event.StateEventType}
 
-const SuccessReaction = "✅"
+const (
+	ActionPendingReaction = "⏳"
+	SuccessReaction       = "✅"
+)
 
 func (pe *PolicyEvaluator) HandleCommand(ctx context.Context, evt *event.Event) {
 	if !evt.Mautrix.WasEncrypted && pe.Bot.CryptoHelper != nil && pe.RequireEncryption {
@@ -1129,6 +1132,7 @@ var cmdSuspend = &CommandHandler{
 
 type DeactivateParams struct {
 	UserID id.UserID `json:"user"`
+	Redact bool      `json:"redact"`
 	Erase  bool      `json:"erase"`
 }
 
@@ -1138,12 +1142,42 @@ var cmdDeactivate = &CommandHandler{
 	Parameters: []*cmdschema.Parameter{{
 		Key:    "user",
 		Schema: cmdschema.PrimitiveTypeUserID.Schema(),
+	}, {
+		Key:    "redact",
+		Schema: cmdschema.PrimitiveTypeBoolean.Schema(),
 	}, {
 		Key:      "erase",
 		Schema:   cmdschema.PrimitiveTypeBoolean.Schema(),
 		Optional: true,
 	}},
 	Func: commands.WithParsedArgs(func(ce *CommandEvent, args *DeactivateParams) {
+		if args.Redact {
+			task, err := ce.Meta.Bot.SynapseAdmin.RedactUser(ce.Ctx, args.UserID, synapseadmin.ReqRedactUser{})
+			if err != nil {
+				ce.Reply("Failed to start user redaction task: %v", err)
+			}
+			r := ce.React(ActionPendingReaction)
+			for {
+				progress, err := ce.Meta.Bot.SynapseAdmin.RedactUserStatus(ce.Ctx, task.RedactID)
+				if err != nil {
+					ce.Reply("User redaction task failed: %v", err)
+					return
+				}
+				switch progress.Status {
+				case "complete":
+					if len(progress.FailedRedactions) > 0 {
+						ce.Reply("User redaction task finished successfully but failed to redact %d events", len(progress.FailedRedactions))
+					}
+				case "failed", "cancelled":
+					ce.Reply("User redaction task failed.")
+				default:
+					time.Sleep(time.Second)
+					continue
+				}
+				break
+			}
+			_, _ = ce.Meta.Bot.RedactEvent(ce.Ctx, ce.RoomID, r)
+		}
 		err := ce.Meta.Bot.SynapseAdmin.DeactivateAccount(ce.Ctx, args.UserID, synapseadmin.ReqDeleteUser{
 			Erase: args.Erase,
 		})