From 1abb492dff784f9b7826dfd07898117f50c8a152 Mon Sep 17 00:00:00 2001
From: Oupson <oupson1er@gmail.com>
Date: Fri, 16 Apr 2021 21:53:44 +0200
Subject: [PATCH] Few improvements

---
 src/commands/interaction.rs |  1 +
 src/commands/music.rs       | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/commands/interaction.rs b/src/commands/interaction.rs
index d2a52ff..efc87a9 100644
--- a/src/commands/interaction.rs
+++ b/src/commands/interaction.rs
@@ -161,6 +161,7 @@ pub(crate) struct ResponseData {
     flags: u64,
 }
 
+#[allow(dead_code)]
 impl ResponseData {
     pub(crate) fn embed<F>(mut self, f: F) -> Self
     where
diff --git a/src/commands/music.rs b/src/commands/music.rs
index ac37228..3907e51 100644
--- a/src/commands/music.rs
+++ b/src/commands/music.rs
@@ -47,16 +47,14 @@ impl songbird::EventHandler for TrackStartNotifier {
                 {
                     error!("Error sending message: {:?}", why);
                 }
-            } else {
-                if let Err(e) = self
-                    .chan_id
-                    .send_message(&self.http, |m| {
-                        embed_response(m, "Queue finished", "", None)
-                    })
-                    .await
-                {
-                    error!("Error sending message: {:?}", e);
-                }
+            } else if let Err(e) = self
+                .chan_id
+                .send_message(&self.http, |m| {
+                    embed_response(m, "Queue finished", "", None)
+                })
+                .await
+            {
+                error!("Error sending message: {:?}", e);
             }
         }
 
@@ -769,7 +767,7 @@ async fn queue(ctx: &Context, msg: &Message) -> CommandResult<()> {
 
         let queue = handler.queue().current_queue();
 
-        if queue.len() > 0 {
+        if !queue.is_empty() {
             let mut message = String::from("\x60\x60\x60");
             let unknown = String::from("unknown");
             for (i, track) in queue.iter().enumerate() {
@@ -846,7 +844,7 @@ impl From<CommandError> for UseVoiceError {
 
 impl UseVoiceError {
     async fn send_error_message(
-        self: &Self,
+        &self,
         ctx: &Context,
         channel_id: &ChannelId,
         member: Option<&Member>,
@@ -900,12 +898,14 @@ async fn can_use_voice_command(
 
     if bot_channel_id.0 != channel_id.0 {
         Err(UseVoiceError::NotInSameVoiceChannel)
-    } else {
-        if is_mute(ctx, &msg.member.clone().unwrap(), guild.id).await? {
+    } else if let Some(member) = &msg.member {
+        if is_mute(ctx, member, guild.id).await? {
             Err(UseVoiceError::NotEnoughPermission)
         } else {
             Ok(())
         }
+    } else {
+        Err(UseVoiceError::Unknown)
     }
 }