X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FTwitchBot%2FTokenizedMessage.php;h=b460020a3e2e2a42a5683cf7ba78c41f1e01792b;hb=HEAD;hp=f84527c5012ffd1e538163f5599797f1d40a5f9b;hpb=9a606c41e6ae92d82dbace81a28b4e54ab10c9cb;p=alttp.git

diff --git a/app/TwitchBot/TokenizedMessage.php b/app/TwitchBot/TokenizedMessage.php
index f84527c..f218e7a 100644
--- a/app/TwitchBot/TokenizedMessage.php
+++ b/app/TwitchBot/TokenizedMessage.php
@@ -11,10 +11,13 @@ class TokenizedMessage {
 	public function __construct($text, $tags = []) {
 		$this->text = trim($text);
 		$this->tags = $tags;
+		if (isset($tags['reply-parent-display-name'])) {
+			$this->text = mb_substr($text, mb_strlen($tags['reply-parent-display-name']) + 2);
+		}
 		$this->raw = strtolower(preg_replace('/[^\w]/u', '', $this->text));
 		$this->tokens = array_values(array_map('trim', array_filter(preg_split('/\b/u', strtolower($this->text)))));
 
-		$this->emoteless = $this->text;
+		$this->emoteless = $text;
 		if (isset($this->tags['emotes']) && !empty($this->tags['emotes'])) {
 			$emotes = explode('/', $this->tags['emotes']);
 			foreach ($emotes as $emote) {
@@ -47,6 +50,11 @@ class TokenizedMessage {
 	}
 
 
+	public function getText() {
+		return $this->text;
+	}
+
+
 	public function contains($text) {
 		return Str::contains($this->text, $text);
 	}
@@ -253,7 +261,7 @@ class TokenizedMessage {
 		if ($this->contains(['€', '$', '@', '://'])) {
 			return true;
 		}
-		if ($this->containsRaw(['followers', 'promotion', 'viewers'])) {
+		if ($this->containsRaw(['follow', 'promotion', 'viewer'])) {
 			return true;
 		}
 		if ($this->containsRaw('horsti')) {
@@ -265,6 +273,7 @@ class TokenizedMessage {
 			'isnowlivestreaming',
 			'stürmtdenladenmit',
 			'thanksfortheraid',
+			'verschwindetfürneweileindenlurk',
 			'vielendankfürdenraid',
 			'willkommenaufstarbase47',
 		])) {
@@ -282,7 +291,7 @@ class TokenizedMessage {
 				$this->classification = 'cmd';
 			} else if ($this->isShort() && ($this->hasTokenThatStartsOrEndsWith(['gg']) || $this->hasEmoteThatEndsWith(['gg']))) {
 				$this->classification = 'gg';
-			} else if ($this->isShort() && $this->containsRaw(['glgl', 'glhf', 'goodluck', 'hfgl', 'vielglück'])) {
+			} else if ($this->isShort() && ($this->containsRaw(['glgl', 'glhf', 'goodluck', 'hfgl', 'vielglück']) || $this->hasToken('gl'))) {
 				$this->classification = 'gl';
 			} else if ($this->hasToken(['danke', 'thanks', 'thx', 'ty']) && !$this->hasToken(['nah', 'nee', 'nein', 'no'])) {
 				$this->classification = 'thx';
@@ -344,9 +353,9 @@ class TokenizedMessage {
 					$this->hasConsecutiveTokens(['how', 'much']) ||
 					$this->hasConsecutiveTokens(['wie', 'viele'])
 				) {
-					return ['yes', 'no', 'kappa', 'lol', 'wtf', 'number'];
+					return ['yes', 'no', 'kappa', 'wtf', 'number'];
 				}
-				return ['yes', 'no', 'kappa', 'lol', 'wtf'];
+				return ['yes', 'no', 'kappa', 'wtf'];
 			case 'rage':
 				return ['kappa', 'lol', 'rage'];
 			case 'wtf':