Update linkie-core to 1.0.67

Signed-off-by: shedaniel <[email protected]>
linkie · Apr 7, 2021 · 6159bbf · 6159bbf
1 parent 489560e
commit 6159bbf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,13 +39,13 @@ repositories {
 }
 
 dependencies {
-    compile("me.shedaniel:linkie-core:1.0.66")
-//    compile("com.discord4j:discord4j-core:3.1.3") {
-//        force = true
-//    }
-    compile("com.github.shadorc.discord4j:discord4j-core:217336e") {
+    compile("me.shedaniel:linkie-core:1.0.67")
+    compile("com.discord4j:discord4j-core:3.1.3") {
         force = true
     }
+//    compile("com.github.shadorc.discord4j:discord4j-core:217336e") {
+//        force = true
+//    }
     compile "org.graalvm.js:js-scriptengine:20.2.0"
     compile "org.graalvm.js:js:20.2.0"
     compile "io.ktor:ktor-server-core:$ktor_version"

diff --git a/src/main/kotlin/me/shedaniel/linkie/discord/LinkieBot.kt b/src/main/kotlin/me/shedaniel/linkie/discord/LinkieBot.kt
@@ -120,12 +120,12 @@ fun main() {
             )
         )
     ) {
-        val slashCommands = SlashCommands()
+//        val slashCommands = SlashCommands()
         // register the commands
         registerCommands(CommandHandler)
         registerListeners(ChannelListeners)
-        registerSlashCommands(slashCommands)
-        slashCommands.register()
+//        registerSlashCommands(slashCommands)
+//        slashCommands.register()
 
         event<ReadyEvent> {
             gateway.updatePresence(Presence.online(Activity.watching("cool mappings"))).subscribe()
@@ -233,6 +233,7 @@ fun registerListeners(listeners: ChannelListeners) {
     listeners["modmenu"] = ModMenuVersionListener
 }
 
+/*
 fun registerSlashCommands(commands: SlashCommands) {
     commands.guildCommand(432055962233470986L, "linkie", "Base command for Linkie.") {
         sub("help", "Display the link to Linkie help.").execute { command, cmd, interaction ->
@@ -267,3 +268,4 @@ fun registerSlashCommands(commands: SlashCommands) {
         }
     }
 }
+*/
diff --git a/src/main/kotlin/me/shedaniel/linkie/discord/SlashCommands.kt b/src/main/kotlin/me/shedaniel/linkie/discord/SlashCommands.kt
@@ -16,6 +16,7 @@
 
 package me.shedaniel.linkie.discord
 
+/*
 import com.soywiz.korio.async.runBlockingNoJs
 import discord4j.common.util.Snowflake
 import discord4j.core.`object`.entity.Message
@@ -409,3 +410,4 @@ interface SlashCommandOption : SlashCommandOptionAcceptor {
             get() = 8
     }
 }
+*/
diff --git a/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryCompoundCommand.kt b/src/main/kotlin/me/shedaniel/linkie/discord/commands/QueryCompoundCommand.kt
@@ -97,9 +97,9 @@ class QueryCompoundCommand(private val namespace: Namespace?) : CommandBase {
                 searchKey = searchKey,
             )
             val result: MutableList<ResultHolder<*>> = mutableListOf()
-            var classes: ClassResultSequence? = null
-            var methods: MethodResultSequence? = null
-            var fields: FieldResultSequence? = null
+            var classes: ClassResultList? = null
+            var methods: MethodResultList? = null
+            var fields: FieldResultList? = null
             runBlocking {
                 launch {
                     try {