diff --git a/Cargo.toml b/Cargo.toml index 95b242d..993ec08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] anyhow = "1.0.69" parking_lot = "0.12.1" -poise = "0.5.2" +poise = "0.6.1" tracing = "0.1.37" tracing-futures = "0.2.5" openai = "1.0.0-alpha.8" @@ -18,8 +18,7 @@ version = "0.3.16" features = ["fmt", "env-filter", "std"] [dependencies.songbird] -version = "0.3.1" -features = ["yt-dlp"] +version = "0.4.0" [dependencies.tokio] version = "1.26.0" diff --git a/src/main.rs b/src/main.rs index 3b171b9..b00554c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,8 +12,7 @@ use std::{env, sync::Arc}; use anyhow::Result; use parking_lot::Mutex; -use poise::serenity_prelude::{self as serenity}; -use songbird::serenity::SerenityInit; +use poise::serenity_prelude as serenity; pub struct Data { queue: Arc>, @@ -23,11 +22,11 @@ pub type CommandContext<'a> = poise::Context<'a, Data, Error>; async fn event_event_handler( _ctx: &serenity::Context, - event: &poise::Event<'_>, + event: &serenity::FullEvent, _framework: poise::FrameworkContext<'_, Data, Error>, _user_data: &Data, ) -> Result<(), Error> { - if let poise::Event::Ready { data_about_bot } = event { + if let serenity::FullEvent::Ready { data_about_bot } = event { println!("{} is connected!", data_about_bot.user.name) } @@ -75,10 +74,8 @@ async fn main() -> Result<()> { let intents = serenity::GatewayIntents::non_privileged(); - poise::Framework::builder() - .token(token) + let framework = poise::Framework::builder() .options(options) - .intents(intents) .setup(|_ctx, _data, _framework| { Box::pin(async move { Ok(Data { @@ -86,8 +83,12 @@ async fn main() -> Result<()> { }) }) }) - .client_settings(|client_builder| client_builder.register_songbird()) - .run() + .build(); + + let client = serenity::ClientBuilder::new(token, intents) + .framework(framework) + .await? + .start() .await?; Ok(())