better chat filters

[alttp.git] / app / TwitchBot / TwitchChatBot.php

diff --git a/app/TwitchBot/TwitchChatBot.php b/app/TwitchBot/TwitchChatBot.php
index f43dba7a35e18ad39b74ed73a3662dcc0528e8cd..cb390f9655a863d21217c424d2b7672ae1c8d1c5 100644 (file)
--- a/app/TwitchBot/TwitchChatBot.php
+++ b/app/TwitchBot/TwitchChatBot.php
@@ -72,7 +72,7 @@ class TwitchChatBot extends TwitchBot {
                        return;
                }
                $text = $this->contextualMsg($channel);
-               if (!$text) $text = $this->randomMsg($channel);
+               if (!$text) $text = $this->randomChat($channel);
                if (!$text) return;
                $this->tagChannelWrite($channel);
                $this->sendIRCMessage(IRCMessage::privmsg($channel->twitch_chat, $text));
@@ -332,7 +332,7 @@ class TwitchChatBot extends TwitchBot {
                $this->getNotes($channel);
                $this->notes[$channel->id]['last_read'] = time();
                ++$this->notes[$channel->id]['read_since_last_write'];
-               if (!$msg->isKnownBot() && !$msg->scanForSpam()) {
+               if (!ChatLog::isKnownBot($msg->nick) && !ChatLog::spammyText($msg->getText())) {
                        $this->notes[$channel->id]['latest_msgs'][] = $msg->getText();
                        if (count($this->notes[$channel->id]['latest_msgs']) > 10) {
                                array_shift($this->notes[$channel->id]['latest_msgs']);