Allow /leave to forcibly reset state

Author: tazz4843

scripty_audio_handler/src/disconnect.rs

@@ -1,19 +1,22 @@
 use std::time::Duration;
 
 use dashmap::DashMap;
+use scripty_data_type::get_data;
 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> {
+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 {
 		Ok(()) => Ok(true),
 		Err(JoinError::NoCall) => Ok(false),
 		Err(e) => Err(e.into()),
 	};
 
+	get_data(ctx).existing_calls.force_remove_guild(&guild_id);
+
 	let existing = super::AUTO_LEAVE_TASKS
 		.get_or_init(|| DashMap::with_hasher(ahash::RandomState::default()))
 		.remove(&guild_id);

scripty_bot_utils/src/error/error_type.rs

@@ -261,7 +261,7 @@ impl Display for Error {
 			AudioTranscription(e) => format!("Failed to transcribe audio message: {}", e).into(),
 			KiaiError(e) => format!("Kiai API error: {}", e).into(),
 			CallAlreadyExists => "a call for this channel already exists - not trying to rejoin \
-			                      the same channel"
+			                      the same channel - run `/leave` if this is wrong"
 				.into(),
 			NoGuildDefaults => "no default configuration exists for this server".into(),
 			BadDiscordState => "Discord sent us bad data".into(),

scripty_data_type/src/call_death_struct.rs

@@ -21,6 +21,10 @@ impl CallLivenessMap {
 	pub fn existing_channel_for_guild(&self, guild_id: &GuildId) -> Option<ChannelId> {
 		Some(self.0.get(guild_id)?.value().0)
 	}
+
+	pub fn force_remove_guild(&self, guild_id: &GuildId) -> bool {
+		self.0.remove(guild_id).is_some()
+	}
 }
 
 impl Default for CallLivenessMap {
@@ -66,7 +70,8 @@ impl Drop for CallDeath {
 				last = true;
 			}
 		} else {
-			unreachable!("should be impossible to delete without the atomic value at 0");
+			// FIXME: log this
+			//  "should be impossible to delete without the atomic value at 0"
 		}
 		if last {
 			if let Some(v) = self.inner.0.remove(&self.guild_id) {