Ticket #3156: ticket3156_r16498_lobby_dont_spamfilter_chat_scrollback.patch
File ticket3156_r16498_lobby_dont_spamfilter_chat_scrollback.patch, 1.5 KB (added by , 9 years ago) |
---|
-
binaries/data/mods/public/gui/lobby/lobby.js
598 598 599 599 function onTick() 600 600 { 601 602 // fixes #3156 (spam filter shouldn't apply to chat scrollback) 603 var enableSpamCheck = false; 604 601 605 updateTimers(); 602 606 checkSpamMonitor(); 603 607 … … 613 617 { 614 618 case "mucmessage": // For room messages 615 619 var from = escapeText(message.from); 616 addChatMessage({ "from": from, "text": text } );620 addChatMessage({ "from": from, "text": text }, enableSpamCheck); 617 621 break; 618 622 case "message": // For private messages 619 623 var from = escapeText(message.from); … … 679 683 break; 680 684 case "subject": 681 685 updateSubject(message.text); 686 enableSpamCheck = true; 682 687 break; 683 688 default: 684 689 warn(sprintf("Unknown message.level '%(msglvl)s'", { msglvl: message.level })); … … 804 809 * 805 810 * @param msg The message to be processed. 806 811 */ 807 function addChatMessage(msg )812 function addChatMessage(msg, checkSpam = true) 808 813 { 809 814 // Some calls of this function will leave some msg parameters empty. Text is required though. 810 815 if (msg.from) … … 827 832 828 833 // Run spam test 829 834 updateSpamMonitor(msg.from); 830 if ( isSpam(msg.text, msg.from))835 if (checkSpam && isSpam(msg.text, msg.from)) 831 836 return; 832 837 833 838 // Format Text 834 839 var formatted = ircFormat(msg.text, msg.from, msg.color, msg.key); 835 840