more classification

diff --git a/app/Models/ChatLog.php b/app/Models/ChatLog.php
index 063e8036485cdf5cc31ef793215db38f63a90b4c..6af158784247045dcd4c6c4a0e0fcdbbbe2f5f9f 100644 (file)
--- a/app/Models/ChatLog.php
+++ b/app/Models/ChatLog.php
@@ -79,11 +79,13 @@ class ChatLog extends Model {
 
        public static function isKnownBot($nick) {
                return in_array(strtolower($nick), [
+                       'a_n_i_v',
                        'birrellthesquirrel',
                        'funtoon',
                        'nidbot2000',
                        'nightbot',
                        'pokemoncommunitygame',
+                       'sery_bot',
                        'speedgaming',
                        'starbase47',
                        'streamelements',

diff --git a/app/TwitchBot/TokenizedMessage.php b/app/TwitchBot/TokenizedMessage.php
index 99947374d134a8301773cf866153a22d179ab6d1..0e241d5cd804c490e72f761d01cba7ae70357e5d 100644 (file)
--- a/app/TwitchBot/TokenizedMessage.php
+++ b/app/TwitchBot/TokenizedMessage.php
@@ -22,7 +22,7 @@ class TokenizedMessage {
                                $positions = explode(',', $set[1]);
                                foreach ($positions as $position) {
                                        $coords = explode('-', $position);
-                                       $this->emotes[] = strtolower(substr($this->text, $coords[0], $coords[1] - $coords[0] + 1));
+                                       $this->emotes[] = preg_replace('/\d+$/', '', strtolower(substr($this->text, $coords[0], $coords[1] - $coords[0] + 1)));
                                        for ($i = intval($coords[0]); $i <= intval($coords[1]); ++$i) {
                                                $this->emoteless[$i] = ' ';
                                        }
@@ -51,6 +51,10 @@ class TokenizedMessage {
                return Str::contains($this->text, $text);
        }
 
+       public function containsEmoteless($text) {
+               return Str::contains($this->emoteless, $text);
+       }
+
        public function containsRaw($text) {
                return Str::contains($this->raw, $text);
        }
@@ -59,6 +63,10 @@ class TokenizedMessage {
                return Str::endsWith($this->text, $text);
        }
 
+       public function endsWithEmoteless($text) {
+               return Str::endsWith($this->emoteless, $text);
+       }
+
        public function endsWithRaw($text) {
                return Str::endsWith($this->raw, $text);
        }
@@ -68,6 +76,14 @@ class TokenizedMessage {
        }
 
        public function hasEmote($text) {
+               if (is_array($text)) {
+                       foreach ($text as $token) {
+                               if (in_array($token, $this->emotes)) {
+                                       return true;
+                               }
+                       }
+                       return false;
+               }
                return in_array($text, $this->emotes);
        }
 
@@ -108,6 +124,14 @@ class TokenizedMessage {
        }
 
        public function hasToken($text) {
+               if (is_array($text)) {
+                       foreach ($text as $token) {
+                               if (in_array($token, $this->tokens)) {
+                                       return true;
+                               }
+                       }
+                       return false;
+               }
                return in_array($text, $this->tokens);
        }
 
@@ -159,6 +183,10 @@ class TokenizedMessage {
                return Str::startsWith($this->text, $text);
        }
 
+       public function startsWithEmoteless($text) {
+               return Str::startsWith($this->emoteless, $text);
+       }
+
        public function startsWithRaw($text) {
                return Str::startsWith($this->raw, $text);
        }
@@ -177,7 +205,7 @@ class TokenizedMessage {
                if ($this->containsRaw('horstie')) {
                        return true;
                }
-               if ($this->containsRaw(['vielendankfürdenraid', 'willkommenaufstarbase47'])) {
+               if ($this->containsRaw(['vielendankfürdenraid', 'thanksfortheraid', 'willkommenaufstarbase47'])) {
                        return true;
                }
                return false;
@@ -188,22 +216,32 @@ class TokenizedMessage {
                if (is_null($this->classification)) {
                        if (empty($this->raw)) {
                                $this->classification = 'unclassified';
+                       } else if ($this->startsWith('!')) {
+                               $this->classification = 'cmd';
                        } else if (is_numeric($this->raw)) {
                                $this->classification = 'number';
-                       } else if ($this->hasTokenThatStartsOrEndsWith(['gg'])) {
+                       } else if ($this->hasTokenThatStartsOrEndsWith(['gg']) || $this->hasEmoteThatEndsWith(['gg'])) {
                                $this->classification = 'gg';
-                       } else if ($this->containsRaw(['glgl', 'glhf', 'hfgl'])) {
+                       } else if ($this->containsRaw(['glgl', 'glhf', 'goodluck', 'hfgl'])) {
                                $this->classification = 'gl';
-                       } else if ($this->containsRaw(['haha', 'hehe', 'hihi', 'kekw', 'lol', 'lul', 'xd']) || $this->hasTokenThatStartsWith(':d')) {
-                               $this->classification = 'lol';
-                       } else if ($this->startsWithRaw(['ahoi', 'hallo', 'hello', 'huhu']) || $this->hasEmoteThatEndsWith(['hello', 'hi', 'wave']) || $this->hasToken('hi')) {
+                       } else if ($this->startsWithRaw(['ahoi', 'hallo', 'hello', 'hey', 'huhu', 'moin']) || $this->hasEmoteThatEndsWith(['hello', 'heyguys', 'hi', 'wave']) || $this->hasToken(['hi', 'hey']) || $this->containsRaw(['gutenmorgen', 'gutenabend'])) {
                                $this->classification = 'hi';
-                       } else if ($this->containsRaw(['pog', 'wow'])) {
+                       } else if ($this->hasTokenThatStartsOrEndsWith(['pog', 'wow'])) {
                                $this->classification = 'pog';
                        } else if ($this->containsRaw(['hype'])) {
                                $this->classification = 'hype';
+                       } else if ($this->hasToken(['danke', 'thanks', 'thx', 'ty'])) {
+                               $this->classification = 'thx';
+                       } else if ($this->hasToken(['<3']) || $this->hasEmoteThatEndsWith(['herz', 'hug', 'love'])) {
+                               $this->classification = 'love';
+                       } else if ($this->hasTokenThatStartsWith(['wat', 'wtf']) || $this->hasEmoteThatStartsWith(['wat', 'wtf'])) {
+                               $this->classification = 'wtf';
+                       } else if ($this->endsWithEmoteless('?')) {
+                               $this->classification = 'question';
                        } else if ($this->startsOrEndsWithRaw(['o7']) || $this->hasEmoteThatContains('salut')) {
                                $this->classification = 'o7';
+                       } else if ($this->containsRaw(['haha', 'hehe', 'hihi', 'kekw', 'lol', 'lul']) || $this->hasTokenThatStartsWith([':d', 'xd'])) {
+                               $this->classification = 'lol';
                        } else {
                                $this->classification = 'unclassified';
                        }

diff --git a/app/TwitchBot/TwitchChatBot.php b/app/TwitchBot/TwitchChatBot.php
index abc1b4518e2b7f528e289643551109c4b135a63a..5b067a67bccc7eaf76c2e15031da2df04c3fff8f 100644 (file)
--- a/app/TwitchBot/TwitchChatBot.php
+++ b/app/TwitchBot/TwitchChatBot.php
@@ -191,6 +191,9 @@ class TwitchChatBot extends TwitchBot {
        }
 
        private function randomLaughter(Channel $channel) {
+               if (!random_int(0, 2)) {
+                       return $channel->randomOfClass('lol');
+               }
                return Arr::random([
                        ':tf:',
                        '4Head',
@@ -201,7 +204,6 @@ class TwitchChatBot extends TwitchBot {
                        'GunRun',
                        'heh',
                        'Hhhehehe',
-                       'HypeLUL',
                        'Jebaited',
                        'Jebasted',
                        'KEKW',
@@ -220,7 +222,6 @@ class TwitchChatBot extends TwitchBot {
                        'SUBprise',
                        'xD',
                        'YouDontSay',
-                       $channel->randomOfClass('lol'),
                ]);
        }
 

diff --git a/tests/Unit/TwitchBot/TokenizedMessageTest.php b/tests/Unit/TwitchBot/TokenizedMessageTest.php
index 48ae5ab3ebfb13f7959f29ccd1b76029501789cb..6fe2e0dd9916583b1d8590819678ada2ca3f2ae8 100644 (file)
--- a/tests/Unit/TwitchBot/TokenizedMessageTest.php
+++ b/tests/Unit/TwitchBot/TokenizedMessageTest.php
@@ -8,12 +8,15 @@ use PHPUnit\Framework\TestCase;
 class TokenizedMessageTest extends TestCase {
 
        public function test_classification() {
+               $this->assertEquals('cmd', TokenizedMessage::fromString('!start')->classify());
+
                $this->assertEquals('gg', TokenizedMessage::fromString('gg')->classify());
                $this->assertEquals('gg', TokenizedMessage::fromString('GG')->classify());
                $this->assertEquals('gg', TokenizedMessage::fromString('Gg')->classify());
                $this->assertEquals('gg', TokenizedMessage::fromString('ggs')->classify());
                $this->assertEquals('gg', TokenizedMessage::fromString('ja gg dann, ne')->classify());
-               $this->assertEquals('gg', TokenizedMessage::fromString('duden2Gg')->classify());
+               $this->assertEquals('gg', TokenizedMessage::fromString('duden2Gg', ['emotes' => 'blah:0-7'])->classify());
+               $this->assertEquals('gg', TokenizedMessage::fromString('ticknaGg2', ['emotes' => 'blah:0-8'])->classify());
                $this->assertNotEquals('gg', TokenizedMessage::fromString('Eggnog')->classify());
 
                $this->assertEquals('gl', TokenizedMessage::fromString('glhf')->classify());
@@ -21,7 +24,9 @@ class TokenizedMessageTest extends TestCase {
 
                $this->assertEquals('hi', TokenizedMessage::fromString('hi')->classify());
                $this->assertEquals('hi', TokenizedMessage::fromString('hallo')->classify());
+               $this->assertEquals('hi', TokenizedMessage::fromString('Hallo zusammen :)')->classify());
                $this->assertEquals('hi', TokenizedMessage::fromString('osora9Hello', ['emotes' => 'blah:0-10'])->classify());
+               $this->assertEquals('hi', TokenizedMessage::fromString('hallo ihr lieben ticknaHi2 ticknaHerz', ['emotes' => 'blah:17-25/blubb:27-36'])->classify());
                $this->assertNotEquals('hi', TokenizedMessage::fromString('hier steht was')->classify());
 
                $this->assertEquals('hype', TokenizedMessage::fromString('122 Hype!')->classify());
@@ -31,15 +36,26 @@ class TokenizedMessageTest extends TestCase {
 
                $this->assertEquals('lol', TokenizedMessage::fromString('haha')->classify());
                $this->assertEquals('lol', TokenizedMessage::fromString('KEKW')->classify());
-               $this->assertEquals('lol', TokenizedMessage::fromString('LUL')->classify());
+               $this->assertEquals('lol', TokenizedMessage::fromString('LUL', ['emotes' => 'blah:0-2'])->classify());
                $this->assertEquals('lol', TokenizedMessage::fromString(':D')->classify());
+               $this->assertEquals('lol', TokenizedMessage::fromString('xD')->classify());
+               $this->assertEquals('lol', TokenizedMessage::fromString('denkst du LUL', ['emotes' => 'blah:10-12'])->classify());
+               $this->assertNotEquals('lol', TokenizedMessage::fromString('holy nynyxDiscoLove', ['emotes' => 'blah:5-18'])->classify());
 
                $this->assertEquals('o7', TokenizedMessage::fromString('o7')->classify());
                $this->assertEquals('o7', TokenizedMessage::fromString('ticknaSalutieren', ['emotes' => 'blah:0-15'])->classify());
 
                $this->assertEquals('pog', TokenizedMessage::fromString('Pog')->classify());
+               $this->assertNotEquals('pog', TokenizedMessage::fromString('wo war der')->classify());
+
+               $this->assertEquals('question', TokenizedMessage::fromString('Joaaa geht so ...und selbst?')->classify());
+
+               $this->assertEquals('thx', TokenizedMessage::fromString('danke für den tipp')->classify());
+
+               $this->assertEquals('wtf', TokenizedMessage::fromString('wtf? lol')->classify());
 
                $this->assertEquals('unclassified', TokenizedMessage::fromString('')->classify());
+               $this->assertEquals('unclassified', TokenizedMessage::fromString('bitte boots locked in desert und bib')->classify());
        }
 
        public function test_spam() {