Replace jda-ktx with our own module (#239)

Author: freya022

BotCommands-core/build.gradle.kts

@@ -28,9 +28,7 @@ dependencies {
         exclude(module = "opus-java")
         exclude(module = "tink")
     }
-    api(libs.jda.ktx) {
-        exclude(module = "JDA")
-    }
+    implementation(projects.botCommandsJdaKtx)
 
     // Classpath scanning
     api(libs.classgraph)

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/CoroutineEventManagerSupplier.kt

@@ -1,5 +1,6 @@
 package io.github.freya022.bot.commands.slash
 
+import dev.freya02.botcommands.jda.ktx.messages.deleteDelayed
 import io.github.freya022.bot.commands.ban.BanService
 import io.github.freya022.bot.resolvers.localize
 import io.github.freya022.bot.switches.KotlinDetailProfile
@@ -17,7 +18,6 @@ import io.github.freya022.botcommands.api.components.awaitAny
 import io.github.freya022.botcommands.api.components.event.ButtonEvent
 import io.github.freya022.botcommands.api.core.entities.InputUser
 import io.github.freya022.botcommands.api.core.service.annotations.BService
-import io.github.freya022.botcommands.api.core.utils.deleteDelayed
 import io.github.freya022.botcommands.api.localization.annotations.LocalizationBundle
 import io.github.freya022.botcommands.api.localization.context.AppLocalizationContext
 import io.github.freya022.botcommands.api.localization.context.editLocalized
@@ -167,4 +167,4 @@ class SlashBanSimplifiedFront(private val banImpl: SlashBan) : ApplicationComman
         @SlashOption(description = "The unit of the delete timeframe", usePredefinedChoices = true) unit: TimeUnit,
         @SlashOption(description = "The reason for the ban") reason: String = localizationContext.localize("outputs.defaultReason")
     ) = banImpl.onSlashBan(event, localizationContext, target, DeleteTimeframe(time, unit), reason)
-}
+}

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/commands/slash/SlashBan.kt

@@ -1,8 +1,8 @@
 package io.github.freya022.bot.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.interactions.components.row
-import dev.minn.jda.ktx.messages.into
+import dev.freya02.botcommands.jda.ktx.components.into
+import dev.freya02.botcommands.jda.ktx.components.row
+import dev.freya02.botcommands.jda.ktx.coroutines.await
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommand
 import io.github.freya022.botcommands.api.commands.application.CommandScope
@@ -48,4 +48,4 @@ class SlashButton(private val buttons: Buttons) : ApplicationCommand() {
     suspend fun onPersistentButtonClick(event: ButtonEvent) {
         event.editButton(event.button.asDisabled()).await()
     }
-}
+}

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/commands/slash/SlashButton.kt

@@ -1,6 +1,6 @@
 package io.github.freya022.bot.commands.slash
 
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.freya022.bot.switches.KotlinDetailProfile
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.annotations.VarArgs
@@ -47,4 +47,4 @@ class SlashChooseSimplifiedFront(private val slashChoose: SlashChoose) : Applica
         // Notice here how you are limited to 1 description for all your options
         @SlashOption(name = "choice", description = "A choice") @VarArgs(10, numRequired = 2) choices: List<String>
     ) = slashChoose.onSlashChoose(event, choices)
-}
+}

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/commands/slash/SlashChoose.kt

@@ -1,8 +1,9 @@
 package io.github.freya022.bot.commands.slash
 
-import dev.minn.jda.ktx.interactions.components.SelectOption
-import dev.minn.jda.ktx.interactions.components.row
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.components.SelectOption
+import dev.freya02.botcommands.jda.ktx.components.row
+import dev.freya02.botcommands.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.requests.awaitCatching
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommand
 import io.github.freya022.botcommands.api.commands.application.slash.GuildSlashEvent
@@ -15,7 +16,6 @@ import io.github.freya022.botcommands.api.components.builder.timeoutWith
 import io.github.freya022.botcommands.api.components.data.GroupTimeoutData
 import io.github.freya022.botcommands.api.components.event.ButtonEvent
 import io.github.freya022.botcommands.api.components.event.StringSelectEvent
-import io.github.freya022.botcommands.api.core.utils.awaitCatching
 import io.github.freya022.botcommands.api.localization.interaction.LocalizableInteractionHook
 import kotlin.time.Duration.Companion.seconds
 
@@ -99,4 +99,4 @@ class SlashDelayedSelectMenu(
             .setReplace(true)
             .queue()
     }
-}
+}

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/commands/slash/SlashDelayedSelectMenu.kt

@@ -1,6 +1,6 @@
 package io.github.freya022.bot.commands.slash
 
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommand
 import io.github.freya022.botcommands.api.commands.application.slash.GuildSlashEvent
@@ -34,4 +34,4 @@ class SlashModal(private val modals: Modals) : ApplicationCommand() {
                 $code```
             """.trimIndent(), ephemeral = true).queue()
     }
-}
+}

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/commands/slash/SlashModal.kt

@@ -1,6 +1,6 @@
 package io.github.freya022.bot.commands.slash
 
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.freya022.bot.switches.KotlinDetailProfile
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.annotations.VarArgs
@@ -81,4 +81,4 @@ class SlashSentenceSimplifiedFront(private val slashSentence: SlashSentence) : A
         // Notice here how you are limited to 1 description for all your options
         @SlashOption(name = "part", description = "A sentence part", autocomplete = sentencePartAutocompleteName) @VarArgs(10, numRequired = 2) parts: SlashSentence.SentenceParts,
     ) = slashSentence.onSlashSentence(event, parts)
-}
+}

BotCommands-core/src/examples/kotlin/io/github/freya022/bot/commands/slash/SlashSentence.kt

@@ -1,6 +1,6 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommand
 import io.github.freya022.botcommands.api.commands.application.provider.GlobalApplicationCommandManager
@@ -29,4 +29,4 @@ class SlashInMemoryRateLimit : ApplicationCommand(), GlobalApplicationCommandPro
             rateLimit(rateLimiter)
         }
     }
-}
+}

BotCommands-core/src/kotlinDocExamples/kotlin/doc/kotlin/examples/commands/slash/SlashInMemoryRateLimit.kt

@@ -1,6 +1,6 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.bucket4j.distributed.proxy.ProxyManager
 import io.github.freya022.botcommands.api.commands.annotations.Command
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommand
@@ -30,4 +30,4 @@ class SlashPersistentRateLimit(private val proxyManager: ProxyManager<String>) :
             rateLimit(rateLimiter)
         }
     }
-}
+}