Update to Kordex 2.0.0

DRSchlaubi · Nov 5, 2024 · 205229a · 205229a
1 parent f29c444
commit 205229a
Show file tree

Hide file tree

Showing 28 changed files with 184 additions and 151 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/desktop/uwp_helper/Cargo.lock b/app/desktop/uwp_helper/Cargo.lock
diff --git a/app/desktop/uwp_helper/build.gradle.kts b/app/desktop/uwp_helper/build.gradle.kts
@@ -59,6 +59,9 @@ tasks {
 
     compileJava {
         dependsOn(generateBindingsWithJextract)
-        options.compilerArgs.add("--enable-preview")
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_22
+}
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
@@ -1,6 +1,5 @@
 import dev.schlaubi.tonbrett.gradle.androidSdk
 import dev.schlaubi.tonbrett.gradle.apiUrl
-import org.gradle.configurationcache.extensions.capitalized
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
@@ -11,9 +10,6 @@ plugins {
     alias(libs.plugins.ksp)
 }
 
-// TODO: https://github.com/google/ksp/issues/1823
-project.setProperty("ksp.useKSP2", false)
-
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     applyDefaultHierarchyTemplate {

diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
@@ -1,6 +1,5 @@
 import dev.schlaubi.mikbot.gradle.mikbot
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import java.util.Locale
 
 plugins {
     alias(libs.plugins.ksp)
@@ -40,13 +39,15 @@ mikbotPlugin {
     pluginId = "tonbrett"
     license = "MIT"
     enableKordexProcessor = true
-}
 
-tasks {
-    generateDefaultTranslationBundle {
-        defaultLocale = Locale.Builder().setLanguage("en").setRegion("US").build()
+    i18n {
+        classPackage = "dev.schlaubi.tonbrett.bot.translations"
+        translationBundle = "soundboard"
+        className = "SoundboardTranslations"
     }
+}
 
+tasks {
     val buildWebApp = register<Copy>("buildWebApp") {
         val webApp = project(":app:web")
         from(webApp.tasks.named("jsBrowserDistribution"))

diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
@@ -2,17 +2,20 @@
 
 package dev.schlaubi.tonbrett.bot
 
-import com.kotlindiscord.kord.extensions.builders.ExtensibleBotBuilder
-import com.kotlindiscord.kord.extensions.extensions.primaryEntryPointCommand
-import com.kotlindiscord.kord.extensions.modules.unsafe.annotations.UnsafeAPI
+import dev.kordex.core.extensions.primaryEntryPointCommand
 import dev.kord.common.entity.PrimaryEntryPointCommandHandlerType
 import dev.kord.gateway.Intent
+import dev.kordex.core.builders.ExtensionsBuilder
+import dev.kordex.core.i18n.toKey
+import dev.kordex.core.i18n.types.Key
+import dev.kordex.modules.dev.unsafe.annotations.UnsafeAPI
 import dev.schlaubi.mikbot.plugin.api.Plugin
 import dev.schlaubi.mikbot.plugin.api.PluginContext
 import dev.schlaubi.mikbot.plugin.api.PluginMain
 import dev.schlaubi.mikbot.plugin.api.module.SubCommandModule
 import dev.schlaubi.tonbrett.bot.commands.*
 import dev.schlaubi.tonbrett.bot.core.VoiceStateWatcher
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.TonbrettSerializersModule
 import org.litote.kmongo.serialization.registerModule
 
@@ -22,16 +25,15 @@ class Plugin(context: PluginContext) : Plugin(context) {
         registerModule(TonbrettSerializersModule)
     }
 
-    override fun ExtensibleBotBuilder.ExtensionsBuilder.addExtensions() {
+    override fun ExtensionsBuilder.addExtensions() {
         add(::Module)
         add(::VoiceStateWatcher)
     }
 }
 
 private class Module(context: PluginContext) : SubCommandModule(context) {
     override val name: String = "tonbrett"
-    override val bundle: String = "soundboard"
-    override val commandName: String = "sound"
+    override val commandName: Key = SoundboardTranslations.Commands.Sound.name
     override suspend fun overrideSetup() {
         intents.add(Intent.GuildVoiceStates)
         addCommand()
@@ -41,8 +43,8 @@ private class Module(context: PluginContext) : SubCommandModule(context) {
         playCommand()
 
         primaryEntryPointCommand {
-            name = "Tonbrett"
-            description = "commands.entry_point.description"
+            name = "Tonbrett".toKey()
+            description = SoundboardTranslations.Commands.EntryPoint.description
 
             handler = PrimaryEntryPointCommandHandlerType.DiscordLaunchActivity
         }

diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/EmojiConverter.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/EmojiConverter.kt
@@ -1,24 +1,25 @@
 package dev.schlaubi.tonbrett.bot.command
 
-import com.kotlindiscord.kord.extensions.annotations.UnexpectedFunctionBehaviour
-import com.kotlindiscord.kord.extensions.commands.Arguments
-import com.kotlindiscord.kord.extensions.commands.CommandContext
-import com.kotlindiscord.kord.extensions.commands.converters.Converter
-import com.kotlindiscord.kord.extensions.commands.converters.ConverterToOptional
-import com.kotlindiscord.kord.extensions.commands.converters.OptionalCoalescingConverter
-import com.kotlindiscord.kord.extensions.commands.converters.builders.ConverterBuilder
-import com.kotlindiscord.kord.extensions.commands.converters.builders.OptionalCoalescingConverterBuilder
-import com.kotlindiscord.kord.extensions.commands.converters.impl.emoji
-import com.kotlindiscord.kord.extensions.commands.converters.impl.string
-import com.kotlindiscord.kord.extensions.modules.unsafe.annotations.UnsafeAPI
-import com.kotlindiscord.kord.extensions.modules.unsafe.converters.union
 import dev.kord.core.entity.GuildEmoji
 import dev.kord.core.entity.StandardEmoji
 import dev.kord.x.emoji.Emojis
+import dev.kordex.core.annotations.UnexpectedFunctionBehaviour
+import dev.kordex.core.commands.Arguments
+import dev.kordex.core.commands.converters.Converter
+import dev.kordex.core.commands.converters.ConverterToOptional
+import dev.kordex.core.commands.converters.OptionalCoalescingConverter
+import dev.kordex.core.commands.converters.builders.ConverterBuilder
+import dev.kordex.core.commands.converters.builders.OptionalCoalescingConverterBuilder
+import dev.kordex.core.commands.converters.impl.emoji
+import dev.kordex.core.commands.converters.impl.string
+import dev.kordex.core.i18n.types.Key
+import dev.kordex.modules.dev.unsafe.annotations.UnsafeAPI
+import dev.kordex.modules.dev.unsafe.converters.union
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.Sound
 
 @OptIn(UnsafeAPI::class, ConverterToOptional::class, UnexpectedFunctionBehaviour::class)
-fun Arguments.emoji(name: String, description: String): OptionalCoalescingConverter<Any> {
+fun Arguments.emoji(name: Key, description: Key): OptionalCoalescingConverter<Any> {
     fun ConverterBuilder<*>.applyName() {
         this.name = name
         this.description = description
@@ -31,7 +32,7 @@ fun Arguments.emoji(name: String, description: String): OptionalCoalescingConver
 
         validate {
             if (Emojis[value] == null) {
-                fail(translate("arguments.emoji.invalid"))
+                fail(SoundboardTranslations.Arguments.Emoji.invalid)
             }
         }
     }
@@ -41,7 +42,6 @@ fun Arguments.emoji(name: String, description: String): OptionalCoalescingConver
     return arg(name, description, brokenConverter.toOptional().withBuilder(DummyBuilder))
 }
 
-context(CommandContext)
 fun Any.toEmoji(): Sound.Emoji = when (this) {
     is String -> Sound.DiscordEmoji(this)
     is GuildEmoji -> Sound.GuildEmoji(id, isAnimated)

diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/SoundConverter.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/SoundConverter.kt
@@ -1,23 +1,27 @@
 package dev.schlaubi.tonbrett.bot.command
 
-import com.kotlindiscord.kord.extensions.DiscordRelayedException
-import com.kotlindiscord.kord.extensions.commands.Argument
-import com.kotlindiscord.kord.extensions.commands.CommandContext
-import com.kotlindiscord.kord.extensions.commands.converters.SingleConverter
-import com.kotlindiscord.kord.extensions.commands.converters.Validator
-import com.kotlindiscord.kord.extensions.commands.converters.builders.ConverterBuilder
-import com.kotlindiscord.kord.extensions.modules.annotations.converters.Converter
-import com.kotlindiscord.kord.extensions.modules.annotations.converters.ConverterType
-import com.kotlindiscord.kord.extensions.parser.StringParser
 import dev.kord.core.behavior.interaction.suggestString
 import dev.kord.core.entity.interaction.AutoCompleteInteraction
 import dev.kord.core.entity.interaction.OptionValue
 import dev.kord.core.entity.interaction.StringOptionValue
-import dev.kord.rest.builder.interaction.OptionsBuilder
 import dev.kord.rest.builder.interaction.StringChoiceBuilder
+import dev.kordex.core.DiscordRelayedException
+import dev.kordex.core.annotations.InternalAPI
+import dev.kordex.core.annotations.converters.Converter
+import dev.kordex.core.annotations.converters.ConverterType
+import dev.kordex.core.commands.Argument
+import dev.kordex.core.commands.CommandContext
+import dev.kordex.core.commands.OptionWrapper
+import dev.kordex.core.commands.converters.SingleConverter
+import dev.kordex.core.commands.converters.Validator
+import dev.kordex.core.commands.converters.builders.ConverterBuilder
+import dev.kordex.core.i18n.EMPTY_KEY
+import dev.kordex.core.i18n.types.Key
+import dev.kordex.parser.StringParser
 import dev.schlaubi.mikbot.plugin.api.util.safeInput
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.io.search
+import dev.schlaubi.tonbrett.bot.translations.SoundboardTranslations
 import dev.schlaubi.tonbrett.common.Sound
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.take
@@ -32,7 +36,7 @@ private const val idPrefix = "id:"
     types = [ConverterType.SINGLE]
 )
 class SoundConverter(validator: Validator<Sound>) : SingleConverter<Sound>(validator) {
-    override val signatureTypeString: String = "Sound"
+    override val signatureType: Key = EMPTY_KEY
     override fun withBuilder(builder: ConverterBuilder<Sound>): SingleConverter<Sound> {
         val builderWithAutoComplete = builder.apply {
             autoComplete { onAutoComplete() }
@@ -69,7 +73,11 @@ class SoundConverter(validator: Validator<Sound>) : SingleConverter<Sound>(valid
                 parsed = foundByName
             } else {
                 handleError(
-                    DiscordRelayedException(context.translate("commands.generic.not_found", arrayOf(text))),
+                    DiscordRelayedException(
+                        SoundboardTranslations.Commands.Generic.notFound.withOrdinalPlaceholders(
+                            text
+                        )
+                    ),
                     context
                 )
             }
@@ -78,8 +86,9 @@ class SoundConverter(validator: Validator<Sound>) : SingleConverter<Sound>(valid
         return true
     }
 
-    override suspend fun toSlashOption(arg: Argument<*>): OptionsBuilder =
-        StringChoiceBuilder(arg.displayName, arg.description).apply { required = true }
+    @OptIn(InternalAPI::class)
+    override suspend fun toSlashOption(arg: Argument<*>): OptionWrapper<*> =
+        OptionWrapper(arg.displayName, arg.description, { required = true }, StringChoiceBuilder::class)
 
     private suspend fun AutoCompleteInteraction.onAutoComplete() {
         val input = focusedOption.safeInput

diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/TagConverter.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/command/TagConverter.kt
@@ -1,15 +1,16 @@
 package dev.schlaubi.tonbrett.bot.command
 
-import com.kotlindiscord.kord.extensions.commands.Arguments
-import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalString
 import dev.kord.core.behavior.interaction.suggestString
+import dev.kordex.core.commands.Arguments
+import dev.kordex.core.commands.converters.impl.optionalString
+import dev.kordex.core.i18n.types.Key
 import dev.schlaubi.mikbot.plugin.api.util.safeInput
 import dev.schlaubi.tonbrett.bot.io.SoundBoardDatabase
 import dev.schlaubi.tonbrett.bot.io.findAllTags
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.toList
 
-fun Arguments.tagArgument(name: String, description: String) = optionalString {
+fun Arguments.tagArgument(name: Key, description: Key) = optionalString {
     this.name = name
     this.description = description