Ticket #3156: ticket3156_r16498_lobby_dont_spamfilter_chat_scrollback.patch

binaries/data/mods/public/gui/lobby/lobby.js

@@ -598 +598 @@
 
 function onTick()
 {
+
+    // fixes #3156 (spam filter shouldn't apply to chat scrollback)
+    var enableSpamCheck = false;
+    
     updateTimers();
     checkSpamMonitor();
 
@@ -613 +617 @@
         {
         case "mucmessage": // For room messages
             var from = escapeText(message.from);
-            addChatMessage({ "from": from, "text": text });
+            addChatMessage({ "from": from, "text": text }, enableSpamCheck);
             break;
         case "message": // For private messages
             var from = escapeText(message.from);
@@ -679 +683 @@
                 break;
             case "subject":
                 updateSubject(message.text);
+                enableSpamCheck = true;
                 break;
             default:
                 warn(sprintf("Unknown message.level '%(msglvl)s'", { msglvl: message.level }));
@@ -804 +809 @@
  *
  * @param msg The message to be processed.
  */
-function addChatMessage(msg)
+function addChatMessage(msg, checkSpam = true)
 {
     // Some calls of this function will leave some msg parameters empty. Text is required though.
     if (msg.from)
@@ -827 +832 @@
 
     // Run spam test
     updateSpamMonitor(msg.from);
-    if (isSpam(msg.text, msg.from))
+    if (checkSpam && isSpam(msg.text, msg.from))
         return;
-
+    
     // Format Text
     var formatted = ircFormat(msg.text, msg.from, msg.color, msg.key);