fix end with emoteless token

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

diff --git a/app/TwitchBot/TokenizedMessage.php b/app/TwitchBot/TokenizedMessage.php
index 61ca5c8dee40d346e575342e7494512ac055a562..e35299803c4753f369c5942c3d3c914b05f5208e 100644 (file)
--- a/app/TwitchBot/TokenizedMessage.php
+++ b/app/TwitchBot/TokenizedMessage.php
@@ -67,10 +67,18 @@ class TokenizedMessage {
                return Str::endsWith($this->emoteless, $text);
        }
 
+       public function endsWithEmotelessToken($text) {
+               return !empty($this->emoteless_tokens) && $this->emoteless_tokens[count($this->emoteless_tokens) - 1] == $text;
+       }
+
        public function endsWithRaw($text) {
                return Str::endsWith($this->raw, $text);
        }
 
+       public function endsWithToken($text) {
+               return !empty($this->tokens) && $this->tokens[count($this->tokens) - 1] == $text;
+       }
+
        public function getNumericValue() {
                return intval($this->text);
        }
@@ -185,10 +193,18 @@ class TokenizedMessage {
                return $this->startsWith($text) || $this->endsWith($text);
        }
 
+       public function startsOrEndsWithEmotelessToken($text) {
+               return $this->startsWithEmotelessToken($text) || $this->endsWithEmotelessToken($text);
+       }
+
        public function startsOrEndsWithRaw($text) {
                return $this->startsWithRaw($text) || $this->endsWithRaw($text);
        }
 
+       public function startsOrEndsWithToken($text) {
+               return $this->startsWithToken($text) || $this->endsWithToken($text);
+       }
+
        public function startsWith($text) {
                return Str::startsWith($this->text, $text);
        }
@@ -197,10 +213,18 @@ class TokenizedMessage {
                return Str::startsWith($this->emoteless, $text);
        }
 
+       public function startsWithEmotelessToken($text) {
+               return isset($this->emoteless_tokens[0]) && $this->emoteless_tokens[0] == $text;
+       }
+
        public function startsWithRaw($text) {
                return Str::startsWith($this->raw, $text);
        }
 
+       public function startsWithToken($text) {
+               return isset($this->tokens[0]) && $this->tokens[0] == $text;
+       }
+
 
        public function isSpammy() {
                if ($this->startsWith('!')) {
@@ -215,7 +239,7 @@ class TokenizedMessage {
                if ($this->containsRaw('horstie')) {
                        return true;
                }
-               if ($this->containsRaw(['vielendankfürdenraid', 'thanksfortheraid', 'willkommenaufstarbase47'])) {
+               if ($this->containsRaw(['folgtjetzt', 'vielendankfürdenraid', 'thanksfortheraid', 'willkommenaufstarbase47'])) {
                        return true;
                }
                return false;
@@ -228,20 +252,18 @@ class TokenizedMessage {
                                $this->classification = 'unclassified';
                        } else if ($this->startsWith('!')) {
                                $this->classification = 'cmd';
-                       } else if (is_numeric($this->raw)) {
-                               $this->classification = 'number';
                        } else if ($this->hasTokenThatStartsOrEndsWith(['gg']) || $this->hasEmoteThatEndsWith(['gg'])) {
                                $this->classification = 'gg';
                        } else if ($this->containsRaw(['glgl', 'glhf', 'goodluck', 'hfgl'])) {
                                $this->classification = 'gl';
+                       } else if ($this->hasToken(['danke', 'thanks', 'thx', 'ty']) && !$this->hasToken(['nah', 'nee', 'nein', 'no'])) {
+                               $this->classification = 'thx';
                        } else if ($this->startsWithRaw(['ahoi', 'hallo', 'hello', 'hey', 'huhu', 'moin']) || $this->hasEmoteThatEndsWith(['hello', 'heyguys', 'hi', 'vohiyo', 'wave']) || $this->hasToken(['hi', 'hey', 'yo']) || $this->containsRaw(['gutenmorgen', 'gutenabend'])) {
                                $this->classification = 'hi';
                        } else if ($this->hasTokenThatStartsOrEndsWith(['pog', 'wow'])) {
                                $this->classification = 'pog';
                        } else if ($this->containsRaw(['hype']) || $this->hasEmoteThatEndsWith(['dance', 'jam', 'party', 'rave', 'troete'])) {
                                $this->classification = 'hype';
-                       } else if ($this->hasToken(['danke', 'thanks', 'thx', 'ty'])) {
-                               $this->classification = 'thx';
                        } else if ($this->hasToken(['<3']) || $this->hasEmoteThatEndsWith(['heart', 'herz', 'hug', 'love'])) {
                                $this->classification = 'love';
                        } else if ($this->hasToken(['nani', 'wat', 'wtf']) || $this->hasEmoteThatEndsWith(['wat', 'wtf'])) {
@@ -256,10 +278,18 @@ class TokenizedMessage {
                                $this->classification = 'sweat';
                        } else if ($this->endsWithEmoteless('?')) {
                                $this->classification = 'question';
+                       } else if ($this->hasToken(['jo', 'yep', 'yes']) || $this->startsOrEndsWithEmotelessToken('ja') || $this->containsRaw('nodders') || $this->hasEmoteThatEndsWith(['nod', 'nodders', 'yea'])) {
+                               $this->classification = 'yes';
+                       } else if ($this->hasToken(['nah', 'nee', 'nein', 'no']) || $this->containsRaw('nopers') || $this->hasEmoteThatEndsWith(['nay', 'nope', 'nopers'])) {
+                               $this->classification = 'no';
+                       } else if ($this->hasEmoteThatContains(['kappa', 'keepo'])) {
+                               $this->classification = 'kappa';
                        } else if ($this->startsOrEndsWithRaw(['o7']) || $this->hasEmoteThatContains('salut')) {
                                $this->classification = 'o7';
                        } else if ($this->containsRaw(['haha', 'hehe', 'hihi', 'kekw', 'lol', 'lul']) || $this->hasTokenThatStartsWith(['xd']) || $this->hasConsecutiveTokens([':', 'd'])) {
                                $this->classification = 'lol';
+                       } else if (is_numeric($this->raw)) {
+                               $this->classification = 'number';
                        } else {
                                $this->classification = 'unclassified';
                        }