Fixup permission checks

MrLotU · Jun 21, 2020 · b194b4d · b194b4d
1 parent 6639d0a
commit b194b4d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Sources/SwiftHooks/Commands/Command+Permissions.swift b/Sources/SwiftHooks/Commands/Command+Permissions.swift
@@ -32,6 +32,10 @@ public struct IDChecker: CommandPermissionChecker {
     /// List of whitelisted IDs
     let ids: [String]
 
+    public init(_ ids: String...) {
+        self.ids = ids
+    }
+
     public func check(_ user: Userable, canUse command: _ExecutableCommand, on event: CommandEvent) -> Bool {
         guard let id = user.identifier else { return false }
         return ids.contains(id)

diff --git a/Sources/SwiftHooks/Commands/SwiftHooks+Commands.swift b/Sources/SwiftHooks/Commands/SwiftHooks+Commands.swift
@@ -22,13 +22,18 @@ extension SwiftHooks {
         foundCommands.forEach { (command) in
             guard command.hookWhitelist.isEmpty || command.hookWhitelist.contains(h.id) else { return }
             let event = CommandEvent(hooks: self, cmd: command, msg: message, prefix: prefix, for: h, on: eventLoop)
+            guard command.permissionChecks.map({ check in
+                check.check(message.gAuthor, canUse: command, on: event)
+            }).allSatisfy({ bool in bool }) else {
+                return event.message.error(CommandError.InvalidPermissions, on: command)
+            }
 
             event.logger.debug("Invoking command")
             event.logger.trace("Full message: \(message.content)")
             let timer = Timer(label: "command_duration", dimensions: [("command", command.fullTrigger)])
             let start = DispatchTime.now().uptimeNanoseconds
             command.invoke(on: event)
-                .flatMapErrorThrowing({ (e)  in
+                .flatMapErrorThrowing({ (e) in
                     event.message.error(e, on: command)
                     throw e
                 })

diff --git a/Sources/SwiftHooks/Types/Messagable.swift b/Sources/SwiftHooks/Types/Messagable.swift
@@ -52,7 +52,7 @@ public extension Messageable {
         case CommandError.ArgumentNotFound(let arg):
             self.reply("Missing argument: \(arg)\nUsage: \(command.help)")
         case CommandError.InvalidPermissions:
-           self.reply("Invalid permissions!\nUsage: \(command.help)")
+           self.reply("Invalid permissions!")
         case CommandError.UnableToConvertArgument(let arg, let type):
            self.reply("Error converting \(arg) to \(type)\nUsage: \(command.help)")
         default: