music commands migrated

Cargo.lock

@@ -340,6 +340,41 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -785,6 +820,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -892,10 +933,11 @@ dependencies = [
 
 [[package]]
 name = "lyra"
-version = "0.1.0"
+version = "0.4.0"
 dependencies = [
  "dotenv",
  "openssl",
+ "poise",
  "regex",
  "reqwest",
  "serenity",
@@ -1247,6 +1289,35 @@ dependencies = [
  "pnet_base",
 ]
 
+[[package]]
+name = "poise"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1819d5a45e3590ef33754abce46432570c54a120798bdbf893112b4211fa09a6"
+dependencies = [
+ "async-trait",
+ "derivative",
+ "futures-util",
+ "parking_lot",
+ "poise_macros",
+ "regex",
+ "serenity",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "poise_macros"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fa2c123c961e78315cd3deac7663177f12be4460f5440dbf62a7ed37b1effea"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -1976,6 +2047,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
 
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -2261,6 +2338,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",

Cargo.toml

@@ -1,17 +1,26 @@
 [package]
 name = "lyra"
-version = "0.1.0"
+version = "0.4.0"
+authors = ["Michał Czyż <mike@c2yz.com>"]
 edition = "2021"
+description = "A featureful Discord bot written in Rust."
+documentation = "https://lyra.c2yz.com/docs"
+readme = "README.md"
+homepage = "https://lyra.c2yz.com"
+license-file = "LICENSE.md"
+keywords = ["discord", "bot", "rust", "music", "featureful"]
+
 
 [dependencies]
 dotenv = "0.15.0"
 openssl = { version = "0.10.63", features = ["vendored"] }
+poise = "0.6.1"
 regex = "1.10.3"
 reqwest = "0.11.23"
 serenity = { version = "0.12.0", features = ["cache", "framework", "standard_framework", "voice"] }
 songbird = { version = "0.4.0", features = ["builtin-queue", "serenity"] }
 symphonia = "0.5.3"
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread", "signal"] }
+tokio = { version = "1.35.1", features = ["macros", "full", "signal"] }
 tracing = "0.1.40"
 tracing-futures = "0.2.5"
 tracing-subscriber = "0.3.18"

LICENSE.md

@@ -1,5 +1,7 @@
 # License
 
-Copyright(c) Michał Czyż 2024
+Copyright (C) 2024 Michał Czyż
 
-[Currently] All Rights Reserved.
+All Rights Reserved.
+
+This build is private and shall not be distributed nor modified without permission.

scripts/cross-build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cross build -r --target aarch64-unknown-linux-gnu

scripts/launch.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nohup ../lyra > lyra.log 2> lyra.err < /dev/null &

src/commands/kashi/kashi.rs

@@ -1,10 +1,10 @@
-use serenity::{all::Message, client::Context, framework::standard::{macros::command, CommandResult}};
+use crate::{Context, Error};
 
-use crate::commands::misc::check_msg;
-
-#[command]
-async fn kashi(ctx: &Context, msg: &Message) -> CommandResult {
-    check_msg(msg.reply(ctx, "Kashi lyrics platform integration").await);
+#[poise::command(prefix_command, slash_command)]
+pub async fn kashi(ctx: Context<'_>) -> Result<(), Error> {
+    
+    let response = format!("Kashi platform is currently under construction!");
+    ctx.say(response).await?;
 
     Ok(())
-}
+}

src/commands/misc.rs

@@ -1,8 +0,0 @@
-use serenity::model::channel::Message;
-use serenity::Result as SerenityResult;
-
-pub fn check_msg(result: SerenityResult<Message>) {
-    if let Err(why) = result {
-        println!("Error sending message: {:?}", why);
-    }
-}

src/commands/mod.rs

@@ -1,4 +1,3 @@
 pub mod kashi;
-pub mod misc;
 pub mod music;
 pub mod tools;

src/commands/music/deafen.rs

@@ -1,24 +1,18 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
+use crate::{Context, Error};
 
-use crate::commands::misc::check_msg;
+#[poise::command(prefix_command, slash_command)]
+pub async fn deafen(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
 
-#[command]
-#[only_in(guilds)]
-async fn deafen(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
+    let manager = songbird::get(&ctx.serenity_context())
         .await
-        .expect("Client placed at init")
+        .expect("Songbird client placed at init")
         .clone();
 
     let handler_lock = match manager.get(guild_id) {
         Some(handler) => handler,
         None => {
-            check_msg(msg.reply(ctx, "Not in a voice channel").await);
+            ctx.say("Not in a voice channel").await?;
 
             return Ok(());
         }
@@ -27,17 +21,17 @@ async fn deafen(ctx: &Context, msg: &Message) -> CommandResult {
     let mut handler = handler_lock.lock().await;
 
     if handler.is_deaf() {
-        check_msg(msg.channel_id.say(&ctx.http, "Already deafened").await);
-    } else {
-        if let Err(err) = handler.deafen(true).await {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
+        if let Err(err) = handler.deafen(false).await {
+            ctx.say(format!("Failed: {:?}", err)).await?;
         }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Deafened").await);
+        ctx.say("Undeafened").await?;
+    } else {
+        if let Err(err) = handler.deafen(true).await {
+            ctx.say(format!("Failed: {:?}", err)).await?;
+        }
+
+        ctx.say("Deafened").await?;
     }
 
     Ok(())

src/commands/music/join.rs

@@ -1,36 +1,23 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
-use songbird::events::TrackEvent;
+use crate::{Context, Error};
+use songbird::TrackEvent;
+use crate::commands::music::misc::TrackErrorNotifier;
 
-use crate::commands::{misc::check_msg, music::misc::TrackErrorNotifier};
-
-#[command]
-#[only_in(guilds)]
-async fn join(ctx: &Context, msg: &Message) -> CommandResult {
-    let (guild_id, channel_id) = {
-        let guild = msg.guild(&ctx.cache).unwrap();
-        let channel_id = guild
-            .voice_states
-            .get(&msg.author.id)
-            .and_then(|voice_state| voice_state.channel_id);
-
-        (guild.id, channel_id)
-    };
+#[poise::command(prefix_command, slash_command)]
+pub async fn join(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+    let channel_id = ctx.guild().unwrap().voice_states.get(&ctx.author().id).and_then(|voice_state| voice_state.channel_id);
 
     let connect_to = match channel_id {
         Some(channel) => channel,
         None => {
-            check_msg(msg.reply(ctx, "Not in a voice channel").await);
-
+            ctx.say("Not in a voice channel").await?;
             return Ok(());
         }
     };
 
-    let manager = songbird::get(ctx)
+    let manager = songbird::get(&ctx.serenity_context())
         .await
-        .expect("Songbird Voice placed at init")
+        .expect("Songbird client placed at init")
         .clone();
 
     if let Ok(handler_lock) = manager.join(guild_id, connect_to).await {
@@ -38,5 +25,7 @@ async fn join(ctx: &Context, msg: &Message) -> CommandResult {
         handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
     }
 
+    ctx.say("Joined the voice channel").await?;
+
     Ok(())
-}
+}

src/commands/music/leave.rs

@@ -1,36 +1,24 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
+use crate::{Context, Error};
 
-use crate::commands::misc::check_msg;
+#[poise::command(prefix_command, slash_command)]
+pub async fn leave(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
 
-#[command]
-#[aliases(q)]
-#[only_in(guilds)]
-async fn leave(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
+    let manager = songbird::get(&ctx.serenity_context())
         .await
-        .expect("Client placed in at init")
+        .expect("Songbird client placed at init")
         .clone();
 
-    let has_handler = manager.get(guild_id).is_some();
-
-    if has_handler {
-        if let Err(err) = manager.remove(guild_id).await {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
-        }
-
-        check_msg(msg.channel_id.say(&ctx.http, "Left voice channel").await);
-    } else {
-        check_msg(msg.reply(ctx, "Not in a voice channel").await);
+    if !manager.get(guild_id).is_some() {
+        ctx.say("Not in a voice channel").await?;
+        return Ok(())
     }
 
+    if let Err(err) = manager.remove(guild_id).await { 
+        ctx.say(format!("Failed: {:?}", err)).await?;
+    }
+
+    ctx.say("Left voice channel").await?;
+
     Ok(())
 }

src/commands/music/misc.rs

@@ -17,4 +17,4 @@ impl VoiceEventHandler for TrackErrorNotifier {
         }
         None
     }
-}
+}

src/commands/music/mod.rs

@@ -7,5 +7,6 @@ pub mod play;
 pub mod queue;
 pub mod skip;
 pub mod stop;
-pub mod undeafen;
-pub mod unmute;
+pub mod repeat;
+pub mod pause;
+pub mod resume;

src/commands/music/mute.rs

@@ -1,24 +1,18 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
+use crate::{Context, Error};
 
-use crate::commands::misc::check_msg;
+#[poise::command(prefix_command, slash_command)]
+pub async fn mute(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
 
-#[command]
-#[only_in(guilds)]
-async fn mute(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
+    let manager = songbird::get(&ctx.serenity_context())
         .await
-        .expect("Client placed at init")
+        .expect("Songbird client placed at init")
         .clone();
 
     let handler_lock = match manager.get(guild_id) {
         Some(handler) => handler,
         None => {
-            check_msg(msg.reply(ctx, "Not in a voice channel").await);
+            ctx.say("Not in a voice channel").await?;
 
             return Ok(());
         }
@@ -26,18 +20,18 @@ async fn mute(ctx: &Context, msg: &Message) -> CommandResult {
 
     let mut handler = handler_lock.lock().await;
 
-    if handler.is_mute() {
-        check_msg(msg.channel_id.say(&ctx.http, "Already muted").await);
-    } else {
-        if let Err(err) = handler.mute(true).await {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
+    if handler.is_mute() { 
+        if let Err(e) = handler.mute(false).await {
+            ctx.say(format!("failed: {:?}", e)).await?;
         }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Muted").await);
+        ctx.say("Unmuted").await?;
+    } else {
+        if let Err(err) = handler.mute(true).await {
+            ctx.say(format!("Failed: {:?}", err)).await?;
+        }
+
+        ctx.say("Muted").await?;
     }
 
     Ok(())

src/commands/music/pause.rs

@@ -0,0 +1,23 @@
+use crate::{Context, Error};
+
+#[poise::command(prefix_command, slash_command)]
+pub async fn pause(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+
+    let manager = songbird::get(&ctx.serenity_context())
+        .await
+        .expect("Songbird client placed at init")
+        .clone();
+
+    if let Some(handler_lock) = manager.get(guild_id) {
+        let handler = handler_lock.lock().await;
+        let queue = handler.queue();
+        let _ = queue.pause();
+
+        ctx.say(format!("Song paused.")).await?;
+    } else {
+        ctx.say("Not in a voice channel to play in").await?;
+    }
+
+    Ok(())
+}

src/commands/music/play.rs

@@ -1,91 +1,59 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
-use serenity::model::prelude::*;
-use serenity::prelude::*;
-use reqwest::Client as HttpClient;
-use songbird::input::YoutubeDl;
+use crate::{Context, Error};
+
+use songbird::input::{Compose, YoutubeDl};
 use songbird::events::TrackEvent;
 
-use crate::commands::{misc::check_msg, music::misc::TrackErrorNotifier};
+use crate::commands::music::misc::TrackErrorNotifier;
+use crate::http::HttpKey;
 
-pub struct HttpKey;
+#[poise::command(prefix_command, slash_command)]
+pub async fn play(ctx: Context<'_>, url: String) -> Result<(), Error> {
+    let is_search = !url.starts_with("http");
 
-impl TypeMapKey for HttpKey {
-    type Value = HttpClient;
-}
+    let guild_id = ctx.guild_id().unwrap();
+    let channel_id = ctx.guild().unwrap().voice_states.get(&ctx.author().id).and_then(|voice_state| voice_state.channel_id);
 
-#[command]
-#[aliases(p)]
-#[only_in(guilds)]
-async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
-    let url = match args.single::<String>() {
-        Ok(url) => url,
-        Err(_) => {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, "Must provide a URL to a video or audio")
-                    .await,
-            );
-
-            return Ok(());
-        }
-    };
-
-    let do_search = !url.starts_with("http");
-
-    let (guild_id, channel_id) = {
-        let guild = msg.guild(&ctx.cache).unwrap();
-        let channel_id = guild
-            .voice_states
-            .get(&msg.author.id)
-            .and_then(|voice_state| voice_state.channel_id);
-
-        (guild.id, channel_id)
-    };
-    
     let connect_to = match channel_id {
         Some(channel) => channel,
         None => {
-            check_msg(msg.reply(ctx, "Not in a voice channel").await);
+            ctx.say("Not in a voice channel").await?;
         
             return Ok(());
         }
     };
 
     let http_client = {
-        let data = ctx.data.read().await;
+        let data = ctx.serenity_context().data.read().await;
         data.get::<HttpKey>()
             .cloned()
             .expect("Guaranteed to exist in the typemap.")
     };
 
-    let manager = songbird::get(ctx)
+    let manager = songbird::get(&ctx.serenity_context())
         .await
         .expect("Songbird Voice placed at init")
         .clone();
 
     if let Ok(handler_lock) = manager.join(guild_id, connect_to).await {
         let mut handler = handler_lock.lock().await;
-        
+       
+        // if let Err(err) = handler.deafen(true).await {println!("Failed to deafen: {:?}", err)};
         handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
 
-        let src = if do_search {
-            YoutubeDl::new_ytdl_like("yt-dlp", http_client, url)
+        let mut src = if is_search {
+            println!("ytsearch:{}", url);
+            YoutubeDl::new_ytdl_like("yt-dlp", http_client, format!("ytsearch:{}", url))
         } else {
-            YoutubeDl::new(http_client, url)
+            YoutubeDl::new_ytdl_like("yt-dlp", http_client, url)
         };
         
         let _ = handler.enqueue_input(src.clone().into()).await;
+        
+        let _metadata = src.aux_metadata().await.unwrap();
 
-        // let _ = handler.play_input(src.clone().into());
-
-        check_msg(msg.channel_id.say(&ctx.http, "Playing song").await);
+        // ctx.say(format!("Playing song: {}", metadata.title.unwrap())).await?;
     } else {
-        check_msg(
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to play in")
-                .await,
-        );
+        ctx.say("Not in a voice channel to play in").await?;
     }
 
     Ok(())

src/commands/music/queue.rs

@@ -1,12 +1,34 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
+use crate::{Context, Error};
 
-// use crate::commands::misc::check_msg;
+#[poise::command(prefix_command, slash_command)]
+pub async fn queue(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+    
+    let manager = songbird::get(&ctx.serenity_context())
+        .await
+        .expect("Songbird client placed at init")
+        .clone();
+
+    if let Some(handler_lock) = manager.get(guild_id) {
+        let handler = handler_lock.lock().await;
+        let queue = handler.queue();
+        let mut queue_res = String::from("Queue: \n");
+
+        for (i, song) in queue.current_queue().iter().enumerate() {
+            queue_res.push_str(&format!(
+                "{}. {} - {}\n",
+                i + 1,
+                song.uuid(),
+                "Artist"
+                // song.metadata().artist.clone().unwrap_or_else(|| String::from("Unknown"))
+        ));
+        }
+        
+        ctx.say(queue_res).await?;
+
+    } else {
+        ctx.say("Not in a voice channel!").await?;
+    }
 
-#[command]
-#[only_in(guilds)]
-async fn queue(_ctx: &Context, _msg: &Message) -> CommandResult {
     Ok(())
-}
+}

src/commands/music/repeat.rs

@@ -0,0 +1,43 @@
+use crate::{Context, Error};
+use songbird::tracks::LoopState;
+
+#[poise::command(prefix_command, slash_command)]
+pub async fn repeat(ctx: Context<'_>, times: usize) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+
+    let manager = songbird::get(&ctx.serenity_context())
+        .await
+        .expect("Songbird client placed at init")
+        .clone();
+
+
+    if let Some(handler_lock) = manager.get(guild_id) {
+        let handler = handler_lock.lock().await;
+        let queue = handler.queue();
+
+        let track = queue.current().unwrap().get_info().await;
+        let is_looped = track.unwrap().loops;
+
+        match is_looped {
+            LoopState::Infinite => {
+                let _ = queue.current().unwrap().disable_loop();
+
+                ctx.say("Song unlooped.").await?;
+            }
+            LoopState::Finite(_) => { 
+                if times < 100 {
+                    let _ = queue.current().unwrap().loop_for(times);
+                    ctx.say("Song looped forever (a very long time)").await?;
+                }
+                else {
+                    let _ = queue.current().unwrap().enable_loop();
+                    ctx.say(format!("Song looped {} times.", times)).await?;
+                }
+            }
+        }
+    } else {
+        ctx.say("Not in a voice channel to play in").await?;
+    }
+
+    Ok(())
+}

src/commands/music/resume.rs

@@ -0,0 +1,23 @@
+use crate::{Context, Error};
+
+#[poise::command(prefix_command, slash_command)]
+pub async fn resume(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+
+    let manager = songbird::get(&ctx.serenity_context())
+        .await
+        .expect("Songbird client placed at init")
+        .clone();
+
+    if let Some(handler_lock) = manager.get(guild_id) {
+        let handler = handler_lock.lock().await;
+        let queue = handler.queue();
+        let _ = queue.resume();
+
+        ctx.say(format!("Song resumed.")).await?;
+    } else {
+        ctx.say("Not in a voice channel to play in").await?;
+    }
+
+    Ok(())
+}

src/commands/music/skip.rs

@@ -1,12 +1,23 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
+use crate::{Context, Error};
 
-// use crate::commands::misc::check_msg;
+#[poise::command(prefix_command, slash_command)]
+pub async fn skip(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
+
+    let manager = songbird::get(&ctx.serenity_context())
+        .await
+        .expect("Songbird client placed at init")
+        .clone();
+
+    if let Some(handler_lock) = manager.get(guild_id) {
+        let handler = handler_lock.lock().await;
+        let queue = handler.queue();
+        let _ = queue.skip();
+
+        ctx.say(format!("Song skipped: {} in queue.", queue.len())).await?;
+    } else {
+        ctx.say("Not in a voice channel to play in").await?;
+    }
 
-#[command]
-#[only_in(guilds)]
-async fn skip(_ctx: &Context, _msg: &Message) -> CommandResult {
     Ok(())
-}
+}

src/commands/music/stop.rs

@@ -1,40 +1,23 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
+use crate::{Context, Error};
 
-use crate::commands::misc::check_msg;
-
-#[command]
-#[only_in(guilds)]
-async fn stop(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
+#[poise::command(prefix_command, slash_command)]
+pub async fn stop(ctx: Context<'_>) -> Result<(), Error> {
+    let guild_id = ctx.guild_id().unwrap();
     
-    let manager = songbird::get(ctx)
+    let manager = songbird::get(&ctx.serenity_context())
         .await
-        .expect("Client placed at init")
+        .expect("Songbird client placed at init")
         .clone();
 
     if let Some(handler_lock) = manager.get(guild_id) {
-        let mut handler = handler_lock.lock().await;
-        let _queue = handler.queue();
+        let handler = handler_lock.lock().await;
+        let queue = handler.queue();
+        queue.stop();
 
-        if let Err(e) = handler.deafen(false).await {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", e))
-                    .await,
-            );
-        }
-
-        check_msg(msg.channel_id.say(&ctx.http, "Playback stopped!").await);
+        ctx.say("Playback stopped!").await?;
     } else {
-        check_msg(
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to undeafen in")
-                .await,
-        );
+        ctx.say("Not in a voice channel!").await?;
     }
     
     Ok(())
-}
+}

src/commands/music/undeafen.rs

@@ -1,38 +0,0 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
-
-use crate::commands::misc::check_msg;
-
-#[command]
-#[only_in(guilds)]
-async fn undeafen(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
-        .await
-        .expect("Client placed at init")
-        .clone();
-
-    if let Some(handler_lock) = manager.get(guild_id) {
-        let mut handler = handler_lock.lock().await;
-        if let Err(e) = handler.deafen(false).await {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", e))
-                    .await,
-            );
-        }
-
-        check_msg(msg.channel_id.say(&ctx.http, "Undeafened").await);
-    } else {
-        check_msg(
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to undeafen in")
-                .await,
-        );
-    }
-
-    Ok(())
-}

src/commands/music/unmute.rs

@@ -1,38 +0,0 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
-
-use crate::commands::misc::check_msg;
-
-#[command]
-#[only_in(guilds)]
-async fn unmute(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
-        .await
-        .expect("Client placed at init")
-        .clone();
-
-    if let Some(handler_lock) = manager.get(guild_id) {
-        let mut handler = handler_lock.lock().await;
-        if let Err(e) = handler.mute(false).await {
-            check_msg(
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", e))
-                    .await,
-            );
-        }
-
-        check_msg(msg.channel_id.say(&ctx.http, "Unmuted").await);
-    } else {
-        check_msg(
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to unmute in")
-                .await,
-        );
-    }
-
-    Ok(())
-}

src/commands/tools/ping.rs

@@ -1,17 +1,16 @@
+use crate::{Context, Error};
 use std::time::SystemTime;
 
-use serenity::{all::Message, client::Context, framework::standard::{macros::command, CommandResult}};
+#[poise::command(prefix_command, slash_command)]
+pub async fn ping(ctx: Context<'_>) -> Result<(), Error> {
+    let system_now = SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap().as_millis() as i64;
 
-use crate::commands::misc::check_msg;
+    let message_now = ctx.created_at().timestamp_millis();
 
-#[command]
-async fn ping(ctx: &Context, msg: &Message) -> CommandResult {
-    let system_now = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_millis() as i64;
-    let message_now = msg.timestamp.timestamp_millis();
-
-    // println!("System Time: {} ||| Message Time: {}", system_now, message_now);
-
-    check_msg(msg.reply(ctx, format!("Pong! (latency: {} ms)", system_now - message_now)).await);
+    let response = format!("Pong! (latency: {} ms)", system_now - message_now);
+    ctx.say(response).await?;
 
     Ok(())
-}
+}

src/http.rs

@@ -0,0 +1,8 @@
+use reqwest::Client as HttpClient;
+use poise::serenity_prelude::prelude::TypeMapKey;
+
+pub struct HttpKey;
+
+impl TypeMapKey for HttpKey {
+    type Value = HttpClient;
+}

src/main.rs

@@ -1,27 +1,18 @@
-use serenity::gateway::ActivityData;
-use serenity::model::prelude::Message;
 use songbird::SerenityInit;
 
+use poise::serenity_prelude::{self as serenity, ActivityData};
+use std::sync::Arc;
+use std::time::Duration;
+use tracing::{info, warn, error};
 use reqwest::Client as HttpClient;
 
-use serenity::client::Context;
-
-use serenity::{
-    async_trait,
-    client::{Client, EventHandler},
-    framework::{
-        standard::{macros::group, macros::hook, Configuration},
-        StandardFramework,
-    },
-    model::gateway::Ready,
-    prelude::GatewayIntents,
-};
-
-use tracing::info;
-
+mod http;
 mod commands;
 
-// music management commands
+// http typemap for handling requests
+use crate::http::HttpKey;
+
+// commands: music
 use crate::commands::music::deafen::*;
 use crate::commands::music::join::*;
 use crate::commands::music::leave::*;
@@ -30,59 +21,134 @@ use crate::commands::music::play::*;
 use crate::commands::music::queue::*;
 use crate::commands::music::skip::*;
 use crate::commands::music::stop::*;
-use crate::commands::music::undeafen::*;
-use crate::commands::music::unmute::*;
+use crate::commands::music::repeat::*;
+use crate::commands::music::pause::*;
+use crate::commands::music::resume::*;
 
-// tools
+// commands: tools
 use crate::commands::tools::ping::*;
 
-// kashi
+// commands: kashi
 use crate::commands::kashi::kashi::*;
 
-struct Handler;
+type Error = Box<dyn std::error::Error + Send + Sync>;
+type Context<'a> = poise::Context<'a, Data, Error>;
 
-#[async_trait]
-impl EventHandler for Handler {
-    async fn ready(&self, ctx: Context, ready: Ready) {
-        info!("{} [{}] connected successfully!", ready.user.name, ready.user.id);
-        let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
-        ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
+pub struct Data;
+
+async fn on_error(error: poise::FrameworkError<'_, Data, Error>) {
+    match error {
+        poise::FrameworkError::Setup { error, .. } => panic!("Failed to start bot {:?}", error),
+        poise::FrameworkError::Command { error, ctx, .. } => {
+            warn!("Error in command `{}`: {:?}", ctx.command().name, error);
+        }
+        error => {
+            if let Err(e) = poise::builtins::on_error(error).await {
+                error!("Error while handling error: {}", e)
+            }
+        }
     }
 }
 
-#[hook]
-async fn before(_: &Context, msg: &Message, command_name: &str) -> bool {
-    info!(
-        "Received command [{}] from user [{}]",
-        command_name, msg.author.name
-    );
-    true
+// this is for debug only
+#[poise::command(prefix_command)]
+pub async fn register(ctx: Context<'_>) -> Result<(), Error> {
+    poise::builtins::register_application_commands_buttons(ctx).await?;
+    Ok(())
 }
 
-#[group]
-#[commands(
-    join, deafen, leave, mute, play, unmute, undeafen, ping, kashi, queue, stop, skip
-)]
-struct General;
-
 #[tokio::main]
 async fn main() {
-    dotenv::dotenv().expect("Failed to load .env file.");
+    // logger and dotenv initialization
     tracing_subscriber::fmt::init();
+    dotenv::dotenv().expect("Failed to load .env file.");
 
-    let token =
-        std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
+    let token = std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
     let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
 
-    let framework = StandardFramework::new().before(before).group(&GENERAL_GROUP);
-    framework.configure(Configuration::new().prefix(prefix));
+    let commands = vec![
+        // commands: music
+        deafen(),
+        join(),
+        leave(),
+        repeat(),
+        mute(),
+        pause(),
+        play(),
+        queue(),
+        resume(),
+        skip(),
+        stop(),
+        // commands: tools
+        ping(),
+        // commands: kashi
+        kashi(),
+        // commands: debug
+        register(),
+    ];
 
-    let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
+    let options = poise::FrameworkOptions {
+        commands,
+        prefix_options: poise::PrefixFrameworkOptions {
+            prefix: Some(prefix.to_string().into()),
+            edit_tracker: Some(Arc::new(poise::EditTracker::for_timespan(
+                Duration::from_secs(3600),
+            ))),
+            additional_prefixes: vec![],
+            ..Default::default()
+        },
 
-    let mut client = Client::builder(&token, intents)
+        on_error: |error| Box::pin(on_error(error)),
+
+        pre_command: |ctx| {
+            Box::pin(async move {
+                info!("Executing command {}...", ctx.command().qualified_name);
+            })
+        },
+
+        post_command: |ctx| {
+            Box::pin(async move {
+                info!("Executed command {}!", ctx.command().qualified_name);
+            })
+        },
+
+        command_check: Some(|ctx| {
+            Box::pin(async move {
+                if ctx.author().id == 123456789 {
+                    return Ok(false);
+                }
+                Ok(true)
+            })
+        }),
+
+        skip_checks_for_owners: false,
+        event_handler: |_ctx, event, _framework, _data| {
+            Box::pin(async move {
+                info!("Got an event in event handler: {:?}", event.snake_case_name());
+                Ok(())
+            })
+        },
+        ..Default::default()
+    };
+
+    let framework = poise::Framework::builder()
+        .setup(move |ctx, ready, _framework| {
+            Box::pin(async move {
+                info!("{} [{}] connected successfully!", ready.user.name, ready.user.id);
+                ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
+                // poise::builtins::register_globally(ctx, &framework.options().commands).await?;
+
+                Ok(Data {})
+            })
+        })
+        .options(options)
+        .build();
+
+    let intents = serenity::GatewayIntents::non_privileged() | serenity::GatewayIntents::MESSAGE_CONTENT;
+
+    let mut client = serenity::ClientBuilder::new(token, intents)
         .framework(framework)
         .register_songbird()
-        .event_handler(Handler)
         .type_map_insert::<HttpKey>(HttpClient::new())
         .await
         .expect("Error creating client");
@@ -91,9 +157,9 @@ async fn main() {
         let _ = client
             .start()
             .await
-            .map_err(|why| println!("Client ended: {:?}", why));
+            .map_err(|why| error!("Client ended: {:?}", why));
     });
 
     let _signal_err = tokio::signal::ctrl_c().await;
-    println!("Recieved Ctrl-C, shutting down.");
+    warn!("Recieved Ctrl-C, shutting down.");
 }