Add per-VC target channels

tazz4843 · tazz4843 · commit 38f2765d4ffc · 2025-05-25T01:05:26.000-07:00
diff --git a/migrations/20250525065734_per_voice_channel_target_channel.sql b/migrations/20250525065734_per_voice_channel_target_channel.sql
@@ -0,0 +1,5 @@
+CREATE TABLE per_voice_channel_settings
+(
+    channel_id     BIGINT NOT NULL PRIMARY KEY,
+    target_channel BIGINT NULL DEFAULT NULL
+);
diff --git a/scripty_bot_utils/src/handler/normal/voice_state_update.rs b/scripty_bot_utils/src/handler/normal/voice_state_update.rs
@@ -185,22 +185,36 @@ pub async fn voice_state_update(ctx: &Context, new: &VoiceState) {
 		.fetch_optional(db)
 		.await
 		{
-			Ok(res) => res,
+			Ok(Some(res)) => res,
+			Ok(None) => {
+				warn!(%guild_id, "guild has auto join enabled with no default settings: something's wrong");
+				return;
+			}
 			Err(e) => {
 				error!(%guild_id, "failed to fetch default settings for guild: {}", e);
 				return;
 			}
 		};
-
-		let Some(defaults) = defaults else {
-			warn!(%guild_id, "guild has auto join enabled with no default settings: something's wrong");
-			return;
+		let maybe_target = match sqlx::query!(
+			"SELECT target_channel FROM per_voice_channel_settings WHERE channel_id = $1",
+			voice_channel_id.get() as i64
+		)
+		.fetch_optional(db)
+		.await
+		.map(|maybe_row| maybe_row.and_then(|r| r.target_channel))
+		{
+			Ok(maybe_target) => maybe_target.map(|cid| ChannelId::new(cid as u64)),
+			Err(e) => {
+				error!(%guild_id, "error fetching target channel from per_voice_channel_settings: {}", e);
+				return;
+			}
 		};
 
-		let Some(target_channel_id) = defaults
-			.target_channel
-			.map(|target_channel| ChannelId::new(target_channel as u64))
-		else {
+		let Some(target_channel_id) = maybe_target.or_else(|| {
+			defaults
+				.target_channel
+				.map(|target_channel| ChannelId::new(target_channel as u64))
+		}) else {
 			warn!(%guild_id, "guild has no default target channel, ignoring join");
 			return;
 		};
diff --git a/scripty_commands/src/cmds/config/default_settings/target_channel.rs b/scripty_commands/src/cmds/config/default_settings/target_channel.rs
@@ -15,39 +15,87 @@ use serenity::model::{
 )]
 pub async fn config_default_settings_target_channel(
 	ctx: Context<'_>,
-	#[channel_types("Text", "Forum", "Voice", "Stage", "News")] target_channel: Option<
-		GuildChannel,
-	>,
+	#[description = "Default value for target_channel on the join command"]
+	#[channel_types("Text", "Forum", "Voice", "Stage", "News")]
+	target_channel: Option<GuildChannel>,
+	#[description = "If this is set, this target channel will only apply when Scripty joins this \
+	                 voice channel"]
+	#[channel_types("Voice", "Stage")]
+	modify_channel: Option<GuildChannel>,
 ) -> Result<(), Error> {
 	let guild_id = ctx.guild_id().ok_or_else(Error::expected_guild)?;
 	let resolved_language =
 		scripty_i18n::get_resolved_language(ctx.author().id.get(), Some(guild_id.get())).await;
 	let db = scripty_db::get_db();
 
-	if let Some(error_translation_key) =
-		do_preflight_target_channel(&ctx, guild_id, target_channel.as_ref()).await?
+	if let Some(error_translation_key) = do_preflight_target_channel(
+		&ctx,
+		guild_id,
+		target_channel.as_ref(),
+		modify_channel.is_some(),
+	)
+	.await?
 	{
 		ctx.say(format_message!(resolved_language, error_translation_key))
 			.await?;
 		return Ok(());
 	}
 
 	super::ensure_guild_exists(guild_id, db).await?;
-	sqlx::query!(
-		"INSERT INTO default_join_settings (guild_id, target_channel)
-			VALUES ($1, $2)
-			ON CONFLICT ON CONSTRAINT default_join_settings_pkey
-			    DO UPDATE SET target_channel = $2",
-		guild_id.get() as i64,
-		target_channel.as_ref().map(|x| x.id.get() as i64),
-	)
-	.execute(db)
-	.await?;
-
-	let resp_str = if let Some(ref target_channel) = target_channel {
-		format_message!(resolved_language, "config-default-target-channel-enabled", targetChannelMention: target_channel.mention().to_string())
+	if let Some(ref modify_channel) = modify_channel {
+		sqlx::query!(
+			"INSERT INTO per_voice_channel_settings (channel_id, target_channel)
+				VALUES ($1, $2)
+			 	ON CONFLICT ON CONSTRAINT per_voice_channel_settings_pkey
+			 	    DO UPDATE SET target_channel = $2",
+			modify_channel.id.get() as i64,
+			target_channel.as_ref().map(|x| x.id.get() as i64)
+		)
+		.execute(db)
+		.await?;
 	} else {
-		format_message!(resolved_language, "config-default-target-channel-disabled")
+		sqlx::query!(
+			"INSERT INTO default_join_settings (guild_id, target_channel)
+				VALUES ($1, $2)
+				ON CONFLICT ON CONSTRAINT default_join_settings_pkey
+				    DO UPDATE SET target_channel = $2",
+			guild_id.get() as i64,
+			target_channel.as_ref().map(|x| x.id.get() as i64),
+		)
+		.execute(db)
+		.await?;
+	}
+
+	let resp_str = match (&target_channel, &modify_channel) {
+		(Some(target_channel), Some(modify_channel)) => {
+			// modifying modify_channel to send transcripts to target_channel by default
+			format_message!(
+				resolved_language,
+				"config-default-target-channel-enabled-per-channel",
+				targetChannelMention: target_channel.mention().to_string(),
+				modifyChannelMention: modify_channel.mention().to_string()
+			)
+		}
+		(None, Some(modify_channel)) => {
+			// modifying modify_channel to send transcripts to the guild default
+			format_message!(
+				resolved_language,
+				"config-default-target-channel-disabled-per-channel",
+				modifyChannelMention: modify_channel.mention().to_string()
+			)
+		}
+		(Some(target_channel), None) => {
+			// setting the guild default to target_channel
+			format_message!(
+				resolved_language,
+				"config-default-target-channel-enabled",
+				targetChannelMention: target_channel.mention().to_string()
+			)
+		}
+		(None, None) => {
+			// resetting the guild default to empty
+			format_message!(resolved_language, "config-default-target-channel-disabled")
+		}
 	};
 	ctx.say(resp_str).await?;
 
@@ -58,6 +106,7 @@ async fn do_preflight_target_channel(
 	_ctx: &Context<'_>,
 	guild_id: GuildId,
 	target_channel: Option<&GuildChannel>,
+	is_channel_level: bool,
 ) -> Result<Option<&'static str>, Error> {
 	let db = scripty_db::get_db();
 
@@ -95,7 +144,7 @@ async fn do_preflight_target_channel(
 				_ => {}
 			}
 		}
-	} else {
+	} else if !is_channel_level {
 		let auto_join = sqlx::query!(
 			"SELECT auto_join FROM guilds WHERE guild_id = $1",
 			guild_id.get() as i64
diff --git a/scripty_commands/src/cmds/join.rs b/scripty_commands/src/cmds/join.rs
@@ -54,6 +54,30 @@ pub async fn join(
 	let db = scripty_db::get_db();
 	let cfg = scripty_config::get_config();
 
+	let (guild_id, voice_channel) = {
+		let guild = ctx.guild().ok_or_else(Error::expected_guild)?;
+		(
+			guild.id,
+			voice_channel.ok_or_else(|| {
+				guild
+					.voice_states
+					.get(&ctx.author().id)
+					.and_then(|state| state.channel_id)
+			}),
+		)
+	};
+	let voice_channel = match voice_channel {
+		Ok(vc) => vc,
+		Err(Some(state)) => state.to_guild_channel(&ctx, ctx.guild_id()).await?,
+		Err(None) => {
+			ctx.say(
+				format_message!(resolved_language, "no-channel-specified", contextPrefix: ctx.prefix()),
+			)
+			.await?;
+			return Ok(());
+		}
+	};
+
 	let defaults = sqlx::query!(
 		"SELECT record_transcriptions, target_channel, new_thread, ephemeral FROM \
 		 default_join_settings WHERE guild_id = $1",
@@ -66,12 +90,17 @@ pub async fn join(
 	let target_channel = match target_channel {
 		Some(target_channel) => target_channel,
 		None => {
-			defaults
-				.as_ref()
-				.and_then(|x| {
-					x.target_channel
-						.map(|target_channel| GenericChannelId::new(target_channel as u64))
-				})
+			let maybe_target = sqlx::query!(
+				"SELECT target_channel FROM per_voice_channel_settings WHERE channel_id = $1",
+				voice_channel.id.get() as i64
+			)
+			.fetch_optional(db)
+			.await?
+			.and_then(|r| r.target_channel);
+
+			maybe_target
+				.or_else(|| defaults.as_ref().and_then(|r| r.target_channel))
+				.map(|cid| GenericChannelId::new(cid as u64))
 				.unwrap_or_else(|| ctx.channel_id())
 				.to_channel(&ctx, Some(guild_id))
 				.await?
@@ -162,19 +191,6 @@ pub async fn join(
 		return Ok(());
 	}
 
-	let (guild_id, voice_channel) = {
-		let guild = ctx.guild().ok_or_else(Error::expected_guild)?;
-		(
-			guild.id,
-			voice_channel.ok_or_else(|| {
-				guild
-					.voice_states
-					.get(&ctx.author().id)
-					.and_then(|state| state.channel_id)
-			}),
-		)
-	};
-
 	let res = sqlx::query!(
 		"SELECT trial_used FROM guilds WHERE guild_id = $1",
 		guild_id.get() as i64
@@ -183,18 +199,6 @@ pub async fn join(
 	.await?;
 	let trial_used = res.as_ref().is_some_and(|row| row.trial_used);
 
-	let voice_channel = match voice_channel {
-		Ok(vc) => vc,
-		Err(Some(state)) => state.to_guild_channel(&ctx, ctx.guild_id()).await?,
-		Err(None) => {
-			ctx.say(
-				format_message!(resolved_language, "no-channel-specified", contextPrefix: ctx.prefix()),
-			)
-			.await?;
-			return Ok(());
-		}
-	};
-
 	match voice_channel.base.kind {
 		ChannelType::Voice | ChannelType::Stage => {}
 		_ => {
diff --git a/scripty_i18n/locales/en.ftl b/scripty_i18n/locales/en.ftl
@@ -243,6 +243,10 @@ cmds_config_default_settings_target_channel = target_channel
     .description = Set the default target channel where Scripty will output transcripts if none are specified.
     .target_channel = target_channel
     .target_channel-description = Default value for target_channel on the join command
+    .modify_channel = modify_channel
+    .modify_channel-description = If this is set, this target channel will only apply when Scripty joins this voice channel.
+config-default-target-channel-enabled-per-channel = Scripty will now, by default, send all transcripts to { $targetChannelMention } when joining { $modifyChannelMention }.
+config-default-target-channel-disabled-per-channel = Scripty will now, by default, send all transcripts to the server default target channel when joining { $modifyChannelMention }.
 config-default-target-channel-enabled = Scripty will now, by default, send all transcripts to { $targetChannelMention }.
 config-default-target-channel-disabled = Scripty will now, by default, send all transcripts to the channel where `/join` is executed.
 config-default-target-channel-cant-disable-with-auto-join = You can't remove any default target channel if auto-join is enabled. Either disable auto-join or change the target channel instead of removing it.
