dkforest

commit e14e3fef36debab242f4c8bc9bd6cefba3f5d475
parent 71e57cfba278951e6f855b8a853a9d9c92dbf482
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun,  4 Dec 2022 20:36:20 -0500

cleanup

Diffstat:
M
pkg/database/utils/utils.go
 | 
4
++++
M
pkg/web/handlers/api/v1/spamInterceptor.go
 | 
8
++++----

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkg/database/utils/utils.go b/pkg/database/utils/utils.go
@@ -63,6 +63,10 @@ func SilentKick(kicked, kickedBy database.User) {
 	kick(kicked, kickedBy, true)
 }
 
+func SelfKick(kicked database.User, silent bool) {
+	kick(kicked, kicked, silent)
+}
+
 func kick(kicked, kickedBy database.User, silent bool) {
 	database.NewAudit(kickedBy, fmt.Sprintf("kick %s #%d", kicked.Username, kicked.ID))
 	kicked.Verified = false
diff --git a/pkg/web/handlers/api/v1/spamInterceptor.go b/pkg/web/handlers/api/v1/spamInterceptor.go
@@ -36,13 +36,13 @@ func checkSpam(origMessage string, authUser *database.User) error {
 			strings.Contains(lowerCaseMessage, "i wanna see gore") ||
 			strings.Contains(lowerCaseMessage, "how can i make money") ||
 			strings.Contains(lowerCaseMessage, "any links for scary stuff") {
-			dutils.SilentKick(*authUser, *authUser)
+			dutils.SelfKick(*authUser, true)
 			return ErrSpamFilterTriggered
 		}
 	}
 	if authUser.GeneralMessagesCount < 20 || time.Since(authUser.CreatedAt) < 5*time.Hour {
 		if strings.Contains(lowerCaseMessage, "cp link") {
-			dutils.SilentKick(*authUser, *authUser)
+			dutils.SelfKick(*authUser, true)
 			return ErrSpamFilterTriggered
 		}
 	}
@@ -51,7 +51,7 @@ func checkSpam(origMessage string, authUser *database.User) error {
 		if authUser.IsModerator() {
 			return ErrSpamFilterTriggered
 		}
-		dutils.SilentKick(*authUser, *authUser)
+		dutils.SelfKick(*authUser, true)
 		return ErrSpamFilterTriggered
 	}
 
@@ -79,7 +79,7 @@ func checkSpam(origMessage string, authUser *database.User) error {
 
 	if authUser.GeneralMessagesCount < 20 || time.Since(authUser.CreatedAt) < 5*time.Hour {
 		if wordsMap["cp"] > 0 && (wordsMap["link"] > 0 || wordsMap["links"] > 0) {
-			dutils.SilentKick(*authUser, *authUser)
+			dutils.SelfKick(*authUser, true)
 			return ErrSpamFilterTriggered
 		}
 	}