Upgrade to KUtils 0.11.0

Author: JakeJMattson

README.md

@@ -3,7 +3,7 @@
     <img src="https://img.shields.io/badge/Kotlin-1.3.50-blue.svg" alt="Kotlin 1.3.50">
   </a>
   <a href="https://gitlab.com/Aberrantfox/KUtils">
-    <img src="https://img.shields.io/badge/KUtils-0.10.1-blue.svg" alt="KUtils 0.10.1">
+    <img src="https://img.shields.io/badge/KUtils-0.11.0-blue.svg" alt="KUtils 0.11.0">
   </a>
   <a href="https://GitHub.com/JakeJMattson/EmbedBot/releases/">
     <img src="https://img.shields.io/github/release/JakeJMattson/EmbedBot.svg" alt="Release">

commands.md

@@ -84,11 +84,10 @@
 | ListEmbeds | <none>    | List all embeds created in this guild.  |
 
 ## Utility
-| Commands     | Arguments | Description                                 |
-| ------------ | --------- | ------------------------------------------- |
-| BotInfo      | <none>    | Display the bot information.                |
-| ListCommands | <none>    | List all available commands.                |
-| Ping         | <none>    | Display the network ping of the bot.        |
-| Uptime       | <none>    | Displays how long the bot has been running. |
-| help         | (Word)    | Display a help menu                         |
+| Commands | Arguments | Description                                 |
+| -------- | --------- | ------------------------------------------- |
+| BotInfo  | <none>    | Display the bot information.                |
+| Help     | (Command) | Display a help menu.                        |
+| Ping     | <none>    | Display the network ping of the bot.        |
+| Uptime   | <none>    | Displays how long the bot has been running. |
 

pom.xml

@@ -20,7 +20,9 @@
         <!-- Version Numbers -->
         <jvm.target>1.8</jvm.target>
         <kotlin.version>1.3.50</kotlin.version>
-        <kutils.version>0.10.1</kutils.version>
+        <coroutines.version>1.3.1</coroutines.version>
+        <kutils.version>0.11.0</kutils.version>
+        <assembly.plugin.version>3.1.1</assembly.plugin.version>
     </properties>
 
     <repositories>
@@ -44,7 +46,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-coroutines-core</artifactId>
-            <version>1.3.0-RC2</version>
+            <version>${coroutines.version}</version>
         </dependency>
 
         <!-- KUtils -->
@@ -89,7 +91,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${assembly.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>make-assembly</id>

src/main/kotlin/io/github/jakejmattson/embedbot/MainApp.kt

@@ -4,18 +4,14 @@ import io.github.jakejmattson.embedbot.locale.messages
 import me.aberrantfox.kjdautils.api.startBot
 
 fun main(args: Array<String>) {
-    val token = args.firstOrNull()
-            ?: throw IllegalArgumentException(messages.errors.NO_ARGS)
+    val token = args.firstOrNull() ?: throw IllegalArgumentException(messages.errors.NO_ARGS)
 
     startBot(token) {
         configure {
             globalPath = "io.github.jakejmattson.embedbot"
             reactToCommands = false
             documentationSortOrder = arrayListOf("BotConfiguration", "GuildConfiguration", "Core", "Copy", "Field",
                 "Cluster", "Edit", "Information", "Utility")
-
-            //Move the help command from the internal "utility" category, to the local "Utility" category
-            container.commands.getValue("help").category = "Utility"
         }
     }
 }

src/main/kotlin/io/github/jakejmattson/embedbot/commands/BotConfigurationCommands.kt

@@ -1,7 +1,7 @@
 package io.github.jakejmattson.embedbot.commands
 
 import io.github.jakejmattson.embedbot.dataclasses.Configuration
-import io.github.jakejmattson.embedbot.extensions.*
+import io.github.jakejmattson.embedbot.extensions.requiredPermissionLevel
 import io.github.jakejmattson.embedbot.locale.messages
 import io.github.jakejmattson.embedbot.services.*
 import me.aberrantfox.kjdautils.api.dsl.*

src/main/kotlin/io/github/jakejmattson/embedbot/commands/GuildConfigurationCommands.kt

@@ -1,7 +1,7 @@
 package io.github.jakejmattson.embedbot.commands
 
 import io.github.jakejmattson.embedbot.dataclasses.*
-import io.github.jakejmattson.embedbot.extensions.*
+import io.github.jakejmattson.embedbot.extensions.requiredPermissionLevel
 import io.github.jakejmattson.embedbot.locale.messages
 import io.github.jakejmattson.embedbot.services.*
 import me.aberrantfox.kjdautils.api.dsl.*

src/main/kotlin/io/github/jakejmattson/embedbot/commands/UtilityCommands.kt

@@ -4,7 +4,6 @@ import io.github.jakejmattson.embedbot.extensions.*
 import io.github.jakejmattson.embedbot.locale.messages
 import io.github.jakejmattson.embedbot.services.*
 import me.aberrantfox.kjdautils.api.dsl.*
-import me.aberrantfox.kjdautils.extensions.jda.toMember
 import java.util.Date
 
 private val startTime = Date()
@@ -41,24 +40,4 @@ fun utilityCommands(infoService: InfoService, permissionsService: PermissionsSer
             }
         }
     }
-
-    command("ListCommands") {
-        description = messages.descriptions.LIST_COMMANDS
-        execute { event ->
-            val member = event.author.toMember(event.guild!!)!!
-
-            val commands = event.container.commands.values.asSequence()
-                .filter { permissionsService.hasClearance(member, it.requiredPermissionLevel) }
-                .groupBy { it.category }.toList()
-                .filter { it.second.isNotEmpty() }
-                .sortedBy { (_, value) -> -value.size }
-                .toList().toMap()
-
-            event.respondEmbed {
-                commands.forEach { entry ->
-                    addInlineField(entry.key, entry.value.sortedBy { it.name }.joinToString("\n") { it.name })
-                }
-            }
-        }
-    }
 }

src/main/kotlin/io/github/jakejmattson/embedbot/services/PermissionsService.kt

@@ -1,8 +1,12 @@
 package io.github.jakejmattson.embedbot.services
 
 import io.github.jakejmattson.embedbot.dataclasses.Configuration
+import io.github.jakejmattson.embedbot.extensions.requiredPermissionLevel
 import me.aberrantfox.kjdautils.api.annotation.Service
-import net.dv8tion.jda.api.entities.Member
+import me.aberrantfox.kjdautils.api.dsl.Command
+import me.aberrantfox.kjdautils.discord.Discord
+import me.aberrantfox.kjdautils.extensions.jda.toMember
+import net.dv8tion.jda.api.entities.*
 
 enum class Permission {
     BOT_OWNER,
@@ -14,7 +18,20 @@ enum class Permission {
 val DEFAULT_REQUIRED_PERMISSION = Permission.STAFF
 
 @Service
-class PermissionsService(private val configuration: Configuration) {
+class PermissionsService(private val configuration: Configuration, discord: Discord) {
+    init {
+        discord.configuration.visibilityPredicate = { command: Command, user: User, _: MessageChannel, guild: Guild? ->
+            if (guild != null) {
+                val member = user.toMember(guild)!!
+                val permission = command.requiredPermissionLevel
+
+                hasClearance(member, permission)
+            }
+            else {
+                false
+            }
+        }
+    }
 
     fun hasClearance(member: Member, requiredPermissionLevel: Permission) = member.getPermissionLevel().ordinal <= requiredPermissionLevel.ordinal