Swap custom deserialiser for mixin

Author: duncte123

commands/info.yml

@@ -6,6 +6,9 @@ input:
     type: STRING
     desc: What would you like information about?
     required: true
+    choices:
+      - name: "Jock Studio release information"
+        value: "js_release"
 output: |-
   val what = event.getOption("about")!!.asString
   

src/main/kotlin/me/duncte123/io/CommandManager.kt

@@ -9,9 +9,11 @@ import me.duncte123.io.commands.JjCommand
 import me.duncte123.io.commands.ReloadCommand
 import me.duncte123.io.commands.UserCommand
 import me.duncte123.io.jackson.OptionDataDeserializer
+import me.duncte123.io.mixins.CommandChoiceMixin
 import me.duncte123.io.mixins.OptionDataMixin
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
+import net.dv8tion.jda.api.interactions.commands.Command
 import net.dv8tion.jda.api.interactions.commands.build.OptionData
 import org.slf4j.LoggerFactory
 import java.io.File
@@ -36,16 +38,17 @@ class CommandManager {
                 .configure(KotlinFeature.StrictNullChecks, false)
                 .build()
         )
+        .addMixIn(Command.Choice::class.java, CommandChoiceMixin::class.java)
         .addMixIn(OptionData::class.java, OptionDataMixin::class.java)
 
     private val commands = mutableMapOf<String, ICommand>()
 
     init {
-        val module = SimpleModule()
+        // val module = SimpleModule()
 
-        module.addDeserializer(OptionData::class.java, OptionDataDeserializer())
+        // module.addDeserializer(OptionData::class.java, OptionDataDeserializer())
 
-        jackson.registerModule(module)
+        // jackson.registerModule(module)
 
         resetCommands()
     }

src/main/kotlin/me/duncte123/io/commands/UserCommand.kt

@@ -41,7 +41,6 @@ private val kotlinEngine: ScriptEngine by lazy {
     }
 }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 data class UserCommand @JsonCreator constructor (
     @JsonProperty("disabled") val disabled: Boolean = false,
     @JsonProperty("name") override val name: String,

src/main/kotlin/me/duncte123/io/jackson/OptionDataDeserializer.kt

@@ -0,0 +1,12 @@
+package me.duncte123.io.mixins
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonProperty
+
+abstract class CommandChoiceMixin
+    @JsonCreator
+    constructor(
+        @JsonProperty("name") name: String,
+        @JsonProperty("value") value: String,
+    ) {
+}

src/main/kotlin/me/duncte123/io/mixins/CommandChoiceMixin.kt

@@ -1,10 +1,20 @@
 package me.duncte123.io.mixins
 
+import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonSetter
 import net.dv8tion.jda.api.entities.channel.ChannelType
+import net.dv8tion.jda.api.interactions.commands.Command
+import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.OptionData
 
-abstract class OptionDataMixin {
+abstract class OptionDataMixin @JsonCreator constructor(
+    @JsonProperty("type") type: OptionType,
+    @JsonProperty("name") name: String,
+    @JsonProperty("desc") desc: String,
+    @JsonProperty("required") required: Boolean
+) {
     @JsonIgnore
     abstract fun setChannelTypes(vararg channelTypes: ChannelType): OptionData
 
@@ -13,4 +23,7 @@ abstract class OptionDataMixin {
 
     @JsonIgnore
     abstract fun setMaxValue(minValue: Double): OptionData
+
+    @JsonSetter("choices")
+    abstract fun addChoices(choices: Collection<Command.Choice>): OptionData
 }