let bot leave if it is alone
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-02-19 17:23:19 +01:00
parent 594a22e743
commit 243027a653
3 changed files with 52 additions and 12 deletions

View File

@@ -1,10 +1,9 @@
use crate::state::State;
use std::{env, error::Error, num::NonZeroU64, time::Duration}; use std::{env, error::Error, num::NonZeroU64, time::Duration};
use tokio::time::sleep; use tokio::time::sleep;
use tracing::info; use tracing::debug;
use twilight_model::{channel::Message, id::Id}; use twilight_model::{channel::Message, id::Id};
use crate::state::State;
pub(crate) async fn delete( pub(crate) async fn delete(
msg: Message, msg: Message,
state: State, state: State,
@@ -33,7 +32,7 @@ pub(crate) async fn delete(
.await?; .await?;
state.http.delete_message(msg.channel_id, msg.id).await?; state.http.delete_message(msg.channel_id, msg.id).await?;
for message in messages { for message in messages {
info!("Delete message: {:?}: {:?}", message.author.name, message); debug!("Delete message: {:?}: {:?}", message.author.name, message);
state state
.http .http
.delete_message(msg.channel_id, message.id) .delete_message(msg.channel_id, message.id)

View File

@@ -1,14 +1,13 @@
use crate::commands::{delete, join, leave, pause, play, queue, resume, stop}; use crate::commands::{delete, join, leave, pause, play, queue, resume, stop};
use crate::state::State; use crate::state::State;
use futures::Future; use futures::Future;
use std::error::Error; use std::error::Error;
use std::sync::Arc; use std::sync::Arc;
use tracing::debug; use tracing::debug;
use twilight_gateway::Event;
use twilight_model::application::interaction::application_command::CommandOptionValue; use twilight_model::application::interaction::application_command::CommandOptionValue;
use twilight_model::application::interaction::{Interaction, InteractionData}; use twilight_model::application::interaction::{Interaction, InteractionData};
use twilight_model::gateway::payload::incoming::VoiceStateUpdate;
use twilight_gateway::Event;
#[derive(Debug)] #[derive(Debug)]
enum InteractionCommand { enum InteractionCommand {
@@ -32,6 +31,42 @@ fn spawn(
}); });
} }
pub(crate) async fn leave_if_alone(
update: VoiceStateUpdate,
state: State,
) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
let guild_id = update.guild_id.ok_or("Guild ID not found")?;
let user = state
.cache
.current_user()
.ok_or("Cannot get current user")?;
let user_voice_state = state
.cache
.voice_state(user.id, guild_id)
.ok_or("Cannot get voice state")?;
let channel = state
.cache
.channel(user_voice_state.channel_id())
.ok_or("Cannot get channel")?;
let channel_voice_states = state
.cache
.voice_channel_states(channel.id)
.ok_or("Cannot get voice channel")?;
let count = channel_voice_states.count();
// count is 1 if the bot is the only one in the channel
if count == 1 {
// stop playing
if let Some(call_lock) = state.songbird.get(guild_id) {
let call = call_lock.lock().await;
call.queue().stop();
}
// leave the voice channel
state.songbird.leave(guild_id).await?;
}
Ok(())
}
pub(crate) struct Handler { pub(crate) struct Handler {
state: State, state: State,
} }
@@ -47,6 +82,9 @@ impl Handler {
spawn(delete(message.0.clone(), Arc::clone(&self.state))); spawn(delete(message.0.clone(), Arc::clone(&self.state)));
} }
} }
Event::VoiceStateUpdate(update) => {
spawn(leave_if_alone(*update.clone(), Arc::clone(&self.state)))
}
_ => {} _ => {}
} }

View File

@@ -4,6 +4,7 @@ mod commands;
mod metadata; mod metadata;
mod signal; mod signal;
mod state; mod state;
use crate::commands::get_chat_commands;
use dotenv::dotenv; use dotenv::dotenv;
use futures::StreamExt; use futures::StreamExt;
use signal::signal_handler; use signal::signal_handler;
@@ -21,8 +22,6 @@ use twilight_http::Client as HttpClient;
use twilight_model::id::Id; use twilight_model::id::Id;
use twilight_standby::Standby; use twilight_standby::Standby;
use crate::commands::get_chat_commands;
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> { async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
dotenv().ok(); dotenv().ok();
@@ -89,9 +88,13 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
select! { select! {
biased; biased;
_ = stop_rx.changed() => { _ = stop_rx.changed() => {
for guild in state.cache.iter().guilds(){ for guild in state.cache.iter().guilds() {
info!("Leaving guild {:?}", guild.id()); if let Some(user) = state.cache.current_user() {
state.songbird.leave(guild.id()).await?; if state.cache.voice_state(user.id, guild.id()).is_some() {
debug!("Leaving guild {:?}", guild.id());
state.songbird.leave(guild.id()).await?;
}
}
} }
// need to grab next event to properly leave voice channels // need to grab next event to properly leave voice channels
stream.next().await; stream.next().await;