X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FTwitchBot%2FTwitchChatBot.php;fp=app%2FTwitchBot%2FTwitchChatBot.php;h=7cdc704bedfcd4e6c25a40298929430405070690;hb=1d3c8c6a96fc45d839f0e3719baca790059d189f;hp=03d9a38c88b402b327532e290249bb8d986f8990;hpb=cf210ddda8ff5336feee10f733b022a72d906238;p=alttp.git

diff --git a/app/TwitchBot/TwitchChatBot.php b/app/TwitchBot/TwitchChatBot.php
index 03d9a38..7cdc704 100644
--- a/app/TwitchBot/TwitchChatBot.php
+++ b/app/TwitchBot/TwitchChatBot.php
@@ -78,13 +78,6 @@ class TwitchChatBot extends TwitchBot {
 		$this->sendIRCMessage(IRCMessage::privmsg($channel->twitch_chat, $text));
 	}
 
-	private function getChatSetting(Channel $channel, $name, $default = null) {
-		if (array_key_exists($name, $channel->chat_settings)) {
-			return $channel->chat_settings[$name];
-		}
-		return $default;
-	}
-
 	private function getNotes(Channel $channel) {
 		if (!isset($this->notes[$channel->id])) {
 			$this->notes[$channel->id] = [
@@ -205,7 +198,7 @@ class TwitchChatBot extends TwitchBot {
 		$last = $this->getNote($channel, 'last_special');
 		if ($last != 'gg' && $this->checkForGG($channel)) {
 			$this->setNote($channel, 'last_special', 'gg');
-			return $this->randomOfClass($channel, 'gg');
+			return $channel->randomOfClass('gg');
 		}
 		if ($last != 'number' && $this->checkForNumbers($channel)) {
 			$this->setNote($channel, 'last_special', 'number');
@@ -217,40 +210,29 @@ class TwitchChatBot extends TwitchBot {
 		}
 		if ($last != 'glhf' && $this->checkForGLHF($channel)) {
 			$this->setNote($channel, 'last_special', 'glhf');
-			return $this->randomOfClass($channel, 'gl');
+			return $channel->randomOfClass('gl');
 		}
 		if ($last != 'hi' && $this->checkForGreeting($channel)) {
 			$this->setNote($channel, 'last_special', 'hi');
-			return $this->randomOfClass($channel, 'hi');
+			return $channel->randomOfClass('hi');
 		}
 		if ($last != 'hype' && $this->checkForHype($channel)) {
 			$this->setNote($channel, 'last_special', 'hype');
-			return $this->randomOfClass($channel, 'hype');
+			return $channel->randomOfClass('hype');
 		}
 		if ($last != 'pog' && $this->checkForPog($channel)) {
 			$this->setNote($channel, 'last_special', 'pog');
-			return $this->randomOfClass($channel, 'pog');
+			return $channel->randomOfClass('pog');
 		}
 		if ($last != 'o7' && $this->checkForSalute($channel)) {
 			$this->setNote($channel, 'last_special', 'o7');
-			return $this->randomOfClass($channel, 'o7');
+			return $channel->randomOfClass('o7');
 		}
 		return false;
 	}
 
-	private function queryChatlog(Channel $channel) {
-		return ChatLog::where('type', '=', 'chat')
-			->where('banned', '=', false)
-			->where('created_at', '<', now()->sub(1, 'day'))
-			->where(function ($query) use ($channel) {
-				$query->whereNull('detected_language');
-				$query->orWhereIn('detected_language', $this->getPreferredLanguages($channel));
-			})
-			->inRandomOrder();
-	}
-
 	private function randomChat(Channel $channel) {
-		$line = $this->queryChatlog($channel)
+		$line = $channel->queryChatlog()
 			->whereIn('classification', ['hi', 'hype', 'lol', 'pog', 'unclassified'])
 			->first();
 		return $line->text_content;
@@ -270,13 +252,6 @@ class TwitchChatBot extends TwitchBot {
 		return random_int($min, $max);
 	}
 
-	private function randomOfClass(Channel $channel, $class) {
-		$line = $this->queryChatlog($channel)
-			->where('classification', '=', $class)
-			->first();
-		return $line->text_content;
-	}
-
 	private function randomLaughter(Channel $channel) {
 		return Arr::random([
 			':tf:',
@@ -307,24 +282,24 @@ class TwitchChatBot extends TwitchBot {
 			'SUBprise',
 			'xD',
 			'YouDontSay',
-			$this->randomOfClass($channel, 'lol'),
+			$channel->randomOfClass('lol'),
 		]);
 	}
 
 	private function randomMsg(Channel $channel) {
-		$line = $this->queryChatlog($channel)->first();
+		$line = $channel->queryChatlog()->first();
 		return $line->text_content;
 	}
 
 	private function randomWaitMsgs(Channel $channel) {
-		$min = $this->getChatSetting($channel, 'wait_msgs_min', 1);
-		$max = $this->getChatSetting($channel, 'wait_msgs_max', 10);
+		$min = $channel->getChatSetting('wait_msgs_min', 1);
+		$max = $channel->getChatSetting('wait_msgs_max', 10);
 		return random_int($min, $max);
 	}
 
 	private function randomWaitTime(Channel $channel) {
-		$min = $this->getChatSetting($channel, 'wait_time_min', 1);
-		$max = $this->getChatSetting($channel, 'wait_time_max', 900);
+		$min = $channel->getChatSetting('wait_time_min', 1);
+		$max = $channel->getChatSetting('wait_time_max', 900);
 		return random_int($min, $max);
 	}
 
@@ -352,17 +327,6 @@ class TwitchChatBot extends TwitchBot {
 		$this->notes[$channel->id]['wait_time'] = $this->randomWaitTime($channel);
 	}
 
-	private function getPreferredLanguages(Channel $channel) {
-		$setting = $this->getChatSetting($channel, 'language');
-		if ($setting) {
-			return [$setting];
-		}
-		if (!empty($channel->languages)) {
-			return $channel->languages;
-		}
-		return ['de'];
-	}
-
 	private function isDirectedAtMe($raw_text) {
 		$text = strtolower($raw_text);
 		if (strpos($text, 'horstie') !== false) {
@@ -372,7 +336,7 @@ class TwitchChatBot extends TwitchBot {
 	}
 
 	private function shouldRespond(Channel $channel) {
-		$setting = $this->getChatSetting($channel, 'respond', 'yes');
+		$setting = $channel->getChatSetting('respond', 'yes');
 		if ($setting == 'yes') {
 			return true;
 		}