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

diff --git a/app/TwitchBot/TokenizedMessage.php b/app/TwitchBot/TokenizedMessage.php
index b32ba72..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) {
@@ -22,15 +25,15 @@ class TokenizedMessage {
 				$positions = explode(',', $set[1]);
 				foreach ($positions as $position) {
 					$coords = explode('-', $position);
-					$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] = ' ';
-					}
+					$emote_text = mb_substr($this->text, $coords[0], $coords[1] - $coords[0] + 1);
+					$this->original_emotes[] = $emote_text;
+					$this->emotes[] = preg_replace('/\d+$/', '', strtolower($emote_text));
+					$this->emoteless = mb_substr($this->emoteless, 0, $coords[0]).str_repeat(' ', $coords[1] - $coords[0] + 1).mb_substr($this->emoteless, $coords[1] + 1);
 				}
 			}
-			$this->emoteless = trim(preg_replace('/\s+/', ' ', $this->emoteless));
+			$this->emoteless = trim(preg_replace('/\s+/u', ' ', $this->emoteless));
 		}
-		$this->emoteless_raw = strtolower(preg_replace('/[^\w]/', '', $this->emoteless));
+		$this->emoteless_raw = strtolower(preg_replace('/[^\w]/u', '', $this->emoteless));
 		$this->emoteless_tokens = array_values(array_map('trim', array_filter(preg_split('/\b/u', strtolower($this->emoteless)))));
 	}
 
@@ -47,6 +50,11 @@ class TokenizedMessage {
 	}
 
 
+	public function getText() {
+		return $this->text;
+	}
+
+
 	public function contains($text) {
 		return Str::contains($this->text, $text);
 	}
@@ -79,10 +87,18 @@ class TokenizedMessage {
 		return !empty($this->tokens) && $this->tokens[count($this->tokens) - 1] == $text;
 	}
 
+	public function getEmotes() {
+		return $this->emotes;
+	}
+
 	public function getNumericValue() {
 		return intval($this->text);
 	}
 
+	public function getOriginalEmotes() {
+		return $this->original_emotes;
+	}
+
 	public function hasConsecutiveTokens($tokens) {
 		for ($i = 0; $i < count($this->tokens) - count($tokens) + 1; ++$i) {
 			for ($j = 0; $j < count($tokens); ++$j) {
@@ -245,13 +261,22 @@ 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')) {
 			return true;
 		}
-		if ($this->containsRaw(['folgtjetzt', 'vielendankfürdenraid', 'thanksfortheraid', 'willkommenaufstarbase47'])) {
+		if ($this->containsRaw([
+			'folgtjetzt',
+			'hatdeinenkanalgeraided',
+			'isnowlivestreaming',
+			'stürmtdenladenmit',
+			'thanksfortheraid',
+			'verschwindetfürneweileindenlurk',
+			'vielendankfürdenraid',
+			'willkommenaufstarbase47',
+		])) {
 			return true;
 		}
 		return false;
@@ -266,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';
@@ -328,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':
@@ -346,6 +371,7 @@ class TokenizedMessage {
 	private $tokens;
 
 	private $emotes = [];
+	private $original_emotes = [];
 	private $emoteless = '';
 	private $emoteless_raw = '';
 	private $emoteless_tokens = [];