X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=app%2FModels%2FChatLog.php;h=49a57c25a626b5ade8c6b072899591539fc74739;hb=HEAD;hp=2d43b2f08b008e3684e0b9c0ed6fb0532f8194af;hpb=ac6921da72ff4b0beab9e5f1308788a55aae3ad9;p=alttp.git

diff --git a/app/Models/ChatLog.php b/app/Models/ChatLog.php
index 2d43b2f..f1777b8 100644
--- a/app/Models/ChatLog.php
+++ b/app/Models/ChatLog.php
@@ -25,8 +25,24 @@ class ChatLog extends Model {
 		return TokenizedMessage::fromLog($this);
 	}
 
+	public function isReply() {
+		return !empty($this->tags['reply-parent-msg-body']);
+	}
+
+	public function getReplyParent() {
+		return str_replace('\\s', ' ', $this->tags['reply-parent-msg-body']);
+	}
+
+	public function getReplyParentUser() {
+		return $this->tags['reply-parent-display-name'];
+	}
+
+	public function getText() {
+		return $this->params[1];
+	}
+
 	public function getTextWithoutEmotes() {
-		$text = $this->text_content;
+		$text = $this->params[1];
 		if (isset($this->tags['emotes']) && !empty($this->tags['emotes'])) {
 			$emotes = explode('/', $this->tags['emotes']);
 			foreach ($emotes as $emote) {
@@ -41,6 +57,13 @@ class ChatLog extends Model {
 		return trim(preg_replace('/\s+/', ' ', $text));
 	}
 
+	public function getTextWithoutReply() {
+		if ($this->isReply()) {
+			return mb_substr($this->params[1], mb_strlen($this->getReplyParentUser()) + 2);
+		}
+		return $this->params[1];
+	}
+
 	public function evaluate() {
 		$this->evaluateUser();
 		$this->evaluateChannel();
@@ -54,7 +77,7 @@ class ChatLog extends Model {
 			return;
 		}
 
-		if ($this->command == 'PRIVMSG') {
+		if ($this->command == 'PRIVMSG' || $this->command == 'WHISPER') {
 			if (static::isKnownBot($this->nick)) {
 				$this->type = 'bot';
 			} else if (substr($this->params[0], 0, 1) == '#') {
@@ -62,7 +85,7 @@ class ChatLog extends Model {
 			} else {
 				$this->type = 'dm';
 			}
-			$this->text_content = $this->params[1];
+			$this->text_content = $this->getTextWithoutReply();
 			$this->detectLanguage();
 			$tokenized = $this->tokenize();
 			if ($tokenized->isSpammy()) {
@@ -79,6 +102,7 @@ class ChatLog extends Model {
 		return in_array(strtolower($nick), [
 			'a_n_i_v',
 			'birrellthesquirrel',
+			'creatisbot',
 			'funtoon',
 			'nidbot2000',
 			'nightbot',