aboutsummaryrefslogtreecommitdiff
path: root/src/framework/standard
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-10-06 20:32:43 +0200
committerZeyla Hellyer <[email protected]>2017-10-09 15:48:18 -0700
commitb9bb69c9090326bf04aa5a93041d99946b66f946 (patch)
tree412d50db9ab9b836e8efaa8ee8c4d58e0ff7aeeb /src/framework/standard
parentFix a typo (diff)
downloadserenity-b9bb69c9090326bf04aa5a93041d99946b66f946.tar.xz
serenity-b9bb69c9090326bf04aa5a93041d99946b66f946.zip
Make `has_correct_permissions` a free-standing function
Diffstat (limited to 'src/framework/standard')
-rw-r--r--src/framework/standard/mod.rs30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index a441856..6052741 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -416,20 +416,6 @@ impl StandardFramework {
false
}
- #[cfg(feature = "cache")]
- fn has_correct_permissions(&self, command: &Arc<Command>, message: &Message) -> bool {
- if !command.required_permissions.is_empty() {
- if let Some(guild) = message.guild() {
- let perms = guild
- .with(|g| g.permissions_for(message.channel_id, message.author.id));
-
- return perms.contains(command.required_permissions);
- }
- }
-
- true
- }
-
#[allow(too_many_arguments)]
fn should_fail(&mut self,
mut context: &mut Context,
@@ -495,7 +481,7 @@ impl StandardFramework {
return Some(DispatchError::BlockedGuild);
}
- if !self.has_correct_permissions(command, message) {
+ if !has_correct_permissions(command, message) {
return Some(DispatchError::LackOfPermissions(
command.required_permissions,
));
@@ -951,3 +937,17 @@ impl Framework for StandardFramework {
self.user_info = (user_id.0, is_bot);
}
}
+
+#[cfg(feature = "cache")]
+pub(crate) fn has_correct_permissions(command: &Arc<Command>, message: &Message) -> bool {
+ if !command.required_permissions.is_empty() {
+ if let Some(guild) = message.guild() {
+ let perms = guild
+ .with(|g| g.permissions_for(message.channel_id, message.author.id));
+
+ return perms.contains(command.required_permissions);
+ }
+ }
+
+ true
+} \ No newline at end of file