diff options
| author | acdenisSK <[email protected]> | 2017-10-06 20:32:43 +0200 |
|---|---|---|
| committer | acdenisSK <[email protected]> | 2017-10-06 20:32:43 +0200 |
| commit | cfcc31f1db92827a29f9347e79262edf7aceb962 (patch) | |
| tree | f7ff38ea37c79b72517fcb3a333752089f529541 /src/framework | |
| parent | Fix a typo (diff) | |
| download | serenity-cfcc31f1db92827a29f9347e79262edf7aceb962.tar.xz serenity-cfcc31f1db92827a29f9347e79262edf7aceb962.zip | |
Make `has_correct_permissions` a free-standing function
Diffstat (limited to 'src/framework')
| -rw-r--r-- | src/framework/standard/mod.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs index 6f7a7ee..601c118 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, )); @@ -959,3 +945,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 |