Allow changing auto-join per-channel

Author: tazz4843

migrations/20250526220035_per_voice_channel_auto_join_settings.sql

@@ -0,0 +1,2 @@
+ALTER TABLE scripty.public.per_voice_channel_settings
+    ADD COLUMN auto_join_enabled BOOLEAN NOT NULL DEFAULT TRUE;

scripty_bot_utils/src/handler/normal/voice_state_update.rs

@@ -196,14 +196,21 @@ pub async fn voice_state_update(ctx: &Context, new: &VoiceState) {
 			}
 		};
 		let maybe_target = match sqlx::query!(
-			"SELECT target_channel FROM per_voice_channel_settings WHERE channel_id = $1",
+			"SELECT auto_join_enabled, 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))
+		.map(|maybe_row| maybe_row.map(|r| (r.target_channel, r.auto_join_enabled)))
 		{
-			Ok(maybe_target) => maybe_target.map(|cid| ChannelId::new(cid as u64)),
+			// auto-join disabled at the channel level
+			Ok(Some((_, false))) => return,
+			// auto join enabled, has a target
+			Ok(Some((Some(target_id), true))) => Some(ChannelId::new(target_id as u64)),
+			// no special settings, or no target
+			Ok(None | Some((None, true))) => None,
 			Err(e) => {
 				error!(%guild_id, "error fetching target channel from per_voice_channel_settings: {}", e);
 				return;

scripty_commands/src/cmds/config/auto_join.rs

@@ -1,4 +1,8 @@
 use scripty_bot_utils::{Context, Error};
+use serenity::model::{
+	channel::{ChannelType, GuildChannel},
+	mention::Mentionable,
+};
 
 /// Should Scripty automatically join a voice channel when someone joins it?
 #[poise::command(
@@ -8,7 +12,14 @@ use scripty_bot_utils::{Context, Error};
 	required_permissions = "MANAGE_GUILD",
 	rename = "auto_join"
 )]
-pub async fn config_auto_join(ctx: Context<'_>, auto_join: bool) -> Result<(), Error> {
+pub async fn config_auto_join(
+	ctx: Context<'_>,
+	#[description = "Defaults to false"] auto_join: bool,
+	#[description = "Optionally set a channel this setting should apply to. If not set, the \
+	                 server setting is modified."]
+	#[channel_types("Voice", "Stage")]
+	modify_channel: Option<GuildChannel>,
+) -> Result<(), Error> {
 	let guild_id = ctx
 		.guild_id()
 		.map(|g| g.get())
@@ -17,6 +28,20 @@ pub async fn config_auto_join(ctx: Context<'_>, auto_join: bool) -> Result<(), E
 		scripty_i18n::get_resolved_language(ctx.author().id.get(), Some(guild_id)).await;
 	let db = scripty_db::get_db();
 
+	if let Some(ref modify_channel) = modify_channel
+		&& !matches!(
+			modify_channel.base.kind,
+			ChannelType::Voice | ChannelType::Stage
+		) {
+		ctx.say(format_message!(
+			resolved_language,
+			"config-auto-join-modify-channel-must-be-vc",
+			modifyChannelMention: modify_channel.mention().to_string()
+		))
+		.await?;
+		return Ok(());
+	}
+
 	// check if the user needs to set a default channel first
 	if auto_join {
 		let target_channel_set = sqlx::query!(
@@ -39,24 +64,49 @@ pub async fn config_auto_join(ctx: Context<'_>, auto_join: bool) -> Result<(), E
 		}
 	}
 
-	sqlx::query!(
-		"INSERT INTO guilds (guild_id, auto_join) VALUES ($1, $2) ON CONFLICT ON CONSTRAINT \
-		 guilds_pkey DO UPDATE SET auto_join = $2",
-		guild_id as i64,
-		auto_join
-	)
-	.execute(db)
-	.await?;
-
-	ctx.say(format_message!(
-		resolved_language,
-		if auto_join {
-			"config-auto-join-enabled"
-		} else {
-			"config-auto-join-disabled"
-		}
-	))
-	.await?;
+	let fmt_string = if let Some(modify_channel) = modify_channel {
+		sqlx::query!(
+			"INSERT INTO per_voice_channel_settings (channel_id, auto_join_enabled)
+				VALUES ($1, $2)
+				ON CONFLICT
+				    ON CONSTRAINT per_voice_channel_settings_pkey
+				    DO UPDATE SET auto_join_enabled = $2",
+			modify_channel.id.get() as i64,
+			auto_join
+		)
+		.execute(db)
+		.await?;
+
+		format_message!(
+			resolved_language,
+			if auto_join {
+				"config-auto-join-enabled-channel"
+			} else {
+				"config-auto-join-disabled-channel"
+			},
+			modifyChannelMention: modify_channel.mention().to_string()
+		)
+	} else {
+		sqlx::query!(
+			"INSERT INTO guilds (guild_id, auto_join) VALUES ($1, $2) ON CONFLICT ON CONSTRAINT \
+			 guilds_pkey DO UPDATE SET auto_join = $2",
+			guild_id as i64,
+			auto_join
+		)
+		.execute(db)
+		.await?;
+
+		format_message!(
+			resolved_language,
+			if auto_join {
+				"config-auto-join-enabled"
+			} else {
+				"config-auto-join-disabled"
+			}
+		)
+	};
+
+	ctx.say(fmt_string).await?;
 
 	Ok(())
 }

scripty_i18n/locales/en.ftl

@@ -166,8 +166,13 @@ cmds_config_auto_join = auto_join
     .description = Should Scripty automatically join a voice channel when someone joins it?
     .auto_join = auto_join
     .auto_join-description = Defaults to false
+    .modify_channel = modify_channel
+    .modify_channel-description = Optionally set a channel this setting should apply to. If not set, the server setting is modified.
 config-auto-join-enabled = Scripty will now automatically join VCs when a user does.
 config-auto-join-disabled = Scripty will no longer automatically join VCs when a use does.
+config-auto-join-enabled-channel = Scripty will now automatically join { $modifyChannelMention } when a user does.
+config-auto-join-disabled-channel = Scripty will no longer automatically join { $modifyChannelMention } when a user does.
+config-auto-join-modify-channel-must-be-vc = { $modifyChannelMention } isn't a voice channel. Try again with a voice channel.
 config-auto-join-needs-target-channel = Enabling auto-join requires a default target channel be set. Do that with `{ $contextPrefix }config default target_channel`.
 
 ## config - transcribe only role command