aboutsummaryrefslogtreecommitdiff
path: root/src/ext/framework
diff options
context:
space:
mode:
authorIllia <[email protected]>2016-12-16 18:51:38 +0300
committerzeyla <[email protected]>2016-12-16 07:51:38 -0800
commit635528875c59d34f0d7b2f2b0a3bd61d762f0e9c (patch)
tree2d0215a9f32ad3a18cfeda633ca01f259b8e6c0f /src/ext/framework
parentCleanup YAML definition layouts (diff)
downloadserenity-635528875c59d34f0d7b2f2b0a3bd61d762f0e9c.tar.xz
serenity-635528875c59d34f0d7b2f2b0a3bd61d762f0e9c.zip
Fix framework owners_only check
Diffstat (limited to 'src/ext/framework')
-rw-r--r--src/ext/framework/mod.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ext/framework/mod.rs b/src/ext/framework/mod.rs
index e08140d..085bf2c 100644
--- a/src/ext/framework/mod.rs
+++ b/src/ext/framework/mod.rs
@@ -324,6 +324,14 @@ impl Framework {
let is_owner = self.configuration.owners.contains(&message.author.id);
// Most of the checks don't apply to owners.
if !is_owner {
+ if command.owners_only {
+ if let Some(ref message) = self.configuration.invalid_permission_message {
+ let _ = context.say(message);
+ }
+
+ return;
+ }
+
if !self.configuration.allow_dm {
if let Some(ref message) = self.configuration.no_dm_message {
let _ = context.say(message);
@@ -415,12 +423,6 @@ impl Framework {
continue 'outer;
}
}
- } else if command.owners_only {
- if let Some(ref message) = self.configuration.invalid_permission_message {
- let _ = context.say(message);
- }
-
- return;
}
let before = self.before.clone();