valter/dj-kitty-cat
1
0
Fork 0
Code Issues 7 Pull requests Projects 1 Releases Wiki Activity

[WIP] Upgrade to poise 0.6

Browse source
This commit is contained in:
Alex Page 2024-01-25 12:42:57 -05:00
parent 952cf0cdb6
commit e58e70509c
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = "1.0.69" anyhow = "1.0.69"
parking_lot = "0.12.1" parking_lot = "0.12.1"
poise = "0.5.2" poise = "0.6.1"
tracing = "0.1.37" tracing = "0.1.37"
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
openai = "1.0.0-alpha.8" openai = "1.0.0-alpha.8"
@ -18,8 +18,7 @@ version = "0.3.16"
features = ["fmt", "env-filter", "std"] features = ["fmt", "env-filter", "std"]
[dependencies.songbird] [dependencies.songbird]
version = "0.3.1" version = "0.4.0"
features = ["yt-dlp"]
[dependencies.tokio] [dependencies.tokio]
version = "1.26.0" version = "1.26.0"

19
src/main.rs
View file

@ -12,8 +12,7 @@ use std::{env, sync::Arc};
use anyhow::Result; use anyhow::Result;
use parking_lot::Mutex; use parking_lot::Mutex;
use poise::serenity_prelude::{self as serenity}; use poise::serenity_prelude as serenity;
use songbird::serenity::SerenityInit;
pub struct Data { pub struct Data {
queue: Arc<Mutex<queue::Queue>>, queue: Arc<Mutex<queue::Queue>>,
@ -23,11 +22,11 @@ pub type CommandContext<'a> = poise::Context<'a, Data, Error>;
async fn event_event_handler( async fn event_event_handler(
_ctx: &serenity::Context, _ctx: &serenity::Context,
event: &poise::Event<'_>, event: &serenity::FullEvent,
_framework: poise::FrameworkContext<'_, Data, Error>, _framework: poise::FrameworkContext<'_, Data, Error>,
_user_data: &Data, _user_data: &Data,
) -> Result<(), Error> { ) -> 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) println!("{} is connected!", data_about_bot.user.name)
} }
@ -75,10 +74,8 @@ async fn main() -> Result<()> {
let intents = serenity::GatewayIntents::non_privileged(); let intents = serenity::GatewayIntents::non_privileged();
poise::Framework::builder() let framework = poise::Framework::builder()
.token(token)
.options(options) .options(options)
.intents(intents)
.setup(|_ctx, _data, _framework| { .setup(|_ctx, _data, _framework| {
Box::pin(async move { Box::pin(async move {
Ok(Data { Ok(Data {
@ -86,8 +83,12 @@ async fn main() -> Result<()> {
}) })
}) })
}) })
.client_settings(|client_builder| client_builder.register_songbird()) .build();
.run()
let client = serenity::ClientBuilder::new(token, intents)
.framework(framework)
.await?
.start()
.await?; .await?;
Ok(()) Ok(())