Merge pull request #148 from destinygg/link-spam-bug

Fix triggering spam if mention twice and then don't mention.
destinygg · Feb 9, 2024 · 88a5181 · 88a5181
2 parents 14d92e9 + 4541f53
commit 88a5181
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/lib/message-routing/message-router.js b/lib/message-routing/message-router.js
@@ -109,6 +109,7 @@ class MessageRouter {
       this.spamDetection.checkListOfRecentUrlsForSpam(
         messageContent,
         this.chatCache.getViewerUrlList(user),
+        this.chatCache.messageUrlSpamUser,
       ),
     ];
 

diff --git a/lib/services/dgg-rolling-chat-cache.js b/lib/services/dgg-rolling-chat-cache.js
@@ -79,12 +79,7 @@ class ChatCache {
   }
 
   addMessageToViewerUrlMap(user, message) {
-    if (
-      this.messageUrlSpamUser &&
-      !this.messageMatching.mentionsUser(message, this.messageUrlSpamUser)
-    ) {
-      return;
-    }
+    if (!this.messageMatching.mentionsUser(message, this.messageUrlSpamUser)) return;
     this.messageMatching.getLinks(message).forEach((link) => {
       this.logger.info(
         { user, url: link.hostname + link.pathname, msg: message },

diff --git a/lib/services/spam-detection.js b/lib/services/spam-detection.js
@@ -118,7 +118,8 @@ class SpamDetection {
     return this.isSimilarityAboveThreshold(matchPercents);
   }
 
-  checkListOfRecentUrlsForSpam(message, urlList) {
+  checkListOfRecentUrlsForSpam(message, urlList, mentionUser = null) {
+    if (!this.messageMatching.mentionsUser(message, mentionUser)) return false;
     return this.messageMatching.getLinks(message).some((link) => {
       return (
         urlList.filter((url) => url === link.hostname + link.pathname).length >=