diff options
| author | Lakelezz <[email protected]> | 2018-03-15 23:03:56 +0100 |
|---|---|---|
| committer | alex <[email protected]> | 2018-03-15 23:03:56 +0100 |
| commit | 02dc5064d9402f73ef514c9b8ffa318f5d4235ff (patch) | |
| tree | 696b9746abfb532d689ccaadfecea2aefe53d7c9 /src/framework/standard/mod.rs | |
| parent | Add a basic CONTRIBUTING.md (diff) | |
| download | serenity-02dc5064d9402f73ef514c9b8ffa318f5d4235ff.tar.xz serenity-02dc5064d9402f73ef514c9b8ffa318f5d4235ff.zip | |
Fix no-cache standardframework compilation (#290)
Diffstat (limited to 'src/framework/standard/mod.rs')
| -rw-r--r-- | src/framework/standard/mod.rs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs index 0593911..83b284d 100644 --- a/src/framework/standard/mod.rs +++ b/src/framework/standard/mod.rs @@ -567,15 +567,19 @@ impl StandardFramework { } else if self.configuration.disabled_commands.contains(built) { Some(DispatchError::CommandDisabled(built.to_string())) } else { - if !command.allowed_roles.is_empty() { - if let Some(guild) = message.guild() { - let guild = guild.read(); - - if let Some(member) = guild.members.get(&message.author.id) { - if let Ok(permissions) = member.permissions() { - if !permissions.administrator() - && !has_correct_roles(command, &guild, member) { - return Some(DispatchError::LackingRole); + + #[cfg(feature = "cache")] { + if !command.allowed_roles.is_empty() { + if let Some(guild) = message.guild() { + let guild = guild.read(); + + if let Some(member) = guild.members.get(&message.author.id) { + if let Ok(permissions) = member.permissions() { + + if !permissions.administrator() + && !has_correct_roles(command, &guild, member) { + return Some(DispatchError::LackingRole); + } } } } @@ -1091,7 +1095,6 @@ 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() { @@ -1106,7 +1109,6 @@ pub fn has_correct_permissions(command: &Arc<CommandOptions>, message: &Message) true } -#[cfg(feature = "cache")] pub fn has_correct_roles(cmd: &Arc<CommandOptions>, guild: &Guild, member: &Member) -> bool { if cmd.allowed_roles.is_empty() { true |