port to latest library versions

Cargo.toml

@@ -24,16 +24,14 @@ tempfile = "3.4.0"
 # TODO
 [dependencies.poise]
 git = "https://github.com/serenity-rs/poise"
-branch = "serenity-next"
+branch = "current"
 
 [dependencies.songbird]
-git = "https://github.com/serenity-rs/songbird.git"
-branch = "next"
+version = "0.4.0"
 features = [ "builtin-queue" ]
 
 [dependencies.serenity]
-git = "https://github.com/serenity-rs/serenity"
-branch = "next"
+version = "0.12.0"
 default-features = false
 features = ["client", "model", "cache", "voice", "rustls_backend"]
 

src/list.rs

@@ -159,19 +159,18 @@ async fn queue(
         let text = retrieve_queue(&hlock, page).await;
         let msg = ctx
             .send(
-                CreateReply::new()
+                CreateReply::default()
                     .content(text)
                     .components(vec![make_buttons(page, len)]),
             )
             .await?;
 
         drop(hlock);
 
-        let discord = ctx.discord();
         let msg = msg.into_message().await?;
 
-        let rxns = msg.await_component_interaction(ctx.discord());
-        start_pagination(msg, discord.clone(), handler, rxns);
+        let rxns = msg.await_component_interaction(ctx);
+        start_pagination(msg, ctx.serenity_context().clone(), handler, rxns);
 
         Ok(())
     })

src/main.rs

@@ -4,6 +4,7 @@ use std::sync::Arc;
 
 use reqwest::Client;
 use restart::CallData;
+use serenity::client::ClientBuilder;
 use serenity::gateway::ActivityData;
 use serenity::model::prelude::UserId;
 use serenity::prelude::GatewayIntents;
@@ -135,14 +136,17 @@ async fn main_inner() {
         .init();
 
     let bot_owner = env::var("BOT_OWNER_ID").expect("Please set BOT_OWNER_ID");
-    let bot_owner = UserId(
-        NonZeroU64::new(bot_owner.parse().expect("bot owner id not correctly set")).unwrap(),
+    let bot_owner = UserId::from(
+        NonZeroU64::new(bot_owner.parse().expect("bot owner id not correctly set")).expect("bot owner ID should be non-zero"),
     );
 
-    poise::FrameworkBuilder::default()
-        .client_settings(|c| {
-            c.register_songbird()
-                .activity(ActivityData::watching("you"))
+    let framework = poise::FrameworkBuilder::default()
+        .setup(|ctx, _ready, _framework| {
+            Box::pin(async move {
+                let client = reqwest::Client::new();
+                maybe_recover(ctx, client.clone()).await;
+                Ok(Data { client })
+            })
         })
         .options(poise::FrameworkOptions {
             commands: all_commands(),
@@ -153,16 +157,10 @@ async fn main_inner() {
             },
             ..Default::default()
         })
-        .token(env::var("DISCORD_TOKEN").expect("Expected a token in the environment"))
-        .intents(GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT)
-        .user_data_setup(|ctx, _ready, _framework| {
-            Box::pin(async move {
-                let client = reqwest::Client::new();
-                maybe_recover(ctx, client.clone()).await;
-                Ok(Data { client })
-            })
-        })
-        .run()
-        .await
-        .unwrap();
+        .build();
+
+    let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
+    let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
+    let client = ClientBuilder::new(token, intents).register_songbird().activity(ActivityData::watching("you")).framework(framework).await;
+    client.unwrap().start().await.unwrap();
 }

src/play.rs

@@ -241,7 +241,7 @@ async fn maybe_edit<'a>(
     msg: String,
 ) -> Result<ReplyHandle<'a>, Error> {
     if let Some(m) = prev {
-        m.edit(ctx, CreateReply::new().content(msg)).await?;
+        m.edit(ctx, CreateReply::default().content(msg)).await?;
         Ok(m)
     } else {
         Ok(ctx.say(msg).await?)

src/restart.rs

@@ -32,7 +32,7 @@ pub async fn restart(ctx: Context<'_>) -> CommandResult {
         return Ok(());
     }
 
-    let songbird = songbird::get(ctx.discord()).await.unwrap();
+    let songbird = songbird::get(ctx.serenity_context()).await.unwrap();
     let mut calls = Vec::new();
     for (guild, call) in songbird.iter() {
         let mut handler = call.lock().await;

src/search.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use poise::serenity_prelude::{
-    CacheHttp, ComponentInteractionCollector, ComponentInteractionDataKind, CreateActionRow,
+    ComponentInteractionCollector, ComponentInteractionDataKind, CreateActionRow,
     CreateInteractionResponse, CreateSelectMenu, CreateSelectMenuKind, CreateSelectMenuOption,
     EditMessage, Message,
 };
@@ -112,7 +112,7 @@ pub async fn search(
         .into_message()
         .await?;
 
-    let collector = msg.await_component_interactions(ctx.discord());
+    let collector = msg.await_component_interactions(ctx);
 
     enter_vc(ctx, true, move |handler, ctx| async move {
         handle_search_responses(msg, ctx, handler, collector, results).await

src/vc.rs

@@ -30,7 +30,7 @@ impl songbird::EventHandler for ErrorHandler {
 pub async fn try_join(ctx: Context<'_>, must_join: bool) -> Result<Arc<Mutex<Call>>, &'static str> {
     let guild = ctx.guild_id().unwrap();
     let user = ctx.author().id;
-    let manager = songbird::get(ctx.discord())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird Voice client placed in at initialisation.")
         .clone();
@@ -44,7 +44,7 @@ pub async fn try_join(ctx: Context<'_>, must_join: bool) -> Result<Arc<Mutex<Cal
     }
 
     let channel_id = guild
-        .to_guild_cached(ctx.discord())
+        .to_guild_cached(&ctx)
         .unwrap()
         .voice_states
         .get(&user)
@@ -84,7 +84,7 @@ pub async fn enter_vc<
 ) -> CommandResult {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(ctx.discord())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird Voice client placed in at initialisation.")
         .clone();
@@ -160,7 +160,7 @@ async fn join(ctx: Context<'_>) -> CommandResult {
 async fn leave(ctx: Context<'_>) -> CommandResult {
     let guild_id = ctx.guild_id().unwrap();
 
-    let manager = songbird::get(ctx.discord())
+    let manager = songbird::get(ctx.serenity_context())
         .await
         .expect("Songbird Voice client placed in at initialisation.")
         .clone();