X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FModels%2FChatLog.php;h=943ce6e659e846effb274ba467c23ecfbd1470ff;hb=6e3215622bf9f57efd9010268ad9e8ef9a913348;hp=1f0663ccac02d6bcbe5950156e2198b4b6ee594f;hpb=ff4c89c3dd1a92697d0f7dbd048d2e91a1a45595;p=alttp.git

diff --git a/app/Models/ChatLog.php b/app/Models/ChatLog.php
index 1f0663c..943ce6e 100644
--- a/app/Models/ChatLog.php
+++ b/app/Models/ChatLog.php
@@ -34,7 +34,7 @@ class ChatLog extends Model {
 		}
 
 		if ($this->command == 'PRIVMSG') {
-			if ($this->isKnownBot()) {
+			if (static::isKnownBot($this->nick)) {
 				$this->type = 'bot';
 			} else if (substr($this->params[0], 0, 1) == '#') {
 				$this->type = 'chat';
@@ -53,8 +53,8 @@ class ChatLog extends Model {
 		throw new \Exception('unidentified message');
 	}
 
-	public function isKnownBot() {
-		return in_array(strtolower($this->nick), [
+	public static function isKnownBot($nick) {
+		return in_array(strtolower($nick), [
 			'birrellthesquirrel',
 			'funtoon',
 			'nidbot2000',
@@ -95,6 +95,9 @@ class ChatLog extends Model {
 		if (Str::contains($rawText, ['hype'])) {
 			return 'hype';
 		}
+		if (Str::startsWith($rawText, 'o7') || Str::endsWith($rawText, 'o7') || Str::contains($rawText, 'salut')) {
+			return 'o7';
+		}
 		return 'unclassified';
 	}
 
@@ -131,38 +134,42 @@ class ChatLog extends Model {
 		}
 	}
 
-	protected function scanForSpam() {
-		if (substr($this->text_content, 0, 1) == '!') {
+	public static function spammyText($text) {
+		if (substr($text, 0, 1) == '!') {
 			return true;
 		}
-		if (strpos($this->text_content, '$') !== false) {
+		if (strpos($text, '$') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, '€') !== false) {
+		if (strpos($text, '€') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, '@') !== false) {
+		if (strpos($text, '@') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, '://') !== false) {
+		if (strpos($text, '://') !== false) {
 			return true;
 		}
-		if (is_numeric($this->text_content)) {
+		if (strpos($text, 'followers') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, 'followers') !== false) {
+		if (strpos($text, 'promotion') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, 'promotion') !== false) {
+		if (strpos($text, 'viewers') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, 'viewers') !== false) {
+		if (strpos($text, 'view ers') !== false) {
 			return true;
 		}
-		if (strpos($this->text_content, 'view ers') !== false) {
+		return false;
+	}
+
+	protected function scanForSpam() {
+		if (is_numeric($this->text_content)) {
 			return true;
 		}
-		return false;
+		return static::spammyText($this->text_content);
 	}
 
 	protected $casts = [