Update serenity/poise and update to Rust 2024

Author: tazz4843

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "scripty_v2"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,28 +16,28 @@ debug = true
 
 [workspace]
 members = [
-    "scripty_config",
-    "scripty_webserver",
-    "scripty_core",
-    "scripty_premium",
-    "scripty_stt",
-    "scripty_audio_handler",
-    "scripty_commands",
-    "scripty_i18n",
-    "scripty_db",
-    "scripty_metrics",
-    "scripty_utils",
-    "scripty_data_storage",
-    "scripty_redis",
-    "scripty_bot",
-    "scripty_bot_utils",
-    "scripty_automod",
-    "scripty_botlists",
-    "scripty_error",
-    "scripty_tts",
-    "scripty_integrations",
-    "scripty_build_checks",
-    "scripty_data_type",
+	"scripty_config",
+	"scripty_webserver",
+	"scripty_core",
+	"scripty_premium",
+	"scripty_stt",
+	"scripty_audio_handler",
+	"scripty_commands",
+	"scripty_i18n",
+	"scripty_db",
+	"scripty_metrics",
+	"scripty_utils",
+	"scripty_data_storage",
+	"scripty_redis",
+	"scripty_bot",
+	"scripty_bot_utils",
+	"scripty_automod",
+	"scripty_botlists",
+	"scripty_error",
+	"scripty_tts",
+	"scripty_integrations",
+	"scripty_build_checks",
+	"scripty_data_type",
 ]
 
 [dependencies]

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scripty_audio_handler"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 license = "EUPL-1.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

scripty_audio_handler/Cargo.toml

@@ -1,23 +1,22 @@
 use std::{
 	collections::VecDeque,
 	sync::{
-		atomic::{AtomicBool, AtomicU8, Ordering},
 		Arc,
+		atomic::{AtomicBool, AtomicU8, Ordering},
 	},
 };
 
 use ahash::RandomState;
 use dashmap::{DashMap, DashSet};
 use parking_lot::RwLock;
 use scripty_automod::types::AutomodServerConfig;
-use scripty_data_type::{get_data, CallDeath};
+use scripty_data_type::{CallDeath, get_data};
 use scripty_integrations::kiai::KiaiApiClient;
 use serenity::{
-	all::RoleId,
 	builder::ExecuteWebhook,
 	gateway::client::Context,
 	model::{
-		id::{ChannelId, GuildId},
+		id::{ChannelId, GuildId, RoleId, ThreadId},
 		webhook::Webhook,
 	},
 };
@@ -57,7 +56,7 @@ pub struct AudioHandler {
 	guild_id:             GuildId,
 	channel_id:           ChannelId,
 	voice_channel_id:     ChannelId,
-	thread_id:            Option<ChannelId>,
+	thread_id:            Option<ThreadId>,
 	webhook:              Arc<Webhook>,
 	context:              Context,
 	premium_level:        Arc<AtomicU8>,
@@ -82,7 +81,7 @@ impl AudioHandler {
 		context: Context,
 		channel_id: ChannelId,
 		voice_channel_id: ChannelId,
-		thread_id: Option<ChannelId>,
+		thread_id: Option<ThreadId>,
 		record_transcriptions: bool,
 		automod_server_cfg: AutomodServerConfig,
 		kiai_client: KiaiApiClient,
@@ -165,7 +164,7 @@ impl AudioHandler {
 					// run cleanup tasks
 					if ephemeral && let Some(thread_id) = t2.thread_id {
 						let http = &t2.context.http;
-						if let Err(e) = thread_id.delete(http, None).await {
+						if let Err(e) = thread_id.widen().delete(http, None).await {
 							let _ = t2
 								.webhook
 								.execute(
@@ -308,8 +307,7 @@ impl Clone for AudioHandler {
 		let remaining = Arc::<_>::strong_count(&self.verbose);
 		trace!(
 			"{} references to AudioHandler {{ guild_id: {} }} left",
-			remaining,
-			self.guild_id
+			remaining, self.guild_id
 		);
 
 		Self {

scripty_audio_handler/src/audio_handler.rs

@@ -6,11 +6,11 @@ use serenity::{
 	builder::{CreateWebhook, ExecuteWebhook},
 	model::{
 		channel::ChannelType,
-		id::{ChannelId, GuildId},
+		id::{ChannelId, GuildId, ThreadId},
 	},
 	prelude::Context,
 };
-use songbird::{error::JoinError, events::Event, CoreEvent};
+use songbird::{CoreEvent, error::JoinError, events::Event};
 
 use crate::Error;
 
@@ -31,7 +31,7 @@ pub async fn connect_to_vc(
 	guild_id: GuildId,
 	transcript_target_channel: ChannelId,
 	voice_channel_id: ChannelId,
-	transcript_thread_id: Option<ChannelId>,
+	transcript_thread_id: Option<ThreadId>,
 	record_transcriptions: bool,
 	ephemeral: bool,
 ) -> Result<(), Error> {
@@ -53,19 +53,19 @@ pub async fn connect_to_vc(
 	debug!(%guild_id, "checking type of target channel");
 	// if the target channel is a thread we have to take its parent as the true target
 	// and set the thread's ID to transcript_thread_id
-	let (transcript_target_channel, transcript_thread_id) = {
+	let (transcript_target_channel, transcript_thread_id): (ChannelId, Option<ThreadId>) = {
 		let transcript_target_model = transcript_target_channel
 			.to_guild_channel(&ctx, Some(guild_id))
 			.await?;
 		match (
-			transcript_target_model.kind,
+			transcript_target_model.base.kind,
 			transcript_target_model.parent_id,
 		) {
 			// caught a thread as the target channel, fix that problem by using the parent instead
 			(
 				ChannelType::NewsThread | ChannelType::PublicThread | ChannelType::PrivateThread,
 				Some(parent),
-			) => (parent, Some(transcript_target_channel)),
+			) => (parent, Some(ThreadId::new(transcript_target_channel.get()))),
 
 			// a thread with no parent? i must inform my supervisor post-haste!
 			(

scripty_audio_handler/src/connect.rs

@@ -1,11 +1,12 @@
 use std::sync::{
-	atomic::{AtomicU8, Ordering},
 	Arc,
+	atomic::{AtomicU8, Ordering},
 };
 
 use serenity::{
-	all::{ChannelId, Context, Webhook},
 	builder::ExecuteWebhook,
+	gateway::client::Context,
+	model::{id::ThreadId, webhook::Webhook},
 };
 use songbird::model::payload::ClientDisconnect;
 
@@ -17,7 +18,7 @@ pub async fn client_disconnect(
 	premium_level: Arc<AtomicU8>,
 	ctx: Context,
 	webhook: Arc<Webhook>,
-	thread_id: Option<ChannelId>,
+	thread_id: Option<ThreadId>,
 	transcript_results: TranscriptResults,
 ) {
 	let user_id = client_disconnect_data.user_id;

scripty_audio_handler/src/events/client_disconnect.rs

@@ -1,10 +1,12 @@
 use std::{borrow::Cow, sync::Arc};
 
 use serenity::{
-	all::UserId,
 	builder::{CreateAttachment, CreateMessage, ExecuteWebhook},
 	gateway::client::Context,
-	model::{id::ChannelId, webhook::Webhook},
+	model::{
+		id::{ChannelId, ThreadId, UserId},
+		webhook::Webhook,
+	},
 };
 use songbird::{events::context_data::DisconnectReason, id::GuildId, model::CloseCode};
 
@@ -21,7 +23,7 @@ pub async fn driver_disconnect(
 	webhook: Arc<Webhook>,
 	channel_id: ChannelId,
 	voice_channel_id: ChannelId,
-	thread_id: Option<ChannelId>,
+	thread_id: Option<ThreadId>,
 	transcript_results: TranscriptResults,
 	seen_users: SeenUsers,
 	ephemeral: bool,

scripty_audio_handler/src/events/driver_disconnect.rs

@@ -1,8 +1,8 @@
 use std::{
 	borrow::Cow,
 	sync::{
-		atomic::{AtomicBool, Ordering},
 		Arc,
+		atomic::{AtomicBool, Ordering},
 	},
 	time::Instant,
 };
@@ -15,9 +15,12 @@ use scripty_integrations::kiai::{KiaiApiClient, KiaiPostVirtualMessage};
 use scripty_metrics::Metrics;
 use scripty_stt::{ModelError, Stream};
 use serenity::{
-	all::{ChannelId as SerenityChannelId, ChannelId, GuildId, UserId, Webhook},
 	builder::{CreateEmbed, CreateMessage, EditMember, ExecuteWebhook},
 	gateway::client::Context,
+	model::{
+		id::{ChannelId, GenericChannelId, GuildId, ThreadId, UserId},
+		webhook::Webhook,
+	},
 };
 use songbird::events::context_data::VoiceTick;
 
@@ -37,7 +40,7 @@ pub struct VoiceTickContext {
 	pub ctx:                Context,
 	pub webhook:            Arc<Webhook>,
 	pub channel_id:         ChannelId,
-	pub thread_id:          Option<ChannelId>,
+	pub thread_id:          Option<ThreadId>,
 	pub transcript_results: Option<Arc<RwLock<Vec<String>>>>,
 	pub automod_server_cfg: Arc<AutomodServerConfig>,
 	pub auto_detect_lang:   Arc<AtomicBool>,
@@ -122,7 +125,7 @@ struct SilentSpeakersContext {
 	verbose:            Arc<AtomicBool>,
 	guild_id:           GuildId,
 	channel_id:         ChannelId,
-	thread_id:          Option<ChannelId>,
+	thread_id:          Option<ThreadId>,
 	automod_server_cfg: Arc<AutomodServerConfig>,
 	transcript_results: TranscriptResults,
 	ctx:                Context,
@@ -171,7 +174,7 @@ async fn handle_silent_speakers<'a>(
 		// finalize the stream
 		let lang = language.read().clone();
 		let _typing = thread_id
-			.unwrap_or(channel_id)
+			.map_or_else(|| channel_id.widen(), ThreadId::widen)
 			.start_typing(ctx.http.clone());
 		let (final_result, hook) = match finalize_stream(
 			old_stream,
@@ -233,7 +236,7 @@ async fn handle_silent_speakers<'a>(
 					}
 				}
 
-				if let Err(e) = SerenityChannelId::from(automod_server_cfg.log_channel_id)
+				if let Err(e) = GenericChannelId::from(automod_server_cfg.log_channel_id)
 					.send_message(
 						&ctx.http,
 						CreateMessage::new().embed(
@@ -464,7 +467,7 @@ async fn handle_speakers(ssrc_state: Arc<SsrcMaps>, metrics: Arc<Metrics>, voice
 async fn finalize_stream<'a>(
 	stream: Stream,
 	user_data_map: SsrcUserDataMap,
-	thread_id: Option<ChannelId>,
+	thread_id: Option<ThreadId>,
 	ssrc: u32,
 	language: String,
 	verbose: &Arc<AtomicBool>,

scripty_audio_handler/src/events/voice_tick.rs

@@ -19,8 +19,8 @@ pub use disconnect::disconnect_from_vc;
 pub use error::{Error, ErrorKind};
 pub use scripty_stt::{check_model_language, get_model_languages};
 use serenity::all::{ChannelId, GuildId};
-use songbird::{driver::DecodeMode, Config};
-pub use songbird::{error::JoinError, Songbird};
+use songbird::{Config, driver::DecodeMode};
+pub use songbird::{Songbird, error::JoinError};
 use tokio::sync::{broadcast, oneshot::Sender};
 
 use crate::audio_handler::SsrcMaps;
@@ -99,8 +99,7 @@ pub fn get_internal_state(guild_id: &GuildId) -> Option<InternalSsrcStateDetails
 	let internal_maps = maps.get(guild_id)?;
 	let v = internal_maps.value();
 
-	// go ahead and try getting rid of this binding i dare you :)
-	let ret = Some(InternalSsrcStateDetails {
+	Some(InternalSsrcStateDetails {
 		seen_users: v.ssrc_user_id_map.iter().map(|x| *x.key()).collect(),
 		ssrcs_with_stream: v.ssrc_stream_map.iter().map(|x| *x.key()).collect(),
 		ssrcs_with_attached_data: v.ssrc_user_data_map.iter().map(|x| *x.key()).collect(),
@@ -112,7 +111,5 @@ pub fn get_internal_state(guild_id: &GuildId) -> Option<InternalSsrcStateDetails
 		ssrcs_actively_speaking_this_tick: v.ssrc_speaking_set.iter().map(|x| *x).collect(),
 		actively_transcribed_ssrcs: v.active_user_set.iter().map(|x| *x).collect(),
 		next_ssrcs: v.next_user_list.read().iter().copied().collect(),
-	});
-
-	ret
+	})
 }

scripty_audio_handler/src/lib.rs

@@ -1,7 +1,7 @@
 [package]
 name = "scripty_automod"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "EUPL-1.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html