Migrate to unified error type

Author: tazz4843

Cargo.lock

@@ -24,6 +24,7 @@ async-trait.workspace = true
 scripty_db = { path = "../scripty_db" }
 scripty_stt = { path = "../scripty_stt" }
 #scripty_tts = { path = "../scripty_tts" }
+scripty_error = { path = "../scripty_error" }
 scripty_utils = { path = "../scripty_utils" }
 scripty_redis = { path = "../scripty_redis" }
 scripty_automod = { path = "../scripty_automod" }

scripty_audio_handler/Cargo.toml

@@ -11,6 +11,7 @@ use ahash::RandomState;
 use dashmap::{DashMap, DashSet};
 use scripty_automod::types::AutomodServerConfig;
 use scripty_data_type::{CallDeath, get_data};
+use scripty_error::Error;
 use scripty_integrations::kiai::KiaiApiClient;
 use serenity::{
 	builder::ExecuteWebhook,
@@ -23,7 +24,6 @@ use serenity::{
 use songbird::{Event, EventContext, EventHandler};
 
 use crate::{
-	error::Error,
 	events::{
 		VoiceTickContext,
 		client_disconnect,
@@ -113,7 +113,7 @@ impl AudioHandler {
 			guild_id,
 			voice_channel_id,
 		)
-		.ok_or_else(Error::already_exists)?;
+		.ok_or_else(Error::call_already_exists)?;
 
 		let this = Self {
 			ssrc_state,

scripty_audio_handler/src/audio_handler.rs

@@ -1,6 +1,7 @@
 use ahash::RandomState;
 use dashmap::DashMap;
 use scripty_data_type::get_data;
+use scripty_error::Error;
 use scripty_premium::PremiumTierList;
 use serenity::{
 	builder::{CreateWebhook, ExecuteWebhook},
@@ -12,8 +13,6 @@ use serenity::{
 };
 use songbird::{CoreEvent, error::JoinError, events::Event};
 
-use crate::Error;
-
 /// Kick off the process of connecting Scripty to a voice channel.
 ///
 /// # Arguments
@@ -46,7 +45,7 @@ pub async fn connect_to_vc(
 		if existing_id == voice_channel_id {
 			// attempting to rejoin the same channel, so return early
 			debug!(%voice_channel_id, %guild_id, "attempting to rejoin the same channel that we were already in, refusing to do so");
-			return Err(Error::already_exists());
+			return Err(Error::call_already_exists());
 		}
 	}
 
@@ -111,7 +110,7 @@ pub async fn connect_to_vc(
 		}
 	};
 	let Some(ref webhook_token) = webhook.token else {
-		return Err(Error::no_webhook_token());
+		return Err(Error::expected_webhook_token());
 	};
 	let webhook_id = webhook.id;
 

scripty_audio_handler/src/connect.rs

@@ -2,11 +2,10 @@ use std::time::Duration;
 
 use dashmap::DashMap;
 use scripty_data_type::get_data;
+use scripty_error::Error;
 use serenity::{gateway::client::Context, model::id::GuildId};
 use songbird::error::JoinError;
 
-use crate::error::Error;
-
 pub async fn disconnect_from_vc(ctx: &Context, guild_id: GuildId) -> Result<bool, Error> {
 	let sb = crate::get_songbird();
 	let res = match sb.remove(guild_id).await {

scripty_audio_handler/src/disconnect.rs

@@ -12,7 +12,6 @@ use songbird::{events::context_data::DisconnectReason, id::GuildId, model::Close
 
 use crate::{
 	connect_to_vc,
-	error::ErrorKind,
 	types::{SeenUsers, TranscriptResults},
 };
 
@@ -93,7 +92,7 @@ pub async fn driver_disconnect(
 			tokio::time::sleep(std::time::Duration::from_secs(30)).await;
 			debug!(?guild_id, "attempting reconnect");
 
-			if let Err(ErrorKind::Join(e)) = connect_to_vc(
+			if let Err(e) = connect_to_vc(
 				ctx2,
 				serenity::all::GuildId::new(guild_id.get()),
 				channel_id,
@@ -102,16 +101,13 @@ pub async fn driver_disconnect(
 				record_transcriptions,
 				ephemeral,
 			)
-			.await
-			.map_err(|x| x.kind)
-				&& let Err(e) = webhook2
-					.execute(
-						&ctx3.http,
-						false,
-						ExecuteWebhook::default()
-							.content(format!("Failed to reconnect due to: {}", e)),
-					)
-					.await
+			.await && let Err(e) = webhook2
+				.execute(
+					&ctx3.http,
+					false,
+					ExecuteWebhook::default().content(format!("Failed to reconnect due to: {}", e)),
+				)
+				.await
 			{
 				debug!(
 					?guild_id,