policyeval/execute: AutoSuspendPrefix need not be a pointer

nexy7574 · nexy7574 · commit 0030472320f4 · 2025-08-19T18:44:24.000+01:00
diff --git a/config/event.go b/config/event.go
@@ -20,7 +20,7 @@ type WatchedPolicyList struct {
 	DontApplyACL      bool      `json:"dont_apply_acl"`
 	AutoUnban         bool      `json:"auto_unban"`
 	AutoSuspend       bool      `json:"auto_suspend"`
-	AutoSuspendPrefix *string   `json:"auto_suspend_prefix,omitempty"`
+	AutoSuspendPrefix string    `json:"auto_suspend_prefix"`
 
 	DontNotifyOnChange bool `json:"dont_notify_on_change"`
 }
diff --git a/policyeval/execute.go b/policyeval/execute.go
@@ -136,10 +136,7 @@ func (pe *PolicyEvaluator) maybeApplySuspend(ctx context.Context, userID id.User
 		return
 	}
 	plist := pe.GetWatchedListMeta(policy.RoomID)
-	if !plist.AutoSuspend {
-		return
-	}
-	if plist.AutoSuspendPrefix != nil && !strings.HasPrefix(*plist.AutoSuspendPrefix, policy.Reason) {
+	if !plist.AutoSuspend || !strings.HasPrefix(plist.AutoSuspendPrefix, policy.Reason) {
 		return
 	}
 	err := pe.Bot.SynapseAdmin.SuspendAccount(ctx, userID, synapseadmin.ReqSuspendUser{Suspend: true})

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type WatchedPolicyList struct {`
`20`	`20`	DontApplyACL bool `json:"dont_apply_acl"`
`21`	`21`	AutoUnban bool `json:"auto_unban"`
`22`	`22`	AutoSuspend bool `json:"auto_suspend"`
`23`		- AutoSuspendPrefix *string `json:"auto_suspend_prefix,omitempty"`
	`23`	+ AutoSuspendPrefix string `json:"auto_suspend_prefix"`
`24`	`24`
`25`	`25`	DontNotifyOnChange bool `json:"dont_notify_on_change"`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,7 @@ func (pe *PolicyEvaluator) maybeApplySuspend(ctx context.Context, userID id.User`
`136`	`136`	`return`
`137`	`137`	`}`
`138`	`138`	`plist := pe.GetWatchedListMeta(policy.RoomID)`
`139`		`- if !plist.AutoSuspend {`
`140`		`- return`
`141`		`- }`
`142`		`- if plist.AutoSuspendPrefix != nil && !strings.HasPrefix(*plist.AutoSuspendPrefix, policy.Reason) {`
	`139`	`+ if !plist.AutoSuspend \|\| !strings.HasPrefix(plist.AutoSuspendPrefix, policy.Reason) {`
`143`	`140`	`return`
`144`	`141`	`}`
`145`	`142`	`err := pe.Bot.SynapseAdmin.SuspendAccount(ctx, userID, synapseadmin.ReqSuspendUser{Suspend: true})`