X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FTwitchBot%2FTokenizedMessage.php;h=42d6ca8ca8f08c05cc625e3b32df236ef4683932;hb=ebc1e9c3b448b575b749d62a0f31f82879c47625;hp=99947374d134a8301773cf866153a22d179ab6d1;hpb=7d1ef8619d7513184340f73e99efa20481b86d75;p=alttp.git

diff --git a/app/TwitchBot/TokenizedMessage.php b/app/TwitchBot/TokenizedMessage.php
index 9994737..42d6ca8 100644
--- a/app/TwitchBot/TokenizedMessage.php
+++ b/app/TwitchBot/TokenizedMessage.php
@@ -12,7 +12,7 @@ class TokenizedMessage {
 		$this->text = $text;
 		$this->tags = $tags;
 		$this->raw = strtolower(preg_replace('/[^\w]/u', '', $text));
-		$this->tokens = preg_split('/\s+/', strtolower(trim($text)));
+		$this->tokens = array_values(array_map('trim', array_filter(preg_split('/\b/', strtolower($text)))));
 
 		$this->emoteless = $this->text;
 		if (isset($this->tags['emotes']) && !empty($this->tags['emotes'])) {
@@ -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] = ' ';
 					}
@@ -31,7 +31,7 @@ class TokenizedMessage {
 			$this->emoteless = trim(preg_replace('/\s+/', ' ', $this->emoteless));
 		}
 		$this->emoteless_raw = strtolower(preg_replace('/[^\w]/', '', $this->emoteless));
-		$this->emoteless_tokens = preg_split('/\s+/', strtolower($this->emoteless));
+		$this->emoteless_tokens = array_values(array_map('trim', array_filter(preg_split('/\b/', strtolower($this->emoteless)))));
 	}
 
 	public static function fromIRC(IRCMessage $msg) {
@@ -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);
 	}
@@ -67,7 +75,25 @@ class TokenizedMessage {
 		return intval($this->text);
 	}
 
+	public function hasConsecutiveTokens($tokens) {
+		for ($i = 0; $i < count($this->tokens) - count($tokens) + 1; ++$i) {
+			for ($j = 0; $j < count($tokens); ++$j) {
+				if ($this->tokens[$i + $j] != $tokens[$j]) break;
+			}
+			if ($j == count($tokens)) return true;
+		}
+		return false;
+	}
+
 	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 +134,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 +193,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 +215,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 +226,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', 'vohiyo', 'wave']) || $this->hasToken(['hi', 'hey', 'yo']) || $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'])) {
+			} 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'])) {
+				$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(['xd']) || $this->hasConsecutiveTokens([':', 'd'])) {
+				$this->classification = 'lol';
 			} else {
 				$this->classification = 'unclassified';
 			}