aboutsummaryrefslogtreecommitdiff
path: root/src/framework
diff options
context:
space:
mode:
authorLakelezz <[email protected]>2018-08-31 19:24:34 +0200
committerGitHub <[email protected]>2018-08-31 19:24:34 +0200
commit19c65bd27f27192cc9a8a04c1d38ec08b62652c8 (patch)
tree5c3e449ddc5c6165a5499cd53b01ecad1e4517a0 /src/framework
parentRefactor Help (#375) (diff)
downloadserenity-19c65bd27f27192cc9a8a04c1d38ec08b62652c8.tar.xz
serenity-19c65bd27f27192cc9a8a04c1d38ec08b62652c8.zip
Fix `has_correct_permissions` when no guild is available (#376)
Diffstat (limited to 'src/framework')
-rw-r--r--src/framework/standard/mod.rs10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index 9f5b9a9..e1a1fb1 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -1199,18 +1199,22 @@ impl Framework for StandardFramework {
self.user_id = user_id.0;
}
}
+
#[cfg(feature = "cache")]
pub fn has_correct_permissions(command: &Arc<CommandOptions>, message: &Message) -> bool {
if !command.required_permissions.is_empty() {
+
if let Some(guild) = message.guild() {
let perms = guild
.with(|g| g.permissions_in(message.channel_id, message.author.id));
- return perms.contains(command.required_permissions);
+ perms.contains(command.required_permissions)
+ } else {
+ false
}
+ } else {
+ true
}
-
- true
}
pub fn has_correct_roles(cmd: &Arc<CommandOptions>, guild: &Guild, member: &Member) -> bool {