Replace jda-ktx with our own module

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/commands/slash/SlashBan.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/SlashButton.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/SlashChoose.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/SlashDelayedSelectMenu.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/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.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/SlashSentence.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/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.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/SlashPersistentRateLimit.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)
         }
     }
-}
+}

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

@@ -1,8 +1,9 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.interactions.components.row
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.components.row
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.durations.after
+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
@@ -11,7 +12,6 @@ import io.github.freya022.botcommands.api.commands.application.slash.annotations
 import io.github.freya022.botcommands.api.commands.application.slash.annotations.SlashOption
 import io.github.freya022.botcommands.api.components.Buttons
 import io.github.freya022.botcommands.api.components.annotations.RequiresComponents
-import io.github.freya022.botcommands.api.core.utils.after
 import net.dv8tion.jda.api.interactions.components.buttons.Button
 import net.dv8tion.jda.api.utils.TimeFormat
 import kotlin.time.Duration.Companion.seconds

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

@@ -1,7 +1,7 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+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

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

@@ -1,14 +1,14 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.durations.after
 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
 import io.github.freya022.botcommands.api.commands.application.slash.annotations.JDASlashCommand
 import io.github.freya022.botcommands.api.components.EntitySelectMenu
 import io.github.freya022.botcommands.api.components.SelectMenus
 import io.github.freya022.botcommands.api.components.annotations.RequiresComponents
-import io.github.freya022.botcommands.api.core.utils.after
 import net.dv8tion.jda.api.entities.Role
 import net.dv8tion.jda.api.interactions.components.ActionRow
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.SelectTarget

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

@@ -1,6 +1,6 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
+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.slash.GuildSlashEvent

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

@@ -1,7 +1,7 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+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.provider.GlobalApplicationCommandManager
 import io.github.freya022.botcommands.api.commands.application.provider.GlobalApplicationCommandProvider
@@ -31,4 +31,4 @@ class SlashSkip : GlobalApplicationCommandProvider {
             rateLimit(RateLimiter.createDefault(RateLimitScope.USER, bucketConfiguration.toSupplier(), deleteOnRefill = true))
         }
     }
-}
+}

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

@@ -1,8 +1,8 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.messages.into
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.components.into
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+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
@@ -31,4 +31,4 @@ class SlashTypeSafeButtons(private val buttons: Buttons) : ApplicationCommand()
     suspend fun onTestClick(event: ButtonEvent, @ComponentData argument: String) {
         event.reply_("The argument was: $argument", ephemeral = true).await()
     }
-}
+}

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

@@ -1,8 +1,8 @@
 package doc.kotlin.examples.commands.slash
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.messages.into
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.components.into
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+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
@@ -32,4 +32,4 @@ class SlashTypeSafeSelectMenus(private val selectMenus: SelectMenus) : Applicati
     suspend fun onTestSelect(event: EntitySelectEvent, @ComponentData argument: String) {
         event.reply_("The argument was: $argument", ephemeral = true).await()
     }
-}
+}

BotCommands-core/src/kotlinDocExamples/kotlin/doc/kotlin/examples/filters/MyApplicationCommandFilter.kt

@@ -1,7 +1,7 @@
 package doc.kotlin.examples.filters
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommandFilter
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommandInfo
 import io.github.freya022.botcommands.api.core.service.annotations.BService

BotCommands-core/src/kotlinDocExamples/kotlin/doc/kotlin/examples/filters/MyComponentFilter.kt

@@ -1,7 +1,7 @@
 package doc.kotlin.examples.filters
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.messages.reply_
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.messages.reply_
 import io.github.freya022.botcommands.api.components.ComponentInteractionFilter
 import io.github.freya022.botcommands.api.core.BotOwners
 import io.github.freya022.botcommands.api.core.service.annotations.BService

BotCommands-core/src/kotlinDocExamples/kotlin/doc/kotlin/examples/filters/MyTextCommandFilter.kt

@@ -1,6 +1,6 @@
 package doc.kotlin.examples.filters
 
-import dev.minn.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.coroutines.await
 import io.github.freya022.botcommands.api.commands.text.TextCommandFilter
 import io.github.freya022.botcommands.api.commands.text.TextCommandVariation
 import io.github.freya022.botcommands.api.core.service.annotations.BService

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/commands/ratelimit/handler/DefaultRateLimitHandler.kt

@@ -1,7 +1,9 @@
 package io.github.freya022.botcommands.api.commands.ratelimit.handler
 
-import dev.minn.jda.ktx.coroutines.await
-import dev.minn.jda.ktx.generics.getChannel
+import dev.freya02.botcommands.jda.ktx.coroutines.await
+import dev.freya02.botcommands.jda.ktx.getChannel
+import dev.freya02.botcommands.jda.ktx.requests.awaitCatching
+import dev.freya02.botcommands.jda.ktx.requests.runIgnoringResponse
 import io.github.bucket4j.ConsumptionProbe
 import io.github.freya022.botcommands.api.commands.application.ApplicationCommandInfo
 import io.github.freya022.botcommands.api.commands.ratelimit.RateLimitScope
@@ -10,9 +12,7 @@ import io.github.freya022.botcommands.api.core.BContext
 import io.github.freya022.botcommands.api.core.messages.BotCommandsMessages
 import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
 import io.github.freya022.botcommands.api.core.service.getService
-import io.github.freya022.botcommands.api.core.utils.awaitCatching
 import io.github.freya022.botcommands.api.core.utils.namedDefaultScope
-import io.github.freya022.botcommands.api.core.utils.runIgnoringResponse
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel
@@ -130,4 +130,4 @@ class DefaultRateLimitHandler(
             RateLimitScope.CHANNEL -> messages.channelRateLimited(event, deadline)
         }
     }
-}
+}

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/components/builder/IActionableComponent.kt

@@ -1,6 +1,5 @@
 package io.github.freya022.botcommands.api.components.builder
 
-import dev.minn.jda.ktx.util.ref
 import io.github.freya022.botcommands.api.commands.annotations.RateLimitReference
 import io.github.freya022.botcommands.api.commands.ratelimit.declaration.RateLimitProvider
 import io.github.freya022.botcommands.api.components.ComponentInteractionFilter
@@ -20,7 +19,6 @@ import io.github.freya022.botcommands.api.parameters.resolvers.ComponentParamete
 import io.github.freya022.botcommands.internal.utils.annotationRef
 import io.github.freya022.botcommands.internal.utils.javaMethodInternal
 import io.github.freya022.botcommands.internal.utils.throwArgument
-import net.dv8tion.jda.api.entities.User
 import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent
 import java.util.function.Consumer
 import javax.annotation.CheckReturnValue
@@ -149,6 +147,7 @@ interface IEphemeralActionableComponent<T : IEphemeralActionableComponent<T, E>,
      * ### Captured entities
      * Pay *extra* attention to not capture JDA entities in such handlers
      * as [they can stop being updated by JDA](https://jda.wiki/using-jda/troubleshooting/#cannot-get-reference-as-it-has-already-been-garbage-collected).
+     * You should instead make a variable from the entity's ID, outside the lambda, then capture it.
      *
      * @param handler The handler to run when the button is clicked
      */
@@ -161,9 +160,7 @@ interface IEphemeralActionableComponent<T : IEphemeralActionableComponent<T, E>,
      * ### Captured entities
      * Pay *extra* attention to not capture JDA entities in such handlers
      * as [they can stop being updated by JDA](https://jda.wiki/using-jda/troubleshooting/#cannot-get-reference-as-it-has-already-been-garbage-collected).
-     *
-     * You can still use [User.ref] and such from JDA-KTX to attenuate this issue,
-     * even though it will return you an outdated object if the entity cannot be found anymore.
+     * You should instead make a variable from the entity's ID, outside the lambda, then capture it.
      *
      * @param handler The handler to run when the button is clicked
      */
@@ -1037,4 +1034,4 @@ private fun findHandlerName(func: KFunction<*>): String {
         return selectMenuAnnotation.getEffectiveName(func)
 
     throwArgument(func, "Could not find ${annotationRef<JDAButtonListener>()} or ${annotationRef<JDASelectMenuListener>()}")
-}
+}