feat: add choices

README.md

@@ -6,7 +6,7 @@
 - [Github](https://github.com/devproje/px32-bot.git)
 
 ## How to Use
-봇 구동기는 [이곳](https://gitlab.wh64.net/devproje/px32-bot/-/releases)에서 다운로드 받으실 수 있습니다.
+봇 구동기는 [이곳](https://github.com/devproje/px32-bot/releases)에서 다운로드 받으실 수 있습니다.
 
 ## Developments
 API를 사용하여 플러그인 개발을 원하신다면 아래의 코드로 라이브러리를 추가 해 주세요.

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
 
 group=net.projecttl
-version=1.0.0-beta.1
+version=1.0.0-beta.3
 
 ktor_version=2.3.12
 log4j_version=2.23.1

px32-bot-api/src/main/kotlin/net/projecttl/p/x32/api/command/CommandObj.kt

@@ -1,5 +1,6 @@
 package net.projecttl.p.x32.api.command
 
+import net.dv8tion.jda.api.interactions.commands.Command
 import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.CommandData
 import net.dv8tion.jda.api.interactions.commands.build.OptionData
@@ -122,7 +123,13 @@ class OptionObj {
 	var required: Boolean = false
 	var autoComplete: Boolean = false
 
+	var choices = mutableListOf<Command.Choice>()
+
 	fun build(): OptionData {
-		return OptionData(type, name, description, required, autoComplete)
+		return OptionData(type, name, description, required, autoComplete).apply {
+			this@OptionObj.choices.forEach {
+				addChoices(it)
+			}
+		}
 	}
 }

px32-bot-core/src/main/kotlin/net/projecttl/p/x32/Px32.kt

@@ -33,21 +33,19 @@ fun main(args: Array<out String>) {
 	if (args.contains("--remove-cmd")) {
 		jda = kernel.build()
 		try {
-			jda.retrieveCommands().queue {
+			val list = jda.retrieveCommands().complete()
-				if (it == null) {
+			if (list.isEmpty()) {
-					return@queue
+				return
-				}
+			}
 
-				it.forEach { command ->
+			list.forEach { command ->
-					logger.info("unregister command: /${command.name}")
+				logger.info("unregister command: /${command.name}")
-					command.jda.deleteCommandById(command.id).queue()
+				command.jda.deleteCommandById(command.id).complete()
-				}
 			}
 		} catch (ex: Exception) {
 			ex.printStackTrace()
 		}
 
-		kernel.kill()
 		return
 	}
 

px32-bot-core/src/main/kotlin/net/projecttl/p/x32/kernel/CoreKernel.kt

@@ -99,7 +99,10 @@ class CoreKernel(token: String) {
 	}
 
 	fun kill() {
+		isActive = false
+
 		destroy()
+		logger.info("shutdown now Px32 kernel v${DefaultConfig.version}")
 		jda.shutdownNow()
 	}
 
@@ -210,10 +213,7 @@ class CoreKernel(token: String) {
 		isActive = true
 
 		Runtime.getRuntime().addShutdownHook(Thread {
-			isActive = false
+			kill()
-
-			logger.info("shutdown now Px32 kernel v${DefaultConfig.version}")
-			jda.shutdownNow()
 		})
 
 		return jda