3.0.5: Check permissions for slash commands too.

Author: devoxin

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'me.devoxin'
-version '3.0.4'
+version '3.0.5'
 
 repositories {
     maven {

src/main/kotlin/me/devoxin/flight/api/CommandClient.kt

@@ -224,24 +224,21 @@ class CommandClient(
         }
 
         if (ctx.isFromGuild) {
-            if (ctx is MessageContext) {
-                if (props.userPermissions.isNotEmpty()) {
-                    val userCheck =
-                        props.userPermissions.filterNot { ctx.member!!.hasPermission(ctx.guildChannel!!, it) }
-
-                    if (userCheck.isNotEmpty()) {
-                        dispatchSafely { it.onUserMissingPermissions(ctx.asMessageContext!!, cmd, userCheck) }
-                        return false
-                    }
+            if (props.userPermissions.isNotEmpty()) {
+                val userCheck = props.userPermissions.filterNot { ctx.member!!.hasPermission(ctx.guildChannel!!, it) }
+
+                if (userCheck.isNotEmpty()) {
+                    dispatchSafely { it.onUserMissingPermissions(ctx, cmd, userCheck) }
+                    return false
                 }
+            }
 
-                if (props.botPermissions.isNotEmpty()) {
-                    val botCheck = props.botPermissions.filterNot { ctx.guild!!.selfMember.hasPermission(ctx.guildChannel!!, it) }
+            if (props.botPermissions.isNotEmpty()) {
+                val botCheck = props.botPermissions.filterNot { ctx.guild!!.selfMember.hasPermission(ctx.guildChannel!!, it) }
 
-                    if (botCheck.isNotEmpty()) {
-                        dispatchSafely { it.onBotMissingPermissions(ctx.asMessageContext!!, cmd, botCheck) }
-                        return false
-                    }
+                if (botCheck.isNotEmpty()) {
+                    dispatchSafely { it.onBotMissingPermissions(ctx, cmd, botCheck) }
+                    return false
                 }
             }
 

src/main/kotlin/me/devoxin/flight/api/hooks/CommandEventAdapter.kt

@@ -81,10 +81,10 @@ interface CommandEventAdapter {
     /**
      * Invoked when a user lacks permissions to execute a command
      */
-    fun onUserMissingPermissions(ctx: MessageContext, command: CommandFunction, permissions: List<Permission>)
+    fun onUserMissingPermissions(ctx: Context, command: CommandFunction, permissions: List<Permission>)
 
     /**
      * Invoked when the bot lacks permissions to execute a command
      */
-    fun onBotMissingPermissions(ctx: MessageContext, command: CommandFunction, permissions: List<Permission>)
+    fun onBotMissingPermissions(ctx: Context, command: CommandFunction, permissions: List<Permission>)
 }

src/main/kotlin/me/devoxin/flight/api/hooks/DefaultCommandEventAdapter.kt

@@ -9,8 +9,7 @@ import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 
 open class DefaultCommandEventAdapter : CommandEventAdapter {
-    override fun onCheckFailed(ctx: Context, command: CommandFunction, checkType: CheckType) {
-    }
+    override fun onCheckFailed(ctx: Context, command: CommandFunction, checkType: CheckType) = Unit
 
     override fun onBadArgument(ctx: Context, command: CommandFunction, error: BadArgument) {
         error.printStackTrace()
@@ -20,7 +19,7 @@ open class DefaultCommandEventAdapter : CommandEventAdapter {
         error.printStackTrace()
     }
 
-    override fun onCommandPostInvoke(ctx: Context, command: CommandFunction, failed: Boolean) {}
+    override fun onCommandPostInvoke(ctx: Context, command: CommandFunction, failed: Boolean) = Unit
 
     override fun onCommandPreInvoke(ctx: Context, command: CommandFunction) = true
 
@@ -32,12 +31,11 @@ open class DefaultCommandEventAdapter : CommandEventAdapter {
         error.printStackTrace()
     }
 
-    override fun onCommandCooldown(ctx: Context, command: CommandFunction, cooldown: Long) {}
+    override fun onCommandCooldown(ctx: Context, command: CommandFunction, cooldown: Long) = Unit
 
-    override fun onBotMissingPermissions(ctx: MessageContext, command: CommandFunction, permissions: List<Permission>) {}
+    override fun onBotMissingPermissions(ctx: Context, command: CommandFunction, permissions: List<Permission>) = Unit
 
-    override fun onUserMissingPermissions(ctx: MessageContext, command: CommandFunction, permissions: List<Permission>) {}
+    override fun onUserMissingPermissions(ctx: Context, command: CommandFunction, permissions: List<Permission>) = Unit
 
-    override fun onUnknownCommand(event: MessageReceivedEvent, command: String, args: List<String>) {
-    }
+    override fun onUnknownCommand(event: MessageReceivedEvent, command: String, args: List<String>) = Unit
 }