From 4b8475936f9c0f0379d2dee4e1440f4445682715 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 7 May 2024 15:10:01 +0200
Subject: [PATCH] configurable min age and message source

---
 app/Http/Controllers/ChannelController.php    |  4 +-
 app/Models/Channel.php                        | 13 +++++-
 .../components/twitch-bot/ChatSettingsForm.js | 42 +++++++++++++++++++
 resources/js/i18n/de.js                       |  8 ++++
 resources/js/i18n/en.js                       |  8 ++++
 5 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ChannelController.php b/app/Http/Controllers/ChannelController.php
index f9cf0d2..026b9aa 100644
--- a/app/Http/Controllers/ChannelController.php
+++ b/app/Http/Controllers/ChannelController.php
@@ -84,9 +84,11 @@ class ChannelController extends Controller {
 		}
 		$validatedData = $request->validate([
 			'language' => 'string|in:de,en,es,fr',
+			'min_age' => 'integer|min:1',
 			'respond' => 'string|in:50,no,yes',
+			'source' => 'string|in:any,cat,catchan,chan',
 			'wait_msgs_min' => 'integer|min:1',
-			'wait_msgs_max' => 'integer',
+			'wait_msgs_max' => 'integer|min:1',
 			'wait_time_min' => 'integer',
 			'wait_time_max' => 'integer',
 		]);
diff --git a/app/Models/Channel.php b/app/Models/Channel.php
index 8045a41..c6dfb6a 100644
--- a/app/Models/Channel.php
+++ b/app/Models/Channel.php
@@ -43,14 +43,23 @@ class Channel extends Model {
 	}
 
 	public function queryChatlog() {
-		return ChatLog::where('type', '=', 'chat')
+		$min_age = $this->getChatSetting('min_age', 1);
+		$query = ChatLog::where('type', '=', 'chat')
 			->where('banned', '=', false)
-			->where('created_at', '<', now()->sub(1, 'day'))
+			->where('created_at', '<', now()->sub($min_age, 'day'))
 			->where(function ($query) {
 				$query->whereNull('detected_language');
 				$query->orWhereIn('detected_language', $this->getPreferredLanguages());
 			})
 			->inRandomOrder();
+		$source = $this->getChatSetting('source', 'any');
+		if (in_array($source, ['catchan', 'chan'])) {
+			$query->where('channel_id', $this->id);
+		}
+		if (in_array($source, ['cat', 'catchan'])) {
+			$query->where('twitch_category', $this->twitch_category);
+		}
+		return $query;
 	}
 
 	public function getPreferredLanguages() {
diff --git a/resources/js/components/twitch-bot/ChatSettingsForm.js b/resources/js/components/twitch-bot/ChatSettingsForm.js
index 4d36a31..9f6a183 100644
--- a/resources/js/components/twitch-bot/ChatSettingsForm.js
+++ b/resources/js/components/twitch-bot/ChatSettingsForm.js
@@ -127,6 +127,39 @@ const ChatSettingsForm = ({
 					</Form.Control.Feedback>
 				: null}
 			</Form.Group>
+			<Form.Group as={Col} md={6} controlId="chatSettings.min_age">
+				<Form.Label>{t('twitchBot.chatMinAge')}</Form.Label>
+				<Form.Control
+					isInvalid={!!(touched.min_age && errors.min_age)}
+					name="min_age"
+					min="1"
+					onBlur={handleBlur}
+					onChange={handleChange}
+					type="number"
+					value={values.min_age || 1}
+				/>
+			</Form.Group>
+			<Form.Group as={Col} md={6} controlId="chatSettings.source">
+				<Form.Label>{t('twitchBot.chatSource')}</Form.Label>
+				<Form.Select
+					isInvalid={!!(touched.source && errors.source)}
+					name="source"
+					onBlur={handleBlur}
+					onChange={handleChange}
+					value={values.source || 'any'}
+				>
+					{['any', 'cat', 'chan', 'catchan'].map(value =>
+						<option key={value} value={value}>
+							{t(`twitchBot.chatSources.${value}`)}
+						</option>
+					)}
+				</Form.Select>
+				{touched.respond && errors.respond ?
+					<Form.Control.Feedback type="invalid">
+						{t(errors.respond)}
+					</Form.Control.Feedback>
+				: null}
+			</Form.Group>
 		</Row>
 		<div className="button-bar mt-3">
 			<Button disabled={!dirty || isSubmitting} type="submit" variant="primary">
@@ -140,7 +173,9 @@ ChatSettingsForm.propTypes = {
 	dirty: PropTypes.bool,
 	errors: PropTypes.shape({
 		language: PropTypes.string,
+		min_age: PropTypes.string,
 		respond: PropTypes.string,
+		source: PropTypes.string,
 		wait_msgs_max: PropTypes.string,
 		wait_msgs_min: PropTypes.string,
 		wait_time_min: PropTypes.string,
@@ -152,7 +187,9 @@ ChatSettingsForm.propTypes = {
 	isSubmitting: PropTypes.bool,
 	touched: PropTypes.shape({
 		language: PropTypes.bool,
+		min_age: PropTypes.bool,
 		respond: PropTypes.bool,
+		source: PropTypes.bool,
 		wait_msgs_max: PropTypes.bool,
 		wait_msgs_min: PropTypes.bool,
 		wait_time_min: PropTypes.bool,
@@ -160,7 +197,9 @@ ChatSettingsForm.propTypes = {
 	}),
 	values: PropTypes.shape({
 		language: PropTypes.string,
+		min_age: PropTypes.number,
 		respond: PropTypes.string,
+		source: PropTypes.string,
 		wait_msgs_max: PropTypes.number,
 		wait_msgs_min: PropTypes.number,
 		wait_time_min: PropTypes.string,
@@ -181,7 +220,9 @@ export default withFormik({
 	},
 	mapPropsToValues: ({ channel }) => ({
 		language: channel.chat_settings.language || channel.languages[0] || 'de',
+		min_age: channel.chat_settings.min_age || 1,
 		respond: channel.chat_settings.respond || 'yes',
+		source: channel.chat_settings.source || 'any',
 		wait_msgs_min: channel.chat_settings.wait_msgs_min || 1,
 		wait_msgs_max: channel.chat_settings.wait_msgs_max || 10,
 		wait_time_min: channel.chat_settings.wait_time_min
@@ -191,6 +232,7 @@ export default withFormik({
 	}),
 	validationSchema: yup.object().shape({
 		language: yup.string(),
+		min_age: yup.number().min(1),
 		respond: yup.string(),
 		wait_msgs_min: yup.number().min(1),
 		wait_msgs_max: yup.number().min(1),
diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index dcf4d21..85d8fcb 100644
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -719,7 +719,15 @@ export default {
 				yes: 'Ja',
 			},
 			chatError: 'Fehler beim Senden',
+			chatMinAge: 'Mindestalter (in Tagen)',
 			chatSettings: 'Chat Bot Einstellungen',
+			chatSource: 'Nachrichtenquelle',
+			chatSources: {
+				any: 'Alle',
+				cat: 'Gleiche Kategorie',
+				catchan: 'Mein Channel und gleiche Kategorie',
+				chan: 'Mein Channel',
+			},
 			chatSuccess: 'Nachricht in Warteschlange',
 			chatWaitMsgsMin: 'Min. Messages',
 			chatWaitMsgsMax: 'Max. Messages',
diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index dfa33f4..5d5a1e4 100644
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -719,7 +719,15 @@ export default {
 				yes: 'Yes',
 			},
 			chatError: 'Error sending message',
+			chatMinAge: 'Min. age (in days)',
 			chatSettings: 'Chat Bot Settings',
+			chatSource: 'Message source',
+			chatSources: {
+				any: 'Any',
+				cat: 'Same category',
+				catchan: 'Own channel and same category',
+				chan: 'Own channel',
+			},
 			chatSuccess: 'Message queued',
 			chatWaitMsgsMin: 'Min. messages',
 			chatWaitMsgsMax: 'Max. messages',
-- 
2.39.2