X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FTwitchBot%2FTwitchChatBot.php;h=92894262f3b108d42826f76238dca6c909146a94;hb=8645b77ea2dc402f0265e1c8022ba18302506ca1;hp=a403b0b57b716ae488c1056e8f3e6d8be53573f8;hpb=1b9629ce7f600b4aa9c9d51a281e514031871828;p=alttp.git

diff --git a/app/TwitchBot/TwitchChatBot.php b/app/TwitchBot/TwitchChatBot.php
index a403b0b..9289426 100644
--- a/app/TwitchBot/TwitchChatBot.php
+++ b/app/TwitchBot/TwitchChatBot.php
@@ -82,6 +82,9 @@ class TwitchChatBot extends TwitchBot {
 		$log->channel()->associate($channel);
 		if (is_object($text)) {
 			$log->origin()->associate($text);
+			$log->category = $text->classification;
+		} else {
+			$log->category = $this->getLastSpecialSent($channel);
 		}
 		$log->text = $actual_text;
 		$log->save();
@@ -139,13 +142,12 @@ class TwitchChatBot extends TwitchBot {
 				$this->tagChannelSpecialSent($channel, $classification);
 			}
 			$this->clearQueuedSpecial($channel);
-			if ($classification == 'number') {
-				return $this->randomContextualNumber($channel);
-			}
-			if ($classification == 'lol') {
-				return $this->randomLaughter($channel);
-			}
-			return $channel->randomOfClass($classification);
+			return $this->getRandomOfClass($channel, $classification);
+		}
+		$latest_msg = $this->getLatestMessage($channel);
+		if ($latest_msg->classify() == 'question') {
+			$response = $latest_msg->getResponseCategory();
+			return $this->getRandomOfClass($channel, $response);
 		}
 		$last = $this->getLastSpecialSent($channel);
 		$classifications = $this->collectClassifications($channel);
@@ -178,13 +180,8 @@ class TwitchChatBot extends TwitchBot {
 			if (!isset($count_quotas[$classification]) || $count < $count_quotas[$classification]) continue;
 			if (!isset($time_quotas[$classification]) || $this->getTimeSinceSpecial($channel, $classification) < $time_quotas[$classification]) continue;
 			$this->tagChannelSpecialSent($channel, $classification);
-			if ($classification == 'number') {
-				return $this->randomContextualNumber($channel);
-			}
-			if ($classification == 'lol') {
-				return $this->randomLaughter($channel);
-			}
-			return $channel->randomOfClass($classification);
+			$reaction = $this->getChimeInReaction($channel, $classification);
+			return $this->getRandomOfClass($channel, $reaction);
 		}
 		return false;
 	}
@@ -294,7 +291,7 @@ class TwitchChatBot extends TwitchBot {
 		if ($this->isDirectedAtMe($msg->getText()) && $this->shouldRespond($channel)) {
 			$this->notes[$channel->id]['wait_msgs'] = 0;
 			$this->notes[$channel->id]['wait_time'] = 0;
-			$response = $this->getResponseTo($tokenized);
+			$response = $tokenized->getResponseCategory();
 			if ($response) {
 				$this->queueSpecial($channel, $response);
 			}
@@ -314,6 +311,14 @@ class TwitchChatBot extends TwitchBot {
 		$this->notes[$channel->id]['last_special'][$classification] = time();
 	}
 
+	private function getLatestMessage(Channel $channel) {
+		$this->getNotes($channel);
+		if (!empty($notes['latest_msgs'])) {
+			return $notes['latest_msgs'][count($notes['latest_msgs']) - 1];
+		}
+		return TokenizedMessage::fromString('');
+	}
+
 	private function getLastSpecialSent(Channel $channel) {
 		$notes = $this->getNotes($channel);
 		$max_time = 0;
@@ -354,26 +359,30 @@ class TwitchChatBot extends TwitchBot {
 		return false;
 	}
 
-	private function getResponseTo(TokenizedMessage $msg) {
-		switch ($msg->classify()) {
-			case 'gg':
-				return ['love', 'eyes', 'thx', 'pog', 'kappa'];
-			case 'gl':
-				return ['love', 'eyes', 'thx'];
+	private function getRandomOfClass(Channel $channel, $classification) {
+		if ($classification == 'number') {
+			return $this->randomContextualNumber($channel);
+		}
+		if ($classification == 'lol') {
+			return $this->randomLaughter($channel);
+		}
+		return $channel->randomOfClass($classification);
+	}
+
+	private function getChimeInReaction(Channel $channel, $classification) {
+		switch ($classification) {
 			case 'hi':
-				return ['hi', 'love', 'eyes', 'hype', 'pog'];
-			case 'kappa':
-				return ['kappa', 'lol', 'eyes'];
-			case 'love':
-				return ['hi', 'love', 'eyes', 'thx'];
-			case 'question':
-				return ['yes', 'no', 'kappa', 'lol', 'wtf', 'number'];
-			case 'rage':
-				return ['kappa', 'lol', 'rage'];
+				return ['hi', 'love'];
+			case 'hype':
+				return ['hype', 'love', 'pog'];
+			case 'lol':
+				return ['kappa', 'lol'];
+			case 'pog':
+				return ['hype', 'pog'];
 			case 'wtf':
-				return ['kappa', 'lol', 'rage'];
+				return ['lol', 'wtf'];
 		}
-		return false;
+		return $classification;
 	}
 
 	private $channels;