fix shit

diff --git a/app/Models/ChatLog.php b/app/Models/ChatLog.php
index 1da62d5af27e3debbd967d735cf3f349d4b301ad..8564ff097b55abbe7eb12e4072568222bb60c944 100644 (file)
--- a/app/Models/ChatLog.php
+++ b/app/Models/ChatLog.php
@@ -34,7 +34,7 @@ class ChatLog extends Model {
                }
 
                if ($this->command == 'PRIVMSG') {
-                       if ($this->isKnownBot()) {
+                       if (static::isKnownBot($this->nick)) {
                                $this->type = 'bot';
                        } else if (substr($this->params[0], 0, 1) == '#') {
                                $this->type = 'chat';
@@ -53,8 +53,8 @@ class ChatLog extends Model {
                throw new \Exception('unidentified message');
        }
 
-       public function isKnownBot() {
-               return in_array(strtolower($this->nick), [
+       public static function isKnownBot($nick) {
+               return in_array(strtolower($nick), [
                        'birrellthesquirrel',
                        'funtoon',
                        'nidbot2000',
@@ -134,38 +134,42 @@ class ChatLog extends Model {
                }
        }
 
-       protected function scanForSpam() {
-               if (substr($this->text_content, 0, 1) == '!') {
+       public static function spammyText($text) {
+               if (substr($text, 0, 1) == '!') {
                        return true;
                }
-               if (strpos($this->text_content, '$') !== false) {
+               if (strpos($text, '$') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, '€') !== false) {
+               if (strpos($text, '€') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, '@') !== false) {
+               if (strpos($text, '@') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, '://') !== false) {
+               if (strpos($text, '://') !== false) {
                        return true;
                }
-               if (is_numeric($this->text_content)) {
+               if (strpos($text, 'followers') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, 'followers') !== false) {
+               if (strpos($text, 'promotion') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, 'promotion') !== false) {
+               if (strpos($text, 'viewers') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, 'viewers') !== false) {
+               if (strpos($text, 'view ers') !== false) {
                        return true;
                }
-               if (strpos($this->text_content, 'view ers') !== false) {
+               return false;
+       }
+
+       protected function scanForSpam() {
+               if (is_numeric($text)) {
                        return true;
                }
-               return false;
+               return static::spammyText($this->text_content);
        }
 
        protected $casts = [

diff --git a/app/TwitchBot/TwitchChatBot.php b/app/TwitchBot/TwitchChatBot.php
index f43dba7a35e18ad39b74ed73a3662dcc0528e8cd..831bf5ca4560acf7f09f909079d4dcbea787c324 100644 (file)
--- a/app/TwitchBot/TwitchChatBot.php
+++ b/app/TwitchBot/TwitchChatBot.php
@@ -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']);