oupson
/
discord-rusty-bot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/commands/interaction.rs
View File

@ -161,6 +161,7 @@ pub(crate) struct ResponseData {
flags: u64, flags: u64,
} }
#[allow(dead_code)]
impl ResponseData { impl ResponseData {
pub(crate) fn embed<F>(mut self, f: F) -> Self pub(crate) fn embed<F>(mut self, f: F) -> Self
where where

28
src/commands/music.rs
View File

@ -47,16 +47,14 @@ impl songbird::EventHandler for TrackStartNotifier {
{ {
error!("Error sending message: {:?}", why); error!("Error sending message: {:?}", why);
} }
} else { } else if let Err(e) = self
if let Err(e) = self .chan_id
.chan_id .send_message(&self.http, |m| {
.send_message(&self.http, |m| { embed_response(m, "Queue finished", "", None)
embed_response(m, "Queue finished", "", None) })
}) .await
.await {
{ error!("Error sending message: {:?}", e);
error!("Error sending message: {:?}", e);
}
} }
} }
@ -769,7 +767,7 @@ async fn queue(ctx: &Context, msg: &Message) -> CommandResult<()> {
let queue = handler.queue().current_queue(); let queue = handler.queue().current_queue();
if queue.len() > 0 { if !queue.is_empty() {
let mut message = String::from("\x60\x60\x60"); let mut message = String::from("\x60\x60\x60");
let unknown = String::from("unknown"); let unknown = String::from("unknown");
for (i, track) in queue.iter().enumerate() { for (i, track) in queue.iter().enumerate() {
@ -846,7 +844,7 @@ impl From<CommandError> for UseVoiceError {
impl UseVoiceError { impl UseVoiceError {
async fn send_error_message( async fn send_error_message(
self: &Self, &self,
ctx: &Context, ctx: &Context,
channel_id: &ChannelId, channel_id: &ChannelId,
member: Option<&Member>, member: Option<&Member>,
@ -900,12 +898,14 @@ async fn can_use_voice_command(
if bot_channel_id.0 != channel_id.0 { if bot_channel_id.0 != channel_id.0 {
Err(UseVoiceError::NotInSameVoiceChannel) Err(UseVoiceError::NotInSameVoiceChannel)
} else { } else if let Some(member) = &msg.member {
if is_mute(ctx, &msg.member.clone().unwrap(), guild.id).await? { if is_mute(ctx, member, guild.id).await? {
Err(UseVoiceError::NotEnoughPermission) Err(UseVoiceError::NotEnoughPermission)
} else { } else {
Ok(()) Ok(())
} }
} else {
Err(UseVoiceError::Unknown)
} }
} }