commit a5e880c2db8f61a981a6512091a71348e52f0807
parent a2aea25a76c7fc0c0f514aedc738e235aab0403f
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Wed, 8 Jan 2025 18:04:54 -0800
cleanup duplicated code
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkg/web/handlers/interceptors/spamInterceptor.go b/pkg/web/handlers/interceptors/spamInterceptor.go
@@ -60,12 +60,13 @@ func checkDynamicFilters(c *command.Command, lowerCaseMessage string, silentSelf
isMatch := (f.IsRegex && f.Rgx.MatchString(c.Message)) ||
(!f.IsRegex && strings.Contains(lowerCaseMessage, f.Term))
if isMatch {
+ dynFilterMsg := fmt.Sprintf("dyn filter: #%d", f.ID)
nbMsgCond := f.NbMsg == 0 || c.AuthUser.GeneralMessagesCount <= f.NbMsg
if f.Hb && nbMsgCond {
- dutils.SelfHellBan(c.DB, c.AuthUser, fmt.Sprintf("dyn filter: #%d", f.ID))
+ dutils.SelfHellBan(c.DB, c.AuthUser, dynFilterMsg)
return ErrSilent
} else if f.Kick && nbMsgCond {
- _ = dutils.SelfKick(c.DB, *c.AuthUser, silentSelfKick, fmt.Sprintf("dyn filter: #%d", f.ID))
+ _ = dutils.SelfKick(c.DB, *c.AuthUser, silentSelfKick, dynFilterMsg)
return ErrSpamFilterTriggered
} else if nbMsgCond {
return ErrSpamFilterTriggered