jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

cleared up more clippy issues

Browse Source
This commit is contained in:
jude
2020-09-25 23:07:22 +01:00
parent e515589879
commit f13853d445
5 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/framework.rs
View File

@@ -294,10 +294,8 @@ impl Framework for RegexFramework {
// gate to prevent analysing messages unnecessarily
if (msg.author.bot && self.ignore_bots) ||
msg.tts ||
msg.content.len() == 0 ||
msg.attachments.len() > 0 {
return
}
msg.content.is_empty() ||
!msg.attachments.is_empty() {}
// Guild Command
else if let (Some(guild), Some(Channel::Guild(channel))) = (msg.guild(&ctx).await, msg.channel(&ctx).await) {
@@ -349,16 +347,14 @@ impl Framework for RegexFramework {
}
// DM Command
else {
if let Some(full_match) = self.dm_regex_matcher.captures(&msg.content[..]) {
let command = self.commands.get(full_match.name("cmd").unwrap().as_str()).unwrap();
let args = full_match.name("args")
.map(|m| m.as_str())
.unwrap_or("")
.to_string();
else if let Some(full_match) = self.dm_regex_matcher.captures(&msg.content[..]) {
let command = self.commands.get(full_match.name("cmd").unwrap().as_str()).unwrap();
let args = full_match.name("args")
.map(|m| m.as_str())
.unwrap_or("")
.to_string();
(command.func)(&ctx, &msg, args).await.unwrap();
}
(command.func)(&ctx, &msg, args).await.unwrap();
}
}
}