Add remove_song command

Signed-off-by: trivernis <trivernis@protonmail.com>

src/commands/music/mod.rs

@@ -28,6 +28,7 @@ use play::PLAY_COMMAND;
 use play_next::PLAY_NEXT_COMMAND;
 use playlists::PLAYLISTS_COMMAND;
 use queue::QUEUE_COMMAND;
+use remove_song::REMOVE_SONG_COMMAND;
 use save_playlist::SAVE_PLAYLIST_COMMAND;
 use shuffle::SHUFFLE_COMMAND;
 use skip::SKIP_COMMAND;
@@ -50,6 +51,7 @@ mod play;
 mod play_next;
 mod playlists;
 mod queue;
+mod remove_song;
 mod save_playlist;
 mod shuffle;
 mod skip;
@@ -69,7 +71,8 @@ mod skip;
     save_playlist,
     playlists,
     lyrics,
-    move_song
+    move_song,
+    remove_song
 )]
 pub struct Music;
 

src/commands/music/move_song.rs

@@ -24,9 +24,11 @@ async fn move_song(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul
         msg.channel_id.say(ctx, "Requires DJ permissions").await?;
         return Ok(());
     }
-    let queue = get_queue_for_guild(ctx, &guild.id).await?;
-    let mut queue_lock = queue.lock().await;
-    queue_lock.move_position(pos1, pos2);
+    {
+        let queue = get_queue_for_guild(ctx, &guild.id).await?;
+        let mut queue_lock = queue.lock().await;
+        queue_lock.move_position(pos1, pos2);
+    }
     msg.channel_id
         .say(
             ctx,

src/commands/music/remove_song.rs

@@ -0,0 +1,37 @@
+use crate::commands::music::{get_queue_for_guild, is_dj};
+use serenity::client::Context;
+use serenity::framework::standard::macros::command;
+use serenity::framework::standard::{Args, CommandResult};
+use serenity::model::channel::Message;
+
+#[command]
+#[description("Removes a song from the queue")]
+#[usage("<pos>")]
+#[example("102")]
+#[min_args(1)]
+#[max_args(1)]
+#[bucket("general")]
+#[only_in(guilds)]
+#[aliases("rms", "removesong", "remove-song")]
+async fn remove_song(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
+    let guild = msg.guild(&ctx.cache).await.unwrap();
+    log::debug!("Moving song for guild {}", guild.id);
+
+    let pos = args.single::<usize>()?;
+
+    if !is_dj(ctx, guild.id, &msg.author).await? {
+        msg.channel_id.say(ctx, "Requires DJ permissions").await?;
+        return Ok(());
+    }
+    {
+        let queue = get_queue_for_guild(ctx, &guild.id).await?;
+        let mut queue_lock = queue.lock().await;
+        queue_lock.remove(pos);
+    }
+
+    msg.channel_id
+        .say(ctx, format!("Removed Song at `{}`", pos))
+        .await?;
+
+    Ok(())
+}