Fix thread ID widening now that types are correct

Author: tazz4843

scripty_audio_handler/src/connect.rs

@@ -65,7 +65,7 @@ pub async fn connect_to_vc(
 			(
 				ChannelType::NewsThread | ChannelType::PublicThread | ChannelType::PrivateThread,
 				Some(parent),
-			) => (parent, Some(ThreadId::new(transcript_target_channel.get()))),
+			) => (parent, Some(transcript_target_channel)),
 
 			// a thread with no parent? i must inform my supervisor post-haste!
 			(

scripty_bot_utils/src/handler/normal/voice_state_update.rs

@@ -278,8 +278,5 @@ async fn maybe_create_thread(
 			.await?
 	};
 
-	Ok((
-		target_channel_id,
-		Some(ThreadId::new(thread.id.widen().get())),
-	))
+	Ok((target_channel_id, Some(thread.id)))
 }

scripty_commands/src/cmds/join.rs

@@ -124,8 +124,10 @@ pub async fn join(
 		.await?;
 		return Ok(());
 	} else if create_thread
-		&& [ChannelType::Voice, ChannelType::Stage].contains(&target_channel.base.kind)
-	{
+		&& matches!(
+			target_channel.base.kind,
+			ChannelType::Voice | ChannelType::Stage
+		) {
 		ctx.say(
 			format_message!(resolved_language, "join-create-thread-in-unsupported", targetMention: target_channel.mention().to_string()),
 		)
@@ -229,9 +231,7 @@ pub async fn join(
 	if voice_channel
 		.base
 		.guild(ctx.cache())
-		.ok_or(Error::custom(
-			"the current server was not found in the cache (Discord didn't send data)".to_string(),
-		))?
+		.ok_or_else(Error::expected_guild)?
 		.voice_states
 		.iter()
 		.filter(|state| state.channel_id == Some(voice_channel.id))
@@ -274,7 +274,7 @@ pub async fn join(
 				)
 				.await?;
 
-			(Some(ThreadId::new(thread.id.get())), target_channel.id)
+			(Some(thread.id), target_channel.id)
 		} else {
 			// creating a thread outside a forum
 
@@ -289,7 +289,7 @@ pub async fn join(
 				)
 				.await?;
 
-			(Some(ThreadId::new(thread.id.get())), target_channel.id)
+			(Some(thread.id), target_channel.id)
 		}
 	} else if let Some(target_thread) = target_thread {
 		// this channel is a thread