Few improvements

This commit is contained in:
Oupson 2021-04-16 21:53:44 +02:00
parent 0866590130
commit 1abb492dff
2 changed files with 15 additions and 14 deletions

View File

@ -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

View File

@ -47,8 +47,7 @@ impl songbird::EventHandler for TrackStartNotifier {
{
error!("Error sending message: {:?}", why);
}
} else {
if let Err(e) = self
} else if let Err(e) = self
.chan_id
.send_message(&self.http, |m| {
embed_response(m, "Queue finished", "", None)
@ -58,7 +57,6 @@ impl songbird::EventHandler for TrackStartNotifier {
error!("Error sending message: {:?}", e);
}
}
}
None
}
@ -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)
}
}