code cleanup and play command polish

Cargo.lock

@@ -933,7 +933,7 @@ dependencies = [
 
 [[package]]
 name = "lyra"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "dotenv",
  "openssl",
@@ -2338,6 +2338,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",

Cargo.toml

@@ -1,7 +1,15 @@
 [package]
 name = "lyra"
-version = "0.3.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"
@@ -12,7 +20,7 @@ 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/launch.sh

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

src/commands.rs

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

src/commands/kashi.rs

@@ -0,0 +1,3 @@
+pub mod kashi;
+
+pub use kashi::kashi;

src/commands/kashi/mod.rs

@@ -1 +0,0 @@
-pub mod kashi;

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.rs

@@ -0,0 +1,24 @@
+pub mod deafen;
+pub mod join;
+pub mod leave;
+pub mod misc;
+pub mod mute;
+pub mod pause;
+pub mod play;
+pub mod queue;
+pub mod repeat;
+pub mod resume;
+pub mod skip;
+pub mod stop;
+
+pub use deafen::deafen;
+pub use join::join;
+pub use leave::leave;
+pub use mute::mute;
+pub use pause::pause;
+pub use play::play;
+pub use queue::queue;
+pub use repeat::repeat;
+pub use resume::resume;
+pub use skip::skip;
+pub use stop::stop;

src/commands/music/deafen.rs

@@ -1,24 +1,18 @@
-use serenity::framework::standard::macros::command;
+use crate::{Context, Error};
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
 
-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]
+    let manager = songbird::get(&ctx.serenity_context())
-#[only_in(guilds)]
-async fn deafen(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
         .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(());
         }
@@ -28,24 +22,16 @@ async fn deafen(ctx: &Context, msg: &Message) -> CommandResult {
 
     if handler.is_deaf() {
         if let Err(err) = handler.deafen(false).await {
-            check_msg(
+            ctx.say(format!("Failed: {:?}", err)).await?;
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
         }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Undeafened").await);
+        ctx.say("Undeafened").await?;
     } else {
         if let Err(err) = handler.deafen(true).await {
-            check_msg(
+            ctx.say(format!("Failed: {:?}", err)).await?;
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
         }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Deafened").await);
+        ctx.say("Deafened").await?;
     }
 
     Ok(())

src/commands/music/join.rs

@@ -1,29 +1,23 @@
-use serenity::framework::standard::macros::command;
+use crate::{Context, Error};
-use serenity::framework::standard::CommandResult;
+use songbird::TrackEvent;
-use serenity::model::prelude::*;
+use crate::commands::music::misc::TrackErrorNotifier;
-use serenity::prelude::*;
-use songbird::events::TrackEvent;
 
-use crate::commands::{misc::check_msg, music::misc::TrackErrorNotifier};
+#[poise::command(prefix_command, slash_command)]
-
+pub async fn join(ctx: Context<'_>) -> Result<(), Error> {
-#[command]
+    let guild_id = ctx.guild_id().unwrap();
-#[only_in(guilds)]
+    let channel_id = ctx.guild().unwrap().voice_states.get(&ctx.author().id).and_then(|voice_state| voice_state.channel_id);
-async fn join(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-    let channel_id = msg.guild(&ctx.cache).unwrap().voice_states.get(&msg.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 {
@@ -31,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 crate::{Context, Error};
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
 
-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]
+    let manager = songbird::get(&ctx.serenity_context())
-#[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)
         .await
-        .expect("Client placed in at init")
+        .expect("Songbird client placed at init")
         .clone();
 
-    let has_handler = manager.get(guild_id).is_some();
+    if !manager.get(guild_id).is_some() {
+        ctx.say("Not in a voice channel").await?;
+        return Ok(())
+    }
 
-    if has_handler {
     if let Err(err) = manager.remove(guild_id).await { 
-            check_msg(
+        ctx.say(format!("Failed: {:?}", err)).await?;
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
     }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Left voice channel").await);
+    ctx.say("Left voice channel").await?;
-    } else {
-        check_msg(msg.reply(ctx, "Not in a voice channel").await);
-    }
 
     Ok(())
 }

src/commands/music/loopcurrent.rs

@@ -1,83 +0,0 @@
-use serenity::framework::standard::macros::command;
-use serenity::framework::standard::{Args, CommandResult};
-use serenity::model::prelude::*;
-use serenity::prelude::*;
-use songbird::tracks::LoopState;
-
-use crate::commands::misc::check_msg;
-
-#[command]
-#[aliases(loop)]
-#[only_in(guilds)]
-async fn loopcurrent(ctx: &Context, msg: &Message, mut args: Args) -> 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 handler = handler_lock.lock().await;
-        let queue = handler.queue();
-
-        let track = queue.current().unwrap().get_info().await;
-        let is_looped = track.unwrap().loops;
-
-
-        let count = match args.single::<usize>() {
-            Ok(count) => count,
-            Err(_) => 100,
-        };
-
-        match is_looped {
-            LoopState::Infinite => {
-                let _ = queue.current().unwrap().disable_loop();
-
-                check_msg(
-                    msg.channel_id
-                        .say(
-                            &ctx.http,
-                            format!("Song unlooped."),
-                        )
-                    .await,
-                );
-            }
-            LoopState::Finite(_) => { 
-                if count < 100 {
-                    let _ = queue.current().unwrap().loop_for(count);
-                    check_msg(
-                        msg.channel_id
-                            .say(
-                                &ctx.http,
-                                format!("Song looped forever (a very long time)."),
-                            )
-                        .await,
-                    )
-                }
-                else {
-                    let _ = queue.current().unwrap().enable_loop();
-
-                    check_msg(
-                        msg.channel_id
-                            .say(
-                                &ctx.http,
-                                format!("Song looped {} times.", count),
-                            )
-                        .await,
-                    )
-                }
-
-            }
-        }
-    } else {
-        check_msg(
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to play in")
-            .await,
-        );
-    }
-
-    Ok(())
-}

src/commands/music/mod.rs

@@ -1,12 +0,0 @@
-pub mod deafen;
-pub mod join;
-pub mod leave;
-pub mod misc;
-pub mod mute;
-pub mod play;
-pub mod queue;
-pub mod skip;
-pub mod stop;
-pub mod loopcurrent;
-pub mod pause;
-pub mod resume;

src/commands/music/mute.rs

@@ -1,24 +1,18 @@
-use serenity::framework::standard::macros::command;
+use crate::{Context, Error};
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
 
-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]
+    let manager = songbird::get(&ctx.serenity_context())
-#[only_in(guilds)]
-async fn mute(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
         .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(());
         }
@@ -28,24 +22,16 @@ async fn mute(ctx: &Context, msg: &Message) -> CommandResult {
 
     if handler.is_mute() { 
         if let Err(e) = handler.mute(false).await {
-            check_msg(
+            ctx.say(format!("failed: {:?}", e)).await?;
-                msg.channel_id
-                    .say(&ctx.http, format!("failed: {:?}", e))
-                    .await,
-            );
         }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Unmuted").await);
+        ctx.say("Unmuted").await?;
     } else {
         if let Err(err) = handler.mute(true).await {
-            check_msg(
+            ctx.say(format!("Failed: {:?}", err)).await?;
-                msg.channel_id
-                    .say(&ctx.http, format!("Failed: {:?}", err))
-                    .await,
-            );
         }
 
-        check_msg(msg.channel_id.say(&ctx.http, "Muted").await);
+        ctx.say("Muted").await?;
     }
 
     Ok(())

src/commands/music/pause.rs

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

src/commands/music/play.rs

@@ -1,58 +1,59 @@
-use serenity::framework::standard::macros::command;
+use crate::{Context, Error};
-use serenity::framework::standard::{Args, CommandResult};
+
-use serenity::model::prelude::*;
+use fancy_regex::Regex;
-use serenity::prelude::*;
+use regex::Regex as Regex_Classic;
-use reqwest::Client as HttpClient;
+use std::process::Command;
+use std::time::Duration;
+use poise::CreateReply;
+use poise::serenity_prelude::CreateEmbed;
+use poise::serenity_prelude::Colour;
+use poise::serenity_prelude::model::Timestamp;
+use serenity::builder::CreateEmbedAuthor;
+use serenity::builder::CreateEmbedFooter;
+use songbird::input::AuxMetadata;
 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, 
+    aliases("p", "enqueue")
+)]
+pub async fn play(
+    ctx: Context<'_>, 
+    #[description = "Provide a query or an url"] #[rest] mut song: String,
+) -> Result<(), Error> {
+    let regex_spotify = Regex::new(r"https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-)+)(?:(?=\?)(?:[?&]foo=(\d*)(?=[&#]|$)|(?![?&]foo=)[^#])+)?(?=#|$)").unwrap();
+    let regex_youtube = Regex_Classic::new(r#""url": "(https://www.youtube.com/watch\?v=[A-Za-z0-9]{11})""#).unwrap();
+    let regex_youtube_playlist = Regex::new(r"^((?:https?:)\/\/)?((?:www|m)\.)?((?:youtube\.com)).*(youtu.be\/|list=)([^#&?]*).*").unwrap();   
 
-impl TypeMapKey for HttpKey {
+    let is_playlist = regex_youtube_playlist.is_match(&song).unwrap();
-    type Value = HttpClient;
+    let is_spotify = regex_spotify.is_match(&song).unwrap();
-}
+    let is_query = !song.starts_with("http");
 
-#[command]
+    let guild_id = ctx.guild_id().unwrap();
-#[aliases(p)]
+    let channel_id = ctx.guild().unwrap().voice_states.get(&ctx.author().id).and_then(|voice_state| voice_state.channel_id);
-#[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 is_search = !url.starts_with("http");
-
-    let guild_id = msg.guild_id.unwrap();
-    let channel_id = msg.guild(&ctx.cache).unwrap().voice_states.get(&msg.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 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();
@@ -60,28 +61,100 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
     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 mut src = if is_search {
+        if is_playlist {
-            println!("ytsearch:{}", url);
+            let raw_list = Command::new("yt-dlp")
-            YoutubeDl::new_ytdl_like("yt-dlp", http_client, format!("ytsearch:{}", args.clone().message()))
+                .args(["-j", "--flat-playlist", &song])
-        } else {
+                .output()
-            YoutubeDl::new_ytdl_like("yt-dlp", http_client, url)
+                .expect("failed to execute process")
-        };
+            .stdout;
 
+            let list = String::from_utf8(raw_list.clone()).expect("Invalid UTF-8");
+
+            let urls: Vec<String> = regex_youtube.captures_iter(&list).map(|capture| capture[1].to_string()).collect();
+            
+            let mut sources: Vec<YoutubeDl> = vec![];
+
+            for url in urls {
+                let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client.clone(), url);
+                let _ = handler.enqueue_input(src.clone().into()).await;
+                sources.push(src);
+            }
+
+            let embed = generate_playlist_embed(ctx, sources).await;
+            let response = CreateReply::default().embed(embed.unwrap());
+            ctx.send(response).await?;
+        } else {
+            if is_spotify {
+                let exec = format!("node ./src/spotify --url {}", song);
+                let query = Command::new("sh").arg("-c").arg(exec).output().expect("failed to execute process").stdout;
+                let query_str = String::from_utf8(query.clone()).expect("Invalid UTF-8");
+                song = format!("ytsearch:{}", query_str.to_string());
+
+            }
+
+            if is_query {
+                song = format!("ytsearch:{}", song);
+            }
+
+            let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client, song); 
             let _ = handler.enqueue_input(src.clone().into()).await;
         
-        let metadata = src.aux_metadata().await.unwrap();
+            let embed = generate_embed(ctx, src).await;
-
+            let response = CreateReply::default().embed(embed.unwrap());
-        check_msg(msg.channel_id.say(&ctx.http, format!("Playing song: {}", metadata.title.unwrap())).await);
+            ctx.send(response).await?;
-    } else {
+        }
-        check_msg(
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to play in")
-                .await,
-        );
     }
 
     Ok(())
 }
+
+async fn generate_embed(ctx: Context<'_>, src: YoutubeDl) -> Result<CreateEmbed, Error> {
+    let metadata = src.clone().aux_metadata().await.unwrap();
+    let AuxMetadata {title, thumbnail, source_url, artist, duration, ..} = metadata;
+    let timestamp = Timestamp::now();
+    let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
+    let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
+
+    let embed = CreateEmbed::default()
+        .author(CreateEmbedAuthor::new("Track enqueued").icon_url(ctx.author().clone().face()))
+        .colour(Colour::from_rgb(255, 58, 97))
+        .title(title.unwrap())
+        .url(source_url.unwrap())
+        .thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
+        .field("Artist", artist.unwrap_or("Unknown Artist".to_string()), true)
+        .field("Duration", format!("{:02}:{:02}", duration_minutes, duration_seconds), true)
+        .field("DJ", ctx.author().name.clone(), true)
+        .timestamp(timestamp)
+        .footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
+
+    Ok(embed)
+}
+
+async fn generate_playlist_embed(ctx: Context<'_>, sources: Vec<YoutubeDl>) -> Result<CreateEmbed, Error> {
+    let src = sources.get(0).unwrap();
+    
+    let metadata = src.clone().aux_metadata().await.unwrap();
+    let AuxMetadata {title, thumbnail, source_url, artist, duration, ..} = metadata;
+    let timestamp = Timestamp::now();
+    let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
+    let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
+    
+    let description = format!("Enqueued tracks: {}", sources.len() - 1);
+
+    let embed = CreateEmbed::default()
+        .author(CreateEmbedAuthor::new("Playlist enqueued").icon_url(ctx.author().clone().face()))
+        .colour(Colour::from_rgb(255, 58, 97))
+        .title(title.unwrap())
+        .url(source_url.unwrap())
+        .thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
+        .field("Artist", artist.unwrap_or("Unknown Artist".to_string()), true)
+        .field("Duration", format!("{:02}:{:02}", duration_minutes, duration_seconds), true)
+        .field("DJ", ctx.author().name.clone(), true)
+        .description(description)
+        .timestamp(timestamp)
+        .footer(CreateEmbedFooter::new(ctx.cache().current_user().name.to_string()).icon_url(ctx.cache().current_user().face()));
+
+    Ok(embed)
+}

src/commands/music/queue.rs

@@ -1,18 +1,12 @@
-use serenity::framework::standard::macros::command;
+use crate::{Context, Error};
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
 
-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();
     
-#[command]
+    let manager = songbird::get(&ctx.serenity_context())
-#[only_in(guilds)]
-async fn queue(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-    
-    let manager = songbird::get(ctx)
         .await
-        .expect("Client placed at init")
+        .expect("Songbird client placed at init")
         .clone();
 
     if let Some(handler_lock) = manager.get(guild_id) {
@@ -30,18 +24,10 @@ async fn queue(ctx: &Context, msg: &Message) -> CommandResult {
         ));
         }
         
-        check_msg(
+        ctx.say(queue_res).await?;
-            msg.channel_id
-                .say(&ctx.http, queue_res)
-                .await,
-        );
 
     } else {
-        check_msg(
+        ctx.say("Not in a voice channel!").await?;
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel!")
-                .await,
-        );
     }
 
     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

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

src/commands/music/skip.rs

@@ -1,18 +1,12 @@
-use serenity::framework::standard::macros::command;
+use crate::{Context, Error};
-use serenity::framework::standard::CommandResult;
-use serenity::model::prelude::*;
-use serenity::prelude::*;
 
-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();
 
-#[command]
+    let manager = songbird::get(&ctx.serenity_context())
-#[only_in(guilds)]
-async fn skip(ctx: &Context, msg: &Message) -> CommandResult {
-    let guild_id = msg.guild_id.unwrap();
-
-    let manager = songbird::get(ctx)
         .await
-        .expect("Client placed at init")
+        .expect("Songbird client placed at init")
         .clone();
 
     if let Some(handler_lock) = manager.get(guild_id) {
@@ -20,20 +14,9 @@ async fn skip(ctx: &Context, msg: &Message) -> CommandResult {
         let queue = handler.queue();
         let _ = queue.skip();
 
-        check_msg(
+        ctx.say(format!("Song skipped: {} in queue.", queue.len())).await?;
-            msg.channel_id
-                .say(
-                    &ctx.http,
-                    format!("Song skipped: {} in queue.", queue.len()),
-                )
-                .await,
-        );
     } else {
-        check_msg(
+        ctx.say("Not in a voice channel to play in").await?;
-            msg.channel_id
-                .say(&ctx.http, "Not in a voice channel to play in")
-                .await,
-        );
     }
 
     Ok(())

src/commands/music/stop.rs

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

src/commands/tools.rs

@@ -0,0 +1,5 @@
+pub mod ping;
+pub mod register;
+
+pub use ping::ping;
+pub use register::register;

src/commands/tools/mod.rs

@@ -1 +0,0 @@
-pub mod ping;

src/commands/tools/register.rs

@@ -0,0 +1,12 @@
+use crate::{Context, Error};
+
+#[poise::command(prefix_command, check = "check")]
+pub async fn register(ctx: Context<'_>) -> Result<(), Error> {
+    poise::builtins::register_application_commands_buttons(ctx).await?;
+    Ok(())
+}
+
+async fn check(ctx: Context<'_>) -> Result<bool, Error> {
+    let owner = std::env::var("OWNER_ID").expect("Environment variable `OWNER_ID` not found");
+    Ok(ctx.author().id.to_string() == owner)
+}

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

@@ -4,9 +4,14 @@ 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;
 
+mod http;
 mod commands;
 
+// http typemap for handling requests
+use crate::http::HttpKey;
+
 // commands: music
 use crate::commands::music::deafen::*;
 use crate::commands::music::join::*;
@@ -16,7 +21,7 @@ use crate::commands::music::play::*;
 use crate::commands::music::queue::*;
 use crate::commands::music::skip::*;
 use crate::commands::music::stop::*;
-use crate::commands::music::loopcurrent::*;
+use crate::commands::music::repeat::*;
 use crate::commands::music::pause::*;
 use crate::commands::music::resume::*;
 
@@ -66,7 +71,7 @@ async fn main() {
         deafen(),
         join(),
         leave(),
-        loopcurrent(),
+        repeat(),
         mute(),
         pause(),
         play(),
@@ -144,6 +149,7 @@ async fn main() {
     let mut client = serenity::ClientBuilder::new(token, intents)
         .framework(framework)
         .register_songbird()
+        .type_map_insert::<HttpKey>(HttpClient::new())
         .await
         .expect("Error creating client");