consumer = getDetailedDescription();
- if (consumer != null) {
- consumer.accept(builder);
- }
- }
-
- @Override
- public TextGeneratedValueSupplier getGeneratedValueSupplier(CommandPath commandPath,
- String optionName,
- ParameterType parameterType) {
- throw new IllegalArgumentException("Option '%s' in command path '%s' is a generated option but no generated value supplier has been given".formatted(optionName, commandPath.getFullPath()));
- }
-}
diff --git a/BotCommands-core/src/main/java/io/github/freya022/botcommands/api/localization/DefaultMessages.java b/BotCommands-core/src/main/java/io/github/freya022/botcommands/api/localization/DefaultMessages.java
deleted file mode 100644
index bb3bff4a4..000000000
--- a/BotCommands-core/src/main/java/io/github/freya022/botcommands/api/localization/DefaultMessages.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package io.github.freya022.botcommands.api.localization;
-
-import io.github.freya022.botcommands.api.localization.providers.LocalizationMapProvider;
-import io.github.freya022.botcommands.api.localization.readers.LocalizationMapReader;
-import io.github.freya022.botcommands.internal.core.exceptions.InternalException;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
-import net.dv8tion.jda.api.utils.Timestamp;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-
-import java.util.Locale;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static io.github.freya022.botcommands.api.localization.Localization.Entry.entry;
-
-/**
- * Helper class to translate framework-specific messages.
- *
- * The default values are contained in the {@code resources}, at {@code /bc_localization/DefaultMessages-default.json}.
- *
- *
You may change the default values by:
- *
- * - Creating a new {@code DefaultMessages.json}
- * - Creating language variations with a file of the same name, suffixed by the {@link Locale#toLanguageTag() locale tag},
- * for example {@code /bc_localization/DefaultMessages_fr.json}
- *
- *
- * You can always customize:
- *
- * - Loading directories: by creating new {@link LocalizationMapProvider LocalizationMap providers}
- * - File formats: by creating new {@link LocalizationMapReader LocalizationMap readers}
- * - Template formats: by creating new {@link LocalizationTemplate localization templates}
- *
- * Most of the time it's easier to just add your new localization files in {@code /bc_localization}.
- *
- * The localization paths must not be changed, the templates can have their values in any order,
- * use different format specifiers, but need to keep the same names.
- *
- *
Refer to {@link Localization} for more details.
- *
- * @see Localization
- *
- * @deprecated This has been replaced by {@link io.github.freya022.botcommands.api.core.messages.DefaultBotCommandsMessages DefaultBotCommandsMessages}
- */
-@NullMarked
-@Deprecated(since = "3.1.0-beta.1", forRemoval = true)
-public final class DefaultMessages {
- private final Localization localization;
-
- /**
- * THIS IS NOT A PUBLIC CONSTRUCTOR
- */
- @ApiStatus.Internal
- public DefaultMessages(LocalizationService localizationService, Locale locale) {
- var localization = localizationService.getInstance("DefaultMessages", locale);
- if (localization == null) {
- final var mappingProviders = localizationService.getMappingProviders();
- final var mappingReaders = localizationService.getMappingReaders();
- throw new InternalException("Could not load DefaultMessages, providers: " + mappingProviders + ", readers: " + mappingReaders);
- }
- this.localization = localization;
- }
-
- private LocalizationTemplate getLocalizationTemplate(String path) {
- final LocalizationTemplate template = getLocalizationTemplateOrNull(path);
- if (template == null) {
- throw new InternalException("Localization template for default messages '" + path + "' could not be found, available keys: " + localization.getKeys());
- }
-
- return template;
- }
-
- @Nullable
- private LocalizationTemplate getLocalizationTemplateOrNull(String path) {
- return localization.get(path);
- }
-
- /**
- * @return The localized permission, or {@link Permission#getName()} if the translation is missing.
- */
- public String getPermission(Permission permission) {
- final LocalizationTemplate localizationTemplate = getLocalizationTemplateOrNull("permissions." + permission.name());
- return localizationTemplate != null ? localizationTemplate.localize() : permission.getName();
- }
-
- /**
- * @return Message to display when an uncaught exception occurs
- */
- public String getGeneralErrorMsg() {
- return getLocalizationTemplate("general_error_message").localize();
- }
-
- /**
- * @return Message to display when the user does not have enough permissions
- */
- public String getUserPermErrorMsg(Set permissions) {
- final String localizedPermissions = permissions.stream().map(this::getPermission).collect(Collectors.joining(", "));
- return getLocalizationTemplate("user.perm.error.message").localize(entry("permissions", localizedPermissions));
- }
-
- /**
- * @return Message to display when the bot does not have enough permissions
- */
- public String getBotPermErrorMsg(Set permissions) {
- final String localizedPermissions = permissions.stream().map(this::getPermission).collect(Collectors.joining(", "));
- return getLocalizationTemplate("bot.perm.error.message").localize(entry("permissions", localizedPermissions));
- }
-
- /**
- * @return Message to display when the command is only usable by the owner
- */
- public String getOwnerOnlyErrorMsg() {
- return getLocalizationTemplate("owner.only.error.message").localize();
- }
-
- /**
- * @return Message to display when the command is on per-user rate limit
- */
- public String getUserRateLimitMsg(Timestamp timestamp) {
- return getLocalizationTemplate("user.rate_limit.message").localize(entry("delay", timestamp));
- }
-
- /**
- * @return Message to display when the command is on per-channel rate limit
- */
- public String getChannelRateLimitMsg(Timestamp timestamp) {
- return getLocalizationTemplate("channel.rate_limit.message").localize(entry("delay", timestamp));
- }
-
- /**
- * @return Message to display when the command is on per-guild rate limit
- */
- public String getGuildRateLimitMsg(Timestamp timestamp) {
- return getLocalizationTemplate("guild.rate_limit.message").localize(entry("delay", timestamp));
- }
-
- /**
- * @return Message to display when application commands are not loaded on the guild yet
- */
- public String getApplicationCommandsNotAvailableMsg() {
- return getLocalizationTemplate("application_commands_not_available").localize();
- }
-
- /**
- * @return Message to display when the command is not found
- */
- public String getCommandNotFoundMsg(String suggestions) {
- return getLocalizationTemplate("command.not.found.message").localize(entry("suggestions", suggestions));
- }
-
- /**
- * @return Message to display when a channel parameter could not be resolved
- */
- public String getResolverChannelNotFoundMsg() {
- return getLocalizationTemplate("resolver.channel.not_found.message").localize();
- }
-
- /**
- * @return Message to display when a channel parameter could not be resolved
- */
- public String getResolverChannelMissingAccessMsg(String channelMention) {
- return getLocalizationTemplate("resolver.channel.missing_access.message").localize(entry("channel_mention", channelMention));
- }
-
- /**
- * @return Message to display when a user parameter could not be resolved
- */
- public String getResolverUserNotFoundMsg() {
- return getLocalizationTemplate("resolver.user.not_found.message").localize();
- }
-
- /**
- * @return Message to display when a slash command option is unresolvable (only in slash command interactions)
- */
- public String getSlashCommandUnresolvableOptionMsg(String parameterName) {
- return getLocalizationTemplate("slash.command.unresolvable.option.message").localize(
- entry("optionName", parameterName)
- );
- }
-
- /**
- * @return Message to display when a User's DMs are closed (when sending help content for example)
- */
- public String getClosedDMErrorMsg() {
- return getLocalizationTemplate("closed.dm.error.message").localize();
- }
-
- /**
- * @return Message to display when a command is used in a non-NSFW {@link GuildMessageChannel}
- */
- public String getNSFWOnlyErrorMsg() {
- return getLocalizationTemplate("nsfw.only.error.message").localize();
- }
-
- /**
- * @return Message to display when a user tries to use a component it cannot interact with
- */
- public String getComponentNotAllowedErrorMsg() {
- return getLocalizationTemplate("component.not.allowed.error.message").localize();
- }
-
- /**
- * @return Message to display when a user tries to use a component which has reached timeout while the bot was offline
- */
- public String getComponentExpiredErrorMsg() {
- return getLocalizationTemplate("component.expired.error.message").localize();
- }
-
- /**
- * @return Message to display when a user tries to use a modal which has reached timeout
- */
- public String getModalExpiredErrorMsg() {
- return getLocalizationTemplate("modal.expired.error.message").localize();
- }
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/commands/application/ApplicationCommand.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/commands/application/ApplicationCommand.kt
deleted file mode 100644
index 6fb299881..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/commands/application/ApplicationCommand.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.github.freya022.botcommands.api.commands.application
-
-import io.github.freya022.botcommands.api.commands.CommandPath
-import io.github.freya022.botcommands.api.commands.application.context.annotations.JDAMessageCommand
-import io.github.freya022.botcommands.api.commands.application.context.annotations.JDAUserCommand
-import io.github.freya022.botcommands.api.commands.application.slash.annotations.JDASlashCommand
-import io.github.freya022.botcommands.api.core.reflect.ParameterType
-import io.github.freya022.botcommands.internal.utils.throwArgument
-import net.dv8tion.jda.api.entities.Guild
-import net.dv8tion.jda.api.interactions.commands.Command
-
-/**
- * Base class for **annotated** application commands such as slash / context commands.
- *
- * You are not required to use this if you use the application command provider interfaces.
- *
- * @see JDASlashCommand @JDASlashCommand
- * @see JDAMessageCommand @JDAMessageCommand
- * @see JDAUserCommand @JDAUserCommand
- *
- * @see SlashOptionChoiceProvider
- */
-@Deprecated(message = "This superclass is no longer mandatory, if you override methods from it, implement them using their respective interfaces")
-abstract class ApplicationCommand : SlashOptionChoiceProvider, ApplicationGeneratedValueSupplierProvider {
- override fun getOptionChoices(guild: Guild?, commandPath: CommandPath, optionName: String): List {
- return emptyList()
- }
-
- override fun getGeneratedValueSupplier(
- guild: Guild?,
- commandId: String?, commandPath: CommandPath,
- optionName: String, parameterType: ParameterType
- ): ApplicationGeneratedValueSupplier {
- val errorStr = buildString {
- append("Option '$optionName' in command path '${commandPath.fullPath}'")
- if (commandId != null) append(" (id '$commandId')")
- if (guild != null) append(" in guild '${guild.name}' (id ${guild.id})")
- append(" is a generated option but no generated value supplier has been given")
- }
-
- throwArgument(errorStr)
- }
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BApplicationConfig.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BApplicationConfig.kt
index a99f9dbfa..ab5d23bdc 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BApplicationConfig.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BApplicationConfig.kt
@@ -19,7 +19,6 @@ import io.github.freya022.botcommands.api.localization.readers.JacksonLocalizati
import io.github.freya022.botcommands.api.localization.readers.LocalizationMapReader
import io.github.freya022.botcommands.internal.core.config.ConfigDSL
import io.github.freya022.botcommands.internal.core.config.ConfigurationValue
-import io.github.freya022.botcommands.internal.core.config.DeprecatedValue
import io.github.freya022.botcommands.internal.core.exceptions.internalErrorMessage
import io.github.freya022.botcommands.internal.utils.lazyWritable
import io.github.freya022.botcommands.internal.utils.throwInternal
@@ -48,18 +47,6 @@ interface BApplicationConfigProps {
@ConfigurationValue(path = "botcommands.application.enable", defaultValue = "true")
val enable: Boolean
- /**
- * If not empty, only these guilds will have their application commands updated.
- *
- * Existing commands won't be removed in other guilds, global commands will still be updated.
- *
- * Spring property: `botcommands.application.slashGuildIds`
- */
- @Deprecated("Replaced by 'guildsToUpdate'", replaceWith = ReplaceWith("guildToUpdate"))
- @DeprecatedValue("Replaced by 'guildsToUpdate'", replacement = "botcommands.application.slashGuildIds")
- @ConfigurationValue(path = "botcommands.application.slashGuildIds")
- val slashGuildIds: List get() = guildsToUpdate
-
/**
* If not empty, application commands will only be updated in these guilds.
*
@@ -164,8 +151,6 @@ interface BApplicationConfigProps {
class BApplicationConfigBuilder internal constructor() : BApplicationConfigProps {
@set:JvmName("enable")
override var enable: Boolean = true
- @Deprecated("Replaced by 'guildsToUpdate'", replaceWith = ReplaceWith("guildToUpdate"))
- override val slashGuildIds: MutableList get() = guildsToUpdate
override val guildsToUpdate: MutableList = mutableListOf()
override val testGuildIds: MutableList = mutableListOf()
@set:DevConfig
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BConfig.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BConfig.kt
index 9162d7c21..86eae9ccb 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BConfig.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BConfig.kt
@@ -9,14 +9,11 @@ import io.github.freya022.botcommands.api.core.requests.PriorityGlobalRestRateLi
import io.github.freya022.botcommands.api.core.service.ClassGraphProcessor
import io.github.freya022.botcommands.api.core.service.annotations.InjectedService
import io.github.freya022.botcommands.api.core.utils.*
-import io.github.freya022.botcommands.api.core.waiter.EventWaiter
import io.github.freya022.botcommands.internal.core.config.ConfigDSL
import io.github.freya022.botcommands.internal.core.config.ConfigurationValue
-import io.github.freya022.botcommands.internal.core.config.DeprecatedValue
import io.github.freya022.botcommands.internal.utils.putIfAbsentOrThrow
import io.github.freya022.botcommands.internal.utils.throwInternal
import io.github.oshai.kotlinlogging.KotlinLogging
-import net.dv8tion.jda.api.events.Event
import net.dv8tion.jda.api.requests.GatewayIntent
import net.dv8tion.jda.api.requests.RestRateLimiter
import net.dv8tion.jda.api.utils.messages.MessageCreateData
@@ -112,18 +109,6 @@ interface BConfigProps {
@ConfigurationValue(path = "botcommands.core.ignoredIntents")
val ignoredIntents: Set
- /**
- * Events for which the [event waiter][EventWaiter] must ignore intent requirements.
- *
- * If not ignored, the event would still be being listened to, but a warning would have been logged.
- *
- * Spring property: `botcommands.core.ignoredEventIntents`
- */
- @Deprecated("Replaced by EventWaiterBuilder.ignoreMissingIntents()")
- @DeprecatedValue("Replaced by EventWaiterBuilder.ignoreMissingIntents()")
- @ConfigurationValue(path = "botcommands.core.ignoredEventIntents", type = "java.util.Set>")
- val ignoredEventIntents: Set>
-
/**
* Suppresses warnings about the default [RestRateLimiter] being used for large bots.
*
@@ -179,9 +164,6 @@ class BConfigBuilder : BConfigProps {
override val ignoredIntents: MutableSet = enumSetOf()
- @Deprecated("Replaced by EventWaiterBuilder.ignoreMissingIntents()")
- override val ignoredEventIntents: MutableSet> = hashSetOf()
-
override var ignoreRestRateLimiter: Boolean = false
override val classGraphProcessors: MutableList = arrayListOf()
@@ -356,8 +338,6 @@ class BConfigBuilder : BConfigProps {
override val disableExceptionsInDMs = this@BConfigBuilder.disableExceptionsInDMs
override val enableOwnerBypass = this@BConfigBuilder.enableOwnerBypass
override val ignoredIntents = this@BConfigBuilder.ignoredIntents.toImmutableSet()
- @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
- override val ignoredEventIntents = this@BConfigBuilder.ignoredEventIntents.toImmutableSet()
override val ignoreRestRateLimiter = this@BConfigBuilder.ignoreRestRateLimiter
override val classGraphProcessors = this@BConfigBuilder.classGraphProcessors.toImmutableList()
override val enableShutdownHook = this@BConfigBuilder.enableShutdownHook
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/messages/BotCommandsMessagesFactory.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/messages/BotCommandsMessagesFactory.kt
index 1cfaa5f56..2e309b137 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/messages/BotCommandsMessagesFactory.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/messages/BotCommandsMessagesFactory.kt
@@ -1,9 +1,6 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.api.core.messages
import io.github.freya022.botcommands.api.core.service.annotations.InterfacedService
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
import net.dv8tion.jda.api.events.message.MessageReceivedEvent
@@ -11,8 +8,7 @@ import net.dv8tion.jda.api.interactions.Interaction
import java.util.*
/**
- * Factory of [BotCommandsMessages], the default implementation is [DefaultBotCommandsMessagesFactory], or,
- * if a non-default [DefaultMessagesFactory] exists, an adapter is used.
+ * Factory of [BotCommandsMessages], the default implementation is [DefaultBotCommandsMessagesFactory].
*
* ### Complete customization
*
@@ -40,4 +36,4 @@ interface BotCommandsMessagesFactory {
* By default, this uses [UserLocaleProvider] to get the locale.
*/
fun get(event: Interaction): BotCommandsMessages
-}
\ No newline at end of file
+}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/service/DefaultServiceContainer.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/service/DefaultServiceContainer.kt
deleted file mode 100644
index 048071a10..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/service/DefaultServiceContainer.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.github.freya022.botcommands.api.core.service
-
-@Deprecated("Renamed to BCServiceContainer", ReplaceWith("BCServiceContainer"))
-interface DefaultServiceContainer : BCServiceContainer
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/waiter/EventWaiter.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/waiter/EventWaiter.kt
index b652e9ef2..16a708ecb 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/waiter/EventWaiter.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/waiter/EventWaiter.kt
@@ -1,6 +1,5 @@
package io.github.freya022.botcommands.api.core.waiter
-import io.github.freya022.botcommands.api.core.config.BConfigBuilder
import io.github.freya022.botcommands.api.core.service.annotations.InterfacedService
import kotlinx.coroutines.future.await
import net.dv8tion.jda.api.JDA
@@ -45,8 +44,6 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent
* LOGGER.error("Error waiting for event", e);
* }
* ```
- *
- * @see BConfigBuilder.ignoredEventIntents
*/
@InterfacedService(acceptMultiple = false)
interface EventWaiter {
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/DefaultMessagesFactory.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/DefaultMessagesFactory.kt
deleted file mode 100644
index 0a52848b2..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/DefaultMessagesFactory.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-@file:Suppress("removal", "DEPRECATION")
-
-package io.github.freya022.botcommands.api.localization
-
-import io.github.freya022.botcommands.api.core.service.annotations.BService
-import io.github.freya022.botcommands.api.core.service.annotations.InterfacedService
-import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
-import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.Interaction
-import java.util.*
-
-/**
- * Factory for [DefaultMessages] instances, using locales from various sources.
- *
- * **Usage:** Register your instance as a service with [@BService][BService].
- *
- * @see InterfacedService @InterfacedService
- */
-@Deprecated("Replaced by BotCommandsMessagesFactory")
-@InterfacedService(acceptMultiple = false)
-interface DefaultMessagesFactory {
- /**
- * Retrieves a [DefaultMessages] instance for the given locale.
- */
- fun get(locale: Locale): DefaultMessages
-
- /**
- * Retrieves a [DefaultMessages] instance, with the locale derived from this event.
- *
- * By default, this uses [TextCommandLocaleProvider] to get the locale.
- */
- fun get(event: MessageReceivedEvent): DefaultMessages
-
- /**
- * Retrieves a [DefaultMessages] instance, with the locale derived from this interaction.
- *
- * By default, this uses [UserLocaleProvider] to get the locale.
- */
- fun get(event: Interaction): DefaultMessages
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/LocalizableAction.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/LocalizableAction.kt
index a5d1edf8d..b6538cc4c 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/LocalizableAction.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/LocalizableAction.kt
@@ -6,7 +6,6 @@ import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFacto
import io.github.freya022.botcommands.api.localization.context.LocalizationContext
import io.github.freya022.botcommands.api.localization.context.PairEntry
import io.github.freya022.botcommands.api.localization.context.mapToEntries
-import net.dv8tion.jda.api.interactions.DiscordLocale
import java.util.*
/**
@@ -40,15 +39,6 @@ interface LocalizableAction {
*/
fun getLocalizationContext(bundleName: String, pathPrefix: String?): LocalizationContext
- /**
- * Retrieves a [DefaultMessages] instance, using a locale suitable for messages sent to the user.
- *
- * @see DefaultMessagesFactory
- */
- @Suppress("DEPRECATION", "removal")
- @Deprecated("Replaced with getBotCommandsMessages()")
- fun getDefaultMessages(): DefaultMessages
-
/**
* Retrieves a [BotCommandsMessages] instance, using a locale suitable for messages sent to the user.
*
@@ -79,38 +69,7 @@ interface LocalizableAction {
* - If the template requires an argument that was not passed to [entries]
*/
fun getLocalizedMessage(locale: Locale, localizationPath: String, vararg entries: Localization.Entry): String
-
- /**
- * Returns the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param locale The locale to translate the message to
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][localizationPrefix] unless starting with `/`
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- fun getLocalizedMessage(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): String =
- getLocalizedMessage(locale.toLocale(), localizationPath, *entries)
}
fun LocalizableAction.getLocalizedMessage(locale: Locale, localizationPath: String, vararg entries: PairEntry): String =
getLocalizedMessage(locale, localizationPath, *entries.mapToEntries())
-
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableAction.getLocalizedMessage(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry): String =
- getLocalizedMessage(locale, localizationPath, *entries.mapToEntries())
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/AppLocalizationContext.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/AppLocalizationContext.kt
index 039fe9dd4..f073d25dd 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/AppLocalizationContext.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/AppLocalizationContext.kt
@@ -1,12 +1,9 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.api.localization.context
import io.github.freya022.botcommands.api.localization.Localization
import io.github.freya022.botcommands.api.localization.annotations.LocalizationBundle
import io.github.freya022.botcommands.api.localization.interaction.GuildLocaleProvider
import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.Interaction
import java.util.*
import javax.annotation.CheckReturnValue
@@ -45,10 +42,6 @@ interface AppLocalizationContext : TextLocalizationContext {
//User locale is always provided in interactions
val userLocale: Locale
- @Deprecated("Use the Locale overload")
- @CheckReturnValue
- override fun withGuildLocale(guildLocale: DiscordLocale?): AppLocalizationContext
-
@CheckReturnValue
override fun withGuildLocale(guildLocale: Locale?): AppLocalizationContext
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/LocalizationContext.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/LocalizationContext.kt
index c0b3d93e3..e2ed34778 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/LocalizationContext.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/context/LocalizationContext.kt
@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.api.localization.context
import io.github.freya022.botcommands.api.commands.text.BaseCommandEvent
@@ -17,7 +15,6 @@ import net.dv8tion.jda.api.entities.Guild
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.Interaction
import net.dv8tion.jda.api.interactions.InteractionHook
import net.dv8tion.jda.api.interactions.callbacks.IMessageEditCallback
@@ -72,15 +69,6 @@ interface LocalizationContext {
*/
val localizationPrefix: String?
- /**
- * Returns a new [TextLocalizationContext] with the specified guild locale.
- *
- * @param guildLocale The guild locale to use, or `null` to remove it
- */
- @Deprecated("Use the Locale overload")
- @CheckReturnValue
- fun withGuildLocale(guildLocale: DiscordLocale?): TextLocalizationContext
-
/**
* Returns a new [TextLocalizationContext] with the specified guild locale.
*
@@ -89,15 +77,6 @@ interface LocalizationContext {
@CheckReturnValue
fun withGuildLocale(guildLocale: Locale?): TextLocalizationContext
- /**
- * Returns a new [AppLocalizationContext] with the specified user locale.
- *
- * @param userLocale The user locale to use, or `null` to remove it
- */
- @Deprecated("Use the Locale overload")
- @CheckReturnValue
- fun withUserLocale(userLocale: DiscordLocale?): AppLocalizationContext
-
/**
* Returns a new [AppLocalizationContext] with the specified user locale.
*
@@ -131,18 +110,6 @@ interface LocalizationContext {
@CheckReturnValue
fun switchBundle(localizationBundle: String): LocalizationContext
- /**
- * Localizes the provided path, with the provided locale.
- *
- * @param locale The [DiscordLocale] to use when fetching the localization bundle
- * @param localizationPath The path of the localization template,
- * prefixed with [localizationPrefix][LocalizationContext.localizationPrefix] unless starting with `/`
- * @param entries The entries to fill the template with
- */
- @Deprecated("Use the Locale overload")
- fun localize(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): String
- = localize(locale.toLocale(), localizationPath, *entries)
-
/**
* Localizes the provided path, with the provided locale.
*
@@ -153,18 +120,6 @@ interface LocalizationContext {
*/
fun localize(locale: Locale, localizationPath: String, vararg entries: Localization.Entry): String
- /**
- * Localizes the provided path, with the provided locale, or returns `null` if the path does not exist.
- *
- * @param locale The [DiscordLocale] to use when fetching the localization bundle
- * @param localizationPath The path of the localization template,
- * prefixed with [localizationPrefix][LocalizationContext.localizationPrefix] unless starting with `/`
- * @param entries The entries to fill the template with
- */
- @Deprecated("Use the Locale overload")
- fun localizeOrNull(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): String?
- = localizeOrNull(locale.toLocale(), localizationPath, *entries)
-
/**
* Localizes the provided path, with the provided locale, or returns `null` if the path does not exist.
*
@@ -267,81 +222,6 @@ interface LocalizationContext {
}
companion object {
- @JvmStatic
- @JvmOverloads
- @Deprecated("Replaced by builder")
- fun create(
- context: BContext,
- localizationBundle: String,
- localizationPrefix: String? = null,
- guildLocale: DiscordLocale? = null,
- userLocale: DiscordLocale? = null
- ): AppLocalizationContext {
- return LocalizationContextImpl(
- context.getService(),
- localizationBundle,
- localizationPrefix,
- guildLocale?.toProvider(),
- userLocale?.toProvider()
- )
- }
-
- @JvmStatic
- @JvmOverloads
- @Deprecated("Replaced by builder")
- fun create(
- localizationService: LocalizationService,
- localizationBundle: String,
- localizationPrefix: String? = null,
- guildLocale: DiscordLocale? = null,
- userLocale: DiscordLocale? = null
- ): AppLocalizationContext {
- return LocalizationContextImpl(
- localizationService,
- localizationBundle,
- localizationPrefix,
- guildLocale?.toProvider(),
- userLocale?.toProvider()
- )
- }
-
- @JvmStatic
- @JvmOverloads
- @Deprecated("Replaced by builder")
- fun fromLocaleProviders(
- context: BContext,
- event: Interaction,
- localizationBundle: String,
- localizationPrefix: String? = null
- ): AppLocalizationContext {
- return LocalizationContextImpl(
- context.getService(),
- localizationBundle,
- localizationPrefix,
- lazy { context.getService().getLocale(event) },
- lazy { context.getService().getLocale(event) },
- )
- }
-
- @JvmStatic
- @JvmOverloads
- @Deprecated("Replaced by builder")
- fun fromLocaleProviders(
- context: BContext,
- event: MessageReceivedEvent,
- localizationBundle: String,
- localizationPrefix: String? = null,
- userLocale: DiscordLocale? = null,
- ): TextLocalizationContext {
- return LocalizationContextImpl(
- context.getService(),
- localizationBundle,
- localizationPrefix,
- lazy { context.getService().getLocale(event) },
- userLocale?.toProvider(),
- )
- }
-
/**
* Creates a new builder, using a [LocalizationService] retrieved from the provided context,
* and the specified bundle name, from which the strings will be retrieved from.
@@ -359,8 +239,6 @@ interface LocalizationContext {
fun builder(localizationService: LocalizationService, localizationBundle: String): Builder {
return Builder(localizationService, localizationBundle)
}
-
- private fun DiscordLocale.toProvider(): Lazy = lazyOf(this.toLocale())
}
}
@@ -368,18 +246,6 @@ internal fun Array.mapToEntries() = Array(this.size) {
Localization.Entry(this[it].first, this[it].second)
}
-/**
- * Localizes the provided path, with the provided locale.
- *
- * @param locale The [DiscordLocale] to use when fetching the localization bundle
- * @param localizationPath The path of the localization template,
- * prefixed with [localizationPrefix][LocalizationContext.localizationPrefix] unless starting with `/`
- * @param entries The entries to fill the template with
- */
-@Deprecated("Use the Locale overload")
-fun LocalizationContext.localize(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry): String =
- localize(locale, localizationPath, *entries.mapToEntries())
-
/**
* Localizes the provided path, with the provided locale.
*
@@ -391,18 +257,6 @@ fun LocalizationContext.localize(locale: DiscordLocale, localizationPath: String
fun LocalizationContext.localize(locale: Locale, localizationPath: String, vararg entries: PairEntry): String =
localize(locale, localizationPath, *entries.mapToEntries())
-/**
- * Localizes the provided path, with the provided locale, or returns `null` if the path does not exist.
- *
- * @param locale The [DiscordLocale] to use when fetching the localization bundle
- * @param localizationPath The path of the localization template,
- * prefixed with [localizationPrefix][LocalizationContext.localizationPrefix] unless starting with `/`
- * @param entries The entries to fill the template with
- */
-@Deprecated("Use the Locale overload")
-fun LocalizationContext.localizeOrNull(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry): String? =
- localizeOrNull(locale, localizationPath, *entries.mapToEntries())
-
/**
* Localizes the provided path, with the provided locale, or returns `null` if the path does not exist.
*
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/GuildLocaleProvider.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/GuildLocaleProvider.kt
index ba7ae8797..91c789ab5 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/GuildLocaleProvider.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/GuildLocaleProvider.kt
@@ -4,18 +4,15 @@ import io.github.freya022.botcommands.api.core.service.annotations.BService
import io.github.freya022.botcommands.api.core.service.annotations.InterfacedService
import io.github.freya022.botcommands.api.localization.context.AppLocalizationContext
import io.github.freya022.botcommands.api.localization.context.TextLocalizationContext
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.Interaction
import java.util.*
/**
- * Provides the locale of a guild in a Discord interaction,
- * may be useful if the guild has set its own locale, for example.
+ * Provides the locale of a guild in a Discord interaction.
*
- * It is recommended to override both [getDiscordLocale] and [getLocale] for best results,
- * when using localization in events, and in [AppLocalizationContext].
+ * You may provide a custom implementation, for example, if a guild's locale depends on some external setting.
*
- * This returns [Interaction.getGuildLocale] by default.
+ * This returns [interaction.getGuildLocale().toLocale()][Interaction.getGuildLocale] by default.
*
* ### Usage
* Register your instance as a service with [@BService][BService].
@@ -26,11 +23,5 @@ import java.util.*
*/
@InterfacedService(acceptMultiple = false)
interface GuildLocaleProvider {
- @Deprecated("Use 'getLocale' instead, use 'DiscordLocale.from' / 'DiscordLocale#toLocale' if necessary")
- fun getDiscordLocale(interaction: Interaction): DiscordLocale =
- throw UnsupportedOperationException("'getLocale' needs to be implemented instead")
-
- @Suppress("DEPRECATION")
- fun getLocale(interaction: Interaction): Locale =
- getDiscordLocale(interaction).toLocale()
+ fun getLocale(interaction: Interaction): Locale
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableEditCallback.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableEditCallback.kt
index 8ca944ae7..098a217bc 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableEditCallback.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableEditCallback.kt
@@ -4,7 +4,6 @@ import io.github.freya022.botcommands.api.core.config.BLocalizationConfig
import io.github.freya022.botcommands.api.localization.Localization
import io.github.freya022.botcommands.api.localization.context.PairEntry
import io.github.freya022.botcommands.api.localization.context.mapToEntries
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.requests.restaction.interactions.MessageEditCallbackAction
import java.util.*
import javax.annotation.CheckReturnValue
@@ -74,32 +73,6 @@ interface LocalizableEditCallback {
@CheckReturnValue
fun editGuild(localizationPath: String, vararg entries: Localization.Entry): MessageEditCallbackAction
- /**
- * Edits the original message with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableInteraction.localizationPrefix] unless starting with `/`
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- @CheckReturnValue
- fun editLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): MessageEditCallbackAction =
- editLocalized(locale.toLocale(), localizationPath, *entries)
-
/**
* Edits the original message with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
@@ -181,32 +154,6 @@ fun LocalizableEditCallback.editUser(localizationPath: String, vararg entries: P
fun LocalizableEditCallback.editGuild(localizationPath: String, vararg entries: PairEntry) =
editGuild(localizationPath, *entries.mapToEntries())
-/**
- * Edits the original message with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableInteraction.localizationPrefix] unless starting with `/`
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableEditCallback.editLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry) =
- editLocalized(locale, localizationPath, *entries.mapToEntries())
-
/**
* Edits the original message with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableInteractionHook.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableInteractionHook.kt
index cfb76251d..2f2b7d314 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableInteractionHook.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableInteractionHook.kt
@@ -5,7 +5,6 @@ import io.github.freya022.botcommands.api.localization.Localization
import io.github.freya022.botcommands.api.localization.context.PairEntry
import io.github.freya022.botcommands.api.localization.context.mapToEntries
import net.dv8tion.jda.api.entities.Message
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.InteractionHook
import net.dv8tion.jda.api.requests.restaction.WebhookMessageCreateAction
import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction
@@ -81,31 +80,6 @@ interface LocalizableInteractionHook : InteractionHook {
@CheckReturnValue
fun sendGuild(localizationPath: String, vararg entries: Localization.Entry): WebhookMessageCreateAction
- /**
- * Sends a follow-up with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate, will be prefixed with [LocalizableInteraction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- @CheckReturnValue
- fun sendLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): WebhookMessageCreateAction =
- sendLocalized(locale.toLocale(), localizationPath, *entries)
-
/**
* Sends a follow-up with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
@@ -183,31 +157,6 @@ interface LocalizableInteractionHook : InteractionHook {
@CheckReturnValue
fun editGuild(localizationPath: String, vararg entries: Localization.Entry): WebhookMessageEditAction
- /**
- * Edits the original message with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate, will be prefixed with [LocalizableInteraction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- @CheckReturnValue
- fun editLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): WebhookMessageEditAction =
- editLocalized(locale.toLocale(), localizationPath, *entries)
-
/**
* Edits the original message with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
@@ -286,31 +235,6 @@ fun LocalizableInteractionHook.sendUser(localizationPath: String, vararg entries
fun LocalizableInteractionHook.sendGuild(localizationPath: String, vararg entries: PairEntry) =
sendGuild(localizationPath, *entries.mapToEntries())
-/**
- * Sends a follow-up with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate, will be prefixed with [LocalizableInteraction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableInteractionHook.sendLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry) =
- sendLocalized(locale, localizationPath, *entries.mapToEntries())
-
/**
* Sends a follow-up with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
@@ -388,31 +312,6 @@ fun LocalizableInteractionHook.editUser(localizationPath: String, vararg entries
fun LocalizableInteractionHook.editGuild(localizationPath: String, vararg entries: PairEntry) =
editGuild(localizationPath, *entries.mapToEntries())
-/**
- * Edits the original message with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate, will be prefixed with [LocalizableInteraction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableInteractionHook.editLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry) =
- editLocalized(locale, localizationPath, *entries.mapToEntries())
-
/**
* Edits the original message with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableReplyCallback.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableReplyCallback.kt
index 8dbca4697..85d20d09d 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableReplyCallback.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/LocalizableReplyCallback.kt
@@ -4,7 +4,6 @@ import io.github.freya022.botcommands.api.core.config.BLocalizationConfig
import io.github.freya022.botcommands.api.localization.Localization
import io.github.freya022.botcommands.api.localization.context.PairEntry
import io.github.freya022.botcommands.api.localization.context.mapToEntries
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction
import java.util.*
import javax.annotation.CheckReturnValue
@@ -74,32 +73,6 @@ interface LocalizableReplyCallback {
@CheckReturnValue
fun replyGuild(localizationPath: String, vararg entries: Localization.Entry): ReplyCallbackAction
- /**
- * Replies with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableInteraction.localizationPrefix] unless starting with `/`
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- @CheckReturnValue
- fun replyLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): ReplyCallbackAction =
- replyLocalized(locale.toLocale(), localizationPath, *entries)
-
/**
* Replies with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
@@ -181,32 +154,6 @@ fun LocalizableReplyCallback.replyUser(localizationPath: String, vararg entries:
fun LocalizableReplyCallback.replyGuild(localizationPath: String, vararg entries: PairEntry) =
replyGuild(localizationPath, *entries.mapToEntries())
-/**
- * Replies with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableInteraction.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableInteraction.localizationPrefix] unless starting with `/`
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableInteraction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableReplyCallback.replyLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry) =
- replyLocalized(locale, localizationPath, *entries.mapToEntries())
-
/**
* Replies with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/UserLocaleProvider.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/UserLocaleProvider.kt
index 6bb945de8..8a5133070 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/UserLocaleProvider.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/interaction/UserLocaleProvider.kt
@@ -3,18 +3,15 @@ package io.github.freya022.botcommands.api.localization.interaction
import io.github.freya022.botcommands.api.core.service.annotations.BService
import io.github.freya022.botcommands.api.core.service.annotations.InterfacedService
import io.github.freya022.botcommands.api.localization.context.AppLocalizationContext
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.Interaction
import java.util.*
/**
- * Provides the locale of a user in a Discord interaction,
- * may be useful if the user has set its own locale, for example.
+ * Provides the locale of a user in a Discord interaction.
*
- * It is recommended to override both [getDiscordLocale] and [getLocale] for best results,
- * when using localization in events, and in [AppLocalizationContext].
+ * You may provide a custom implementation, for example, if a user's locale depends on some external setting.
*
- * This returns [Interaction.getUserLocale] by default.
+ * This returns [interaction.getUserLocale().toLocale()][Interaction.getUserLocale] by default.
*
* ### Usage
* Register your instance as a service with [@BService][BService].
@@ -24,11 +21,5 @@ import java.util.*
*/
@InterfacedService(acceptMultiple = false)
interface UserLocaleProvider {
- @Deprecated("Use 'getLocale' instead, use 'DiscordLocale.from' / 'DiscordLocale#toLocale' if necessary")
- fun getDiscordLocale(interaction: Interaction): DiscordLocale =
- throw UnsupportedOperationException("'getLocale' needs to be implemented instead")
-
- @Suppress("DEPRECATION")
- fun getLocale(interaction: Interaction): Locale =
- getDiscordLocale(interaction).toLocale()
+ fun getLocale(interaction: Interaction): Locale
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/LocalizableTextCommand.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/LocalizableTextCommand.kt
index 9a294ba50..acab8d1d9 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/LocalizableTextCommand.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/LocalizableTextCommand.kt
@@ -7,7 +7,6 @@ import io.github.freya022.botcommands.api.localization.context.PairEntry
import io.github.freya022.botcommands.api.localization.context.TextLocalizationContext
import io.github.freya022.botcommands.api.localization.context.mapToEntries
import net.dv8tion.jda.api.entities.Guild
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction
import java.util.*
import javax.annotation.CheckReturnValue
@@ -116,58 +115,6 @@ interface LocalizableTextCommand : LocalizableAction {
@CheckReturnValue
fun replyGuild(localizationPath: String, vararg entries: Localization.Entry): MessageCreateAction
- /**
- * Responds with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableAction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableAction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- @CheckReturnValue
- fun respondLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): MessageCreateAction =
- respondLocalized(locale.toLocale(), localizationPath, *entries)
-
- /**
- * Replies with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableAction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableAction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
- @Deprecated("Pass a Locale instead")
- @CheckReturnValue
- fun replyLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: Localization.Entry): MessageCreateAction =
- replyLocalized(locale.toLocale(), localizationPath, *entries)
-
/**
* Responds with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
@@ -301,58 +248,6 @@ fun LocalizableTextCommand.respondGuild(localizationPath: String, vararg entries
fun LocalizableTextCommand.replyGuild(localizationPath: String, vararg entries: PairEntry) =
replyGuild(localizationPath, *entries.mapToEntries())
-/**
- * Responds with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableTextCommand.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableAction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableAction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableTextCommand.respondLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry) =
- respondLocalized(locale, localizationPath, *entries.mapToEntries())
-
-/**
- * Replies with the localized message at the following [path][localizationPath],
- * using the provided locale and parameters.
- *
- * ### Bundle resolution
- * The bundle used is either the [defined bundle][LocalizableTextCommand.localizationBundle]
- * or one of the [registered bundles][BLocalizationConfig.responseBundles].
- *
- * The locale of the bundle is the best available,
- * for example, if `fr_FR` is not available, then `fr` will be used,
- * and otherwise, the root bundle (without any suffix) will be used.
- *
- * @param localizationPath The path of the message to translate,
- * will be prefixed with [localizationPrefix][LocalizableAction.localizationPrefix]
- * @param entries The values replacing arguments of the localization template
- *
- * @throws IllegalArgumentException If:
- * - [localizationBundle][LocalizableAction.localizationBundle] is set, but the bundle doesn't exist
- * - No [registered bundle][BLocalizationConfig.responseBundles] containing the path could be found
- * - If the template requires an argument that was not passed to [entries]
- */
-@Suppress("DEPRECATION")
-@Deprecated("Pass a Locale instead")
-fun LocalizableTextCommand.replyLocalized(locale: DiscordLocale, localizationPath: String, vararg entries: PairEntry) =
- replyLocalized(locale, localizationPath, *entries.mapToEntries())
-
/**
* Responds with the localized message at the following [path][localizationPath],
* using the provided locale and parameters.
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/TextCommandLocaleProvider.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/TextCommandLocaleProvider.kt
index 17fd289ef..2766b1b36 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/TextCommandLocaleProvider.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/localization/text/TextCommandLocaleProvider.kt
@@ -2,20 +2,16 @@ package io.github.freya022.botcommands.api.localization.text
import io.github.freya022.botcommands.api.core.service.annotations.BService
import io.github.freya022.botcommands.api.core.service.annotations.InterfacedService
-import io.github.freya022.botcommands.api.localization.context.TextLocalizationContext
import net.dv8tion.jda.api.entities.Guild
import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.DiscordLocale
import java.util.*
/**
- * Provides the locale to be used for localizing text command responses,
- * may be useful if the user has set its own locale, for example.
+ * Provides the locale to be used for localizing text command responses.
*
- * It is recommended to override both [getDiscordLocale] and [getLocale] for best results,
- * when using localization in events, and in [TextLocalizationContext].
+ * You may provide a custom implementation, for example, if a guild/user's locale depends on some external setting.
*
- * This returns [Guild.getLocale] by default.
+ * This returns [guild.getLocale().toLocale()][Guild.getLocale] by default.
*
* ### Usage
* Register your instance as a service with [@BService][BService].
@@ -24,11 +20,5 @@ import java.util.*
*/
@InterfacedService(acceptMultiple = false)
interface TextCommandLocaleProvider {
- @Deprecated("Use 'getLocale' instead, use 'DiscordLocale.from' / 'DiscordLocale#toLocale' if necessary")
- fun getDiscordLocale(event: MessageReceivedEvent): DiscordLocale =
- throw UnsupportedOperationException("'getLocale' needs to be implemented instead")
-
- @Suppress("DEPRECATION")
- fun getLocale(event: MessageReceivedEvent): Locale =
- getDiscordLocale(event).toLocale()
+ fun getLocale(event: MessageReceivedEvent): Locale
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/pagination/UsedComponentSet.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/pagination/UsedComponentSet.kt
index 020359063..615fc852b 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/pagination/UsedComponentSet.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/pagination/UsedComponentSet.kt
@@ -1,14 +1,12 @@
package io.github.freya022.botcommands.api.pagination
import dev.freya02.botcommands.jda.ktx.components.findAll
-import dev.freya02.botcommands.jda.ktx.components.toDefaultComponentTree
import gnu.trove.set.hash.TIntHashSet
import io.github.freya022.botcommands.api.components.Components
import io.github.freya022.botcommands.api.components.IdentifiableComponent
import io.github.freya022.botcommands.internal.utils.any
import io.github.freya022.botcommands.internal.utils.reference
import io.github.oshai.kotlinlogging.KotlinLogging
-import net.dv8tion.jda.api.components.Component
import net.dv8tion.jda.api.components.attribute.ICustomId
import net.dv8tion.jda.api.components.tree.ComponentTree
import kotlin.reflect.KProperty
@@ -21,17 +19,6 @@ private val logger = KotlinLogging.logger { }
class UsedComponentSet(private val componentsService: Components, private val cleanAfterRefresh: Boolean) {
private lateinit var currentIds: TIntHashSet
- @Deprecated(
- message = "Replaced with setComponent(ComponentTree), if you have a message, you should get the ComponentTree directly from it",
- replaceWith = ReplaceWith(
- expression = "setComponents(components.toList().toDefaultComponentTree())",
- imports = arrayOf("dev.freya02.botcommands.jda.ktx.components.toDefaultComponentTree")
- )
- )
- fun setComponents(components: Iterable) {
- return setComponents(components.toList().toDefaultComponentTree())
- }
-
fun setComponents(componentTree: ComponentTree<*>) {
val newIds = TIntHashSet().apply {
componentTree
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesDefaultMessagesAdapter.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesDefaultMessagesAdapter.kt
deleted file mode 100644
index f7db992be..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesDefaultMessagesAdapter.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-@file:Suppress("removal", "DEPRECATION")
-
-package io.github.freya022.botcommands.internal.core.messages.autoconfigure
-
-import io.github.freya022.botcommands.api.commands.application.slash.options.SlashCommandOption
-import io.github.freya022.botcommands.api.commands.text.TopLevelTextCommandInfo
-import io.github.freya022.botcommands.api.core.messages.BotCommandsMessages
-import io.github.freya022.botcommands.api.localization.DefaultMessages
-import net.dv8tion.jda.api.Permission
-import net.dv8tion.jda.api.events.GenericEvent
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent
-import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent
-import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.commands.CommandInteractionPayload
-import net.dv8tion.jda.api.utils.TimeFormat
-import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder
-import net.dv8tion.jda.api.utils.messages.MessageCreateData
-import java.time.Instant
-
-internal class BotCommandsMessagesDefaultMessagesAdapter internal constructor(
- private val defaultMessages: DefaultMessages,
-) : BotCommandsMessages {
-
- override fun uncaughtException(event: GenericEvent): MessageCreateData {
- return defaultMessages.generalErrorMsg.toMessage()
- }
-
- override fun missingUserPermissions(event: GenericEvent, permissions: Set): MessageCreateData {
- return defaultMessages.getUserPermErrorMsg(permissions).toMessage()
- }
-
- override fun missingBotPermissions(event: GenericEvent, permissions: Set): MessageCreateData {
- return defaultMessages.getBotPermErrorMsg(permissions).toMessage()
- }
-
- override fun ownerOnly(event: GenericEvent): MessageCreateData {
- return defaultMessages.ownerOnlyErrorMsg.toMessage()
- }
-
- override fun userRateLimited(event: GenericEvent, deadline: Instant): MessageCreateData {
- return defaultMessages.getUserRateLimitMsg(TimeFormat.RELATIVE.atInstant(deadline)).toMessage()
- }
-
- override fun channelRateLimited(event: GenericEvent, deadline: Instant): MessageCreateData {
- return defaultMessages.getChannelRateLimitMsg(TimeFormat.RELATIVE.atInstant(deadline)).toMessage()
- }
-
- override fun guildRateLimited(event: GenericEvent, deadline: Instant): MessageCreateData {
- return defaultMessages.getGuildRateLimitMsg(TimeFormat.RELATIVE.atInstant(deadline)).toMessage()
- }
-
- override fun applicationCommandsNotAvailable(event: GenericCommandInteractionEvent): MessageCreateData {
- return defaultMessages.applicationCommandsNotAvailableMsg.toMessage()
- }
-
- override fun commandNotFound(event: MessageReceivedEvent, suggestions: Collection): MessageCreateData {
- val suggestionsStr = suggestions.joinToString(separator = "**, **", prefix = "**", postfix = "**") { it.name }
- return defaultMessages.getCommandNotFoundMsg(suggestionsStr).toMessage()
- }
-
- override fun resolverChannelNotFound(event: GenericEvent, channelId: Long): MessageCreateData {
- return defaultMessages.resolverChannelNotFoundMsg.toMessage()
- }
-
- override fun resolverChannelMissingAccess(event: GenericEvent, channelId: Long): MessageCreateData {
- return defaultMessages.getResolverChannelMissingAccessMsg("<#$channelId>").toMessage()
- }
-
- override fun resolverUserNotFound(event: GenericEvent, userId: Long): MessageCreateData {
- return defaultMessages.resolverUserNotFoundMsg.toMessage()
- }
-
- override fun slashCommandUnresolvableOption(event: CommandInteractionPayload, option: SlashCommandOption): MessageCreateData {
- return defaultMessages.getSlashCommandUnresolvableOptionMsg(option.discordName).toMessage()
- }
-
- override fun closedDirectMessages(event: GenericEvent): MessageCreateData {
- return defaultMessages.closedDMErrorMsg.toMessage()
- }
-
- override fun nsfwOnly(event: GenericEvent): MessageCreateData {
- return defaultMessages.nsfwOnlyErrorMsg.toMessage()
- }
-
- override fun componentNotAllowed(event: GenericComponentInteractionCreateEvent): MessageCreateData {
- return defaultMessages.componentNotAllowedErrorMsg.toMessage()
- }
-
- override fun componentExpired(event: GenericComponentInteractionCreateEvent): MessageCreateData {
- return defaultMessages.componentExpiredErrorMsg.toMessage()
- }
-
- override fun modalExpired(event: ModalInteractionEvent): MessageCreateData {
- return defaultMessages.modalExpiredErrorMsg.toMessage()
- }
-
- private fun String.toMessage(): MessageCreateData =
- MessageCreateBuilder()
- .setContent(this)
- .useComponentsV2(false)
- .build()
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryAutoConfiguration.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryAutoConfiguration.kt
index 8dfb17b53..60d59dd56 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryAutoConfiguration.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryAutoConfiguration.kt
@@ -1,23 +1,14 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.internal.core.messages.autoconfigure
-import io.github.classgraph.ClassGraph
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
import io.github.freya022.botcommands.api.core.messages.DefaultBotCommandsMessagesFactory
import io.github.freya022.botcommands.api.core.service.annotations.ConditionalOnMissingService
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
import io.github.freya022.botcommands.api.localization.LocalizationService
import io.github.freya022.botcommands.api.localization.PermissionLocalization
import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
import io.github.freya022.botcommands.internal.core.service.annotations.InternalAutoConfiguration
import io.github.freya022.botcommands.internal.core.service.annotations.InternalAutoConfigurationBeanService
-import io.github.freya022.botcommands.internal.localization.autoconfigure.FallbackDefaultMessagesFactory
-import io.github.freya022.botcommands.internal.utils.classRef
-import io.github.oshai.kotlinlogging.KotlinLogging
-
-private val logger = KotlinLogging.logger { }
@InternalAutoConfiguration
internal open class BotCommandsMessagesFactoryAutoConfiguration internal constructor() {
@@ -25,18 +16,11 @@ internal open class BotCommandsMessagesFactoryAutoConfiguration internal constru
@InternalAutoConfigurationBeanService
@ConditionalOnMissingService(BotCommandsMessagesFactory::class)
open fun botCommandsMessagesFactory(
- defaultMessagesFactory: DefaultMessagesFactory,
permissionLocalization: PermissionLocalization,
localizationService: LocalizationService,
textCommandLocaleProvider: TextCommandLocaleProvider,
userLocaleProvider: UserLocaleProvider,
): BotCommandsMessagesFactory {
- // Check if the user has a custom factory or if the fallback factory has customized files
- if (defaultMessagesFactory !is FallbackDefaultMessagesFactory || hasCustomDefaultMessages()) {
- logger.warn { "${classRef()} has been deprecated and will be removed in the full release." }
- return BotCommandsMessagesFactoryDefaultMessagesFactoryAdapter(defaultMessagesFactory)
- }
-
return DefaultBotCommandsMessagesFactory(
permissionLocalization,
localizationService,
@@ -44,18 +28,4 @@ internal open class BotCommandsMessagesFactoryAutoConfiguration internal constru
userLocaleProvider
)
}
-
- private fun hasCustomDefaultMessages(): Boolean {
- // The base name is guaranteed to be "DefaultMessages" as it is hardcoded in [[DefaultMessages]]
- return ClassGraph()
- .acceptPathsNonRecursive("bc_localization")
- .scan()
- .use { scan ->
- scan.allResources
- .any {
- val path = it.path
- path.startsWith("bc_localization/DefaultMessages") && !path.startsWith("bc_localization/DefaultMessages-default")
- }
- }
- }
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryDefaultMessagesFactoryAdapter.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryDefaultMessagesFactoryAdapter.kt
deleted file mode 100644
index e6ffb635e..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/messages/autoconfigure/BotCommandsMessagesFactoryDefaultMessagesFactoryAdapter.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-@file:Suppress("removal", "DEPRECATION")
-
-package io.github.freya022.botcommands.internal.core.messages.autoconfigure
-
-import io.github.freya022.botcommands.api.core.messages.BotCommandsMessages
-import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.Interaction
-import java.util.*
-
-internal class BotCommandsMessagesFactoryDefaultMessagesFactoryAdapter internal constructor(
- private val defaultMessagesFactory: DefaultMessagesFactory,
-) : BotCommandsMessagesFactory {
-
- override fun get(locale: Locale): BotCommandsMessages {
- return BotCommandsMessagesDefaultMessagesAdapter(defaultMessagesFactory.get(locale))
- }
-
- override fun get(event: MessageReceivedEvent): BotCommandsMessages {
- return BotCommandsMessagesDefaultMessagesAdapter(defaultMessagesFactory.get(event))
- }
-
- override fun get(event: Interaction): BotCommandsMessages {
- return BotCommandsMessagesDefaultMessagesAdapter(defaultMessagesFactory.get(event))
- }
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/service/BCServiceContainerImpl.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/service/BCServiceContainerImpl.kt
index 62a431927..1f85d1110 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/service/BCServiceContainerImpl.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/service/BCServiceContainerImpl.kt
@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.internal.core.service
import io.github.freya022.botcommands.api.core.config.BServiceConfig
@@ -31,8 +29,7 @@ private val logger = KotlinLogging.loggerOf()
internal class BCServiceContainerImpl internal constructor(
internal val serviceBootstrap: BCBotCommandsBootstrap
-) : BCServiceContainer,
- DefaultServiceContainer {
+) : BCServiceContainer {
internal val serviceConfig: BServiceConfig get() = serviceBootstrap.serviceConfig
internal val serviceProviders: ServiceProviders get() = serviceBootstrap.serviceProviders
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/waiter/EventWaiterImpl.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/waiter/EventWaiterImpl.kt
index 25082c93e..14887a20b 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/waiter/EventWaiterImpl.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/core/waiter/EventWaiterImpl.kt
@@ -130,8 +130,7 @@ internal class EventWaiterImpl(context: BContextImpl) : EventWaiter {
}
}
- @Suppress("DEPRECATION")
- private val warnedEventTypes: MutableSet> = context.config.ignoredEventIntents.toMutableSet()
+ private val warnedEventTypes: MutableSet> = hashSetOf()
private fun checkEventIntents(eventType: Class) {
val requiredIntents = GatewayIntent.fromEvents(eventType)
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/LocalizationContextImpl.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/LocalizationContextImpl.kt
index 57925413f..f691b4254 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/LocalizationContextImpl.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/LocalizationContextImpl.kt
@@ -7,7 +7,6 @@ import io.github.freya022.botcommands.api.localization.context.TextLocalizationC
import io.github.freya022.botcommands.internal.utils.LocalizationUtils
import io.github.freya022.botcommands.internal.utils.throwArgument
import io.github.freya022.botcommands.internal.utils.throwInternal
-import net.dv8tion.jda.api.interactions.DiscordLocale
import java.util.*
internal class LocalizationContextImpl(
@@ -43,18 +42,10 @@ internal class LocalizationContextImpl(
}
}
- @Deprecated("Use the Locale overload")
- override fun withGuildLocale(guildLocale: DiscordLocale?): LocalizationContextImpl =
- withGuildLocale(guildLocale?.toLocale())
-
override fun withGuildLocale(guildLocale: Locale?): LocalizationContextImpl {
return LocalizationContextImpl(localizationService, localizationBundle, localizationPrefix, guildLocale?.toProvider(), _userLocaleProvider)
}
- @Deprecated("Use the Locale overload")
- override fun withUserLocale(userLocale: DiscordLocale?): LocalizationContextImpl =
- withUserLocale(userLocale?.toLocale())
-
override fun withUserLocale(userLocale: Locale?): LocalizationContextImpl {
return LocalizationContextImpl(localizationService, localizationBundle, localizationPrefix, _guildLocaleProvider, userLocale?.toProvider())
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/autoconfigure/DefaultMessagesFactoryAutoConfiguration.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/autoconfigure/DefaultMessagesFactoryAutoConfiguration.kt
deleted file mode 100644
index 04292812b..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/autoconfigure/DefaultMessagesFactoryAutoConfiguration.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-@file:Suppress("removal", "DEPRECATION")
-
-package io.github.freya022.botcommands.internal.localization.autoconfigure
-
-import io.github.freya022.botcommands.api.core.service.annotations.ConditionalOnMissingService
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
-import io.github.freya022.botcommands.api.localization.LocalizationService
-import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
-import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
-import io.github.freya022.botcommands.internal.core.service.annotations.InternalAutoConfiguration
-import io.github.freya022.botcommands.internal.core.service.annotations.InternalAutoConfigurationBeanService
-
-@InternalAutoConfiguration
-internal open class DefaultMessagesFactoryAutoConfiguration {
-
- @InternalAutoConfigurationBeanService
- @ConditionalOnMissingService(DefaultMessagesFactory::class)
- open fun defaultMessagesFactory(
- localizationService: LocalizationService,
- textCommandLocaleProvider: TextCommandLocaleProvider,
- userLocaleProvider: UserLocaleProvider,
- ): DefaultMessagesFactory {
- return FallbackDefaultMessagesFactory(localizationService, textCommandLocaleProvider, userLocaleProvider)
- }
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/autoconfigure/FallbackDefaultMessagesFactory.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/autoconfigure/FallbackDefaultMessagesFactory.kt
deleted file mode 100644
index 692b911ae..000000000
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/autoconfigure/FallbackDefaultMessagesFactory.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-@file:Suppress("removal", "DEPRECATION")
-
-package io.github.freya022.botcommands.internal.localization.autoconfigure
-
-import io.github.freya022.botcommands.api.localization.DefaultMessages
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
-import io.github.freya022.botcommands.api.localization.LocalizationService
-import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
-import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.Interaction
-import java.util.*
-
-internal class FallbackDefaultMessagesFactory internal constructor(
- private val localizationService: LocalizationService,
- private val textCommandLocaleProvider: TextCommandLocaleProvider,
- private val userLocaleProvider: UserLocaleProvider,
-): DefaultMessagesFactory {
- private val cache: MutableMap = hashMapOf()
-
- override fun get(locale: Locale): DefaultMessages = cache.computeIfAbsent(locale) {
- DefaultMessages(localizationService, it)
- }
-
- override fun get(event: MessageReceivedEvent): DefaultMessages {
- return get(textCommandLocaleProvider.getLocale(event))
- }
-
- override fun get(event: Interaction): DefaultMessages {
- return get(userLocaleProvider.getLocale(event))
- }
-}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionFactory.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionFactory.kt
index 9c51765ce..6b4d4481e 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionFactory.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionFactory.kt
@@ -1,11 +1,8 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.internal.localization.interaction
import io.github.freya022.botcommands.api.core.config.BLocalizationConfig
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
import io.github.freya022.botcommands.api.core.service.annotations.BService
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
import io.github.freya022.botcommands.api.localization.LocalizationService
import io.github.freya022.botcommands.api.localization.interaction.GuildLocaleProvider
import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
@@ -18,9 +15,8 @@ internal class LocalizableInteractionFactory internal constructor(
private val localizationConfig: BLocalizationConfig,
private val userLocaleProvider: UserLocaleProvider,
private val guildLocaleProvider: GuildLocaleProvider,
- private val defaultMessagesFactory: DefaultMessagesFactory,
private val messagesFactory: BotCommandsMessagesFactory,
) {
internal fun create(event: IReplyCallback) =
- LocalizableInteractionImpl(event, localizationService, localizationConfig, userLocaleProvider, guildLocaleProvider, defaultMessagesFactory, messagesFactory)
-}
\ No newline at end of file
+ LocalizableInteractionImpl(event, localizationService, localizationConfig, userLocaleProvider, guildLocaleProvider, messagesFactory)
+}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionImpl.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionImpl.kt
index 6cc43def2..0167d6158 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionImpl.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/LocalizableInteractionImpl.kt
@@ -1,12 +1,8 @@
-@file:Suppress("removal", "DEPRECATION")
-
package io.github.freya022.botcommands.internal.localization.interaction
import io.github.freya022.botcommands.api.core.config.BLocalizationConfig
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessages
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
-import io.github.freya022.botcommands.api.localization.DefaultMessages
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
import io.github.freya022.botcommands.api.localization.Localization
import io.github.freya022.botcommands.api.localization.LocalizationService
import io.github.freya022.botcommands.api.localization.context.AppLocalizationContext
@@ -25,7 +21,6 @@ internal class LocalizableInteractionImpl internal constructor(
localizationConfig: BLocalizationConfig,
private val userLocaleProvider: UserLocaleProvider,
private val guildLocaleProvider: GuildLocaleProvider,
- private val defaultMessagesFactory: DefaultMessagesFactory,
private val messagesFactory: BotCommandsMessagesFactory,
) : AbstractLocalizableAction(localizationConfig, localizationService),
LocalizableInteraction {
@@ -41,12 +36,6 @@ internal class LocalizableInteractionImpl internal constructor(
.build()
}
- @Suppress("DEPRECATION", "removal")
- @Deprecated("Replaced with getBotCommandsMessages()")
- override fun getDefaultMessages(): DefaultMessages {
- return defaultMessagesFactory.get(deferrableCallback)
- }
-
override fun getBotCommandsMessages(): BotCommandsMessages {
return messagesFactory.get(deferrableCallback)
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultGuildLocaleProvider.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultGuildLocaleProvider.kt
index 9f1b71384..cc6d3f6ab 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultGuildLocaleProvider.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultGuildLocaleProvider.kt
@@ -1,14 +1,10 @@
package io.github.freya022.botcommands.internal.localization.interaction.autoconfigure
import io.github.freya022.botcommands.api.localization.interaction.GuildLocaleProvider
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.Interaction
import java.util.*
internal object DefaultGuildLocaleProvider : GuildLocaleProvider {
- @Deprecated("Use 'getLocale' instead, use 'DiscordLocale.from' / 'DiscordLocale#toLocale' if necessary")
- override fun getDiscordLocale(interaction: Interaction): DiscordLocale = interaction.guildLocale
-
override fun getLocale(interaction: Interaction): Locale = interaction.guildLocale.toLocale()
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultUserLocaleProvider.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultUserLocaleProvider.kt
index df0c52566..dec44ab62 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultUserLocaleProvider.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/interaction/autoconfigure/DefaultUserLocaleProvider.kt
@@ -1,14 +1,10 @@
package io.github.freya022.botcommands.internal.localization.interaction.autoconfigure
import io.github.freya022.botcommands.api.localization.interaction.UserLocaleProvider
-import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.interactions.Interaction
import java.util.*
internal object DefaultUserLocaleProvider : UserLocaleProvider {
- @Deprecated("Use 'getLocale' instead, use 'DiscordLocale.from' / 'DiscordLocale#toLocale' if necessary")
- override fun getDiscordLocale(interaction: Interaction): DiscordLocale = interaction.userLocale
-
override fun getLocale(interaction: Interaction): Locale = interaction.userLocale.toLocale()
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandFactory.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandFactory.kt
index a75a5aadd..b22ec93d6 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandFactory.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandFactory.kt
@@ -1,11 +1,8 @@
-@file:Suppress("DEPRECATION")
-
package io.github.freya022.botcommands.internal.localization.text
import io.github.freya022.botcommands.api.core.config.BLocalizationConfig
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
import io.github.freya022.botcommands.api.core.service.annotations.BService
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
import io.github.freya022.botcommands.api.localization.LocalizationService
import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
import net.dv8tion.jda.api.events.message.MessageReceivedEvent
@@ -16,9 +13,8 @@ internal class LocalizableTextCommandFactory internal constructor(
private val localizationService: LocalizationService,
private val localizationConfig: BLocalizationConfig,
private val localeProvider: TextCommandLocaleProvider,
- private val defaultMessagesFactory: DefaultMessagesFactory,
private val messagesFactory: BotCommandsMessagesFactory,
) {
internal fun create(event: MessageReceivedEvent) =
- LocalizableTextCommandImpl(event, localizationService, localizationConfig, localeProvider, defaultMessagesFactory, messagesFactory)
-}
\ No newline at end of file
+ LocalizableTextCommandImpl(event, localizationService, localizationConfig, localeProvider, messagesFactory)
+}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandImpl.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandImpl.kt
index ee660c419..5b9c5a000 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandImpl.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/LocalizableTextCommandImpl.kt
@@ -1,12 +1,8 @@
-@file:Suppress("removal", "DEPRECATION")
-
package io.github.freya022.botcommands.internal.localization.text
import io.github.freya022.botcommands.api.core.config.BLocalizationConfig
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessages
import io.github.freya022.botcommands.api.core.messages.BotCommandsMessagesFactory
-import io.github.freya022.botcommands.api.localization.DefaultMessages
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
import io.github.freya022.botcommands.api.localization.Localization
import io.github.freya022.botcommands.api.localization.LocalizationService
import io.github.freya022.botcommands.api.localization.context.LocalizationContext
@@ -23,7 +19,6 @@ internal class LocalizableTextCommandImpl internal constructor(
localizationService: LocalizationService,
localizationConfig: BLocalizationConfig,
private val localeProvider: TextCommandLocaleProvider,
- private val defaultMessagesFactory: DefaultMessagesFactory,
private val messagesFactory: BotCommandsMessagesFactory,
) : AbstractLocalizableAction(localizationConfig, localizationService), LocalizableTextCommand {
private val locale: Locale by lazy { localeProvider.getLocale(event) }
@@ -35,12 +30,6 @@ internal class LocalizableTextCommandImpl internal constructor(
.build()
}
- @Suppress("DEPRECATION", "removal")
- @Deprecated("Replaced with getBotCommandsMessages()")
- override fun getDefaultMessages(): DefaultMessages {
- return defaultMessagesFactory.get(locale)
- }
-
override fun getBotCommandsMessages(): BotCommandsMessages {
return messagesFactory.get(locale)
}
diff --git a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/autoconfigure/DefaultTextCommandLocaleProvider.kt b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/autoconfigure/DefaultTextCommandLocaleProvider.kt
index 7ea2ad142..862f63038 100644
--- a/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/autoconfigure/DefaultTextCommandLocaleProvider.kt
+++ b/BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/localization/text/autoconfigure/DefaultTextCommandLocaleProvider.kt
@@ -2,13 +2,9 @@ package io.github.freya022.botcommands.internal.localization.text.autoconfigure
import io.github.freya022.botcommands.api.localization.text.TextCommandLocaleProvider
import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.DiscordLocale
import java.util.*
internal object DefaultTextCommandLocaleProvider : TextCommandLocaleProvider {
- @Deprecated("Use 'getLocale' instead, use 'DiscordLocale.from' / 'DiscordLocale#toLocale' if necessary")
- override fun getDiscordLocale(event: MessageReceivedEvent): DiscordLocale = event.guild.locale
-
override fun getLocale(event: MessageReceivedEvent): Locale = event.guild.locale.toLocale()
}
diff --git a/BotCommands-core/src/test/kotlin/io/github/freya022/botcommands/messages/BotCommandsMessagesTests.kt b/BotCommands-core/src/test/kotlin/io/github/freya022/botcommands/messages/BotCommandsMessagesTests.kt
index 812ef5b9b..08987b890 100644
--- a/BotCommands-core/src/test/kotlin/io/github/freya022/botcommands/messages/BotCommandsMessagesTests.kt
+++ b/BotCommands-core/src/test/kotlin/io/github/freya022/botcommands/messages/BotCommandsMessagesTests.kt
@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION", "removal")
-
package io.github.freya022.botcommands.messages
import dev.freya02.botcommands.helpers.AbstractIntegrationTest
@@ -10,61 +8,19 @@ import io.github.freya022.botcommands.api.core.messages.DefaultBotCommandsMessag
import io.github.freya022.botcommands.api.core.messages.exceptions.MissingMessageTemplateException
import io.github.freya022.botcommands.api.core.service.getService
import io.github.freya022.botcommands.api.core.utils.joinAsList
-import io.github.freya022.botcommands.api.localization.DefaultMessages
-import io.github.freya022.botcommands.api.localization.DefaultMessagesFactory
-import io.github.freya022.botcommands.internal.core.messages.autoconfigure.BotCommandsMessagesFactoryAutoConfiguration
import io.mockk.every
import io.mockk.mockk
import io.mockk.slot
import io.mockk.spyk
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent
-import net.dv8tion.jda.api.interactions.Interaction
import net.dv8tion.jda.api.utils.messages.MessageCreateData
import java.time.Instant
import java.util.*
import kotlin.reflect.KFunction
import kotlin.test.Test
-import kotlin.test.assertIsNot
import kotlin.test.fail
class BotCommandsMessagesTests : AbstractIntegrationTest() {
- @Test
- fun `Adapter is used when custom DefaultMessagesFactory type is used`() {
- val context = createTest {
- services {
- registerServiceSupplier {
- object : DefaultMessagesFactory {
- override fun get(locale: Locale): DefaultMessages = throw UnsupportedOperationException()
- override fun get(event: MessageReceivedEvent) = throw UnsupportedOperationException()
- override fun get(event: Interaction) = throw UnsupportedOperationException()
- }
- }
- }
- }
-
- assertIsNot(context.getService())
- }
-
- @Test
- fun `Adapter is used when custom DefaultMessages JSON exists`() {
- val context = createTest {
- services {
- registerServiceSupplier {
- mockk {
- every {
- botCommandsMessagesFactory(any(), any(), any(), any(), any())
- } answers { callOriginal() }
-
- every { this@mockk["hasCustomDefaultMessages"]() } returns true
- }
- }
- }
- }
-
- assertIsNot(context.getService())
- }
-
@Test
fun `All messages have defaults`() {
val context = createTest {
diff --git a/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/api/core/config/JDAConfiguration.kt b/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/api/core/config/JDAConfiguration.kt
index 876dde766..008f4f9a8 100644
--- a/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/api/core/config/JDAConfiguration.kt
+++ b/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/api/core/config/JDAConfiguration.kt
@@ -2,16 +2,10 @@ package io.github.freya022.botcommands.api.core.config
import io.github.freya022.botcommands.api.core.JDAService
import io.github.freya022.botcommands.internal.core.config.ConfigurationValue
-import io.github.freya022.botcommands.internal.core.config.DeprecatedValue
import io.github.freya022.botcommands.internal.core.config.IgnoreDefaultValue
import net.dv8tion.jda.api.requests.GatewayIntent
import net.dv8tion.jda.api.utils.cache.CacheFlag
import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.bind.Name
-import org.springframework.context.event.ContextClosedEvent
-import java.time.Duration as JavaDuration
-import kotlin.time.Duration
-import kotlin.time.toKotlinDuration
/**
* Configuration properties for [JDAService].
@@ -38,36 +32,4 @@ class JDAConfiguration internal constructor(
@IgnoreDefaultValue
@ConfigurationValue("jda.cacheFlags")
val cacheFlags: Set = emptySet(),
- @Suppress("DEPRECATION")
- @param:Name("devtools")
- @Deprecated("For removal")
- val devTools: DevTools = DevTools(),
-) {
-
- @Deprecated("For removal")
- class DevTools internal constructor(
- /**
- * When Spring devtools are enabled,
- * enables shutting down JDA when the IoC container [closes][ContextClosedEvent].
- *
- * If you disable this, you must shut down JDA manually,
- * not doing so will let old instances run, receive events and cause unwanted behavior.
- *
- * Default: `true`
- */
- @ConfigurationValue("jda.devtools.enabled", defaultValue = "true")
- @Deprecated("Replaced by the built-in shutdown hook")
- @DeprecatedValue("Replaced by the built-in shutdown hook", replacement = "botcommands.core.enableShutdownHook")
- val enabled: Boolean = true,
- shutdownTimeout: JavaDuration = JavaDuration.ofSeconds(10),
- ) {
- /**
- * Time to wait until JDA needs to be forcefully shut down,
- * in other words, this is the allowed time for a graceful shutdown.
- */
- @Deprecated("For removal, shutdown is always forced")
- @DeprecatedValue("For removal, shutdown is always forced")
- @ConfigurationValue("jda.devtools.shutdownTimeout", type = "java.time.Duration", defaultValue = "10s")
- val shutdownTimeout: Duration = shutdownTimeout.toKotlinDuration()
- }
-}
+)
diff --git a/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/internal/core/config/BotCommandsConfigurations.kt b/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/internal/core/config/BotCommandsConfigurations.kt
index a96781124..d561ecd1b 100644
--- a/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/internal/core/config/BotCommandsConfigurations.kt
+++ b/BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/internal/core/config/BotCommandsConfigurations.kt
@@ -5,7 +5,6 @@ import io.github.freya022.botcommands.api.core.config.*
import io.github.freya022.botcommands.api.core.config.application.cache.ApplicationCommandsCacheConfig
import io.github.freya022.botcommands.api.core.config.application.cache.ApplicationCommandsCacheConfigBuilder
import io.github.freya022.botcommands.api.utils.EmojiUtils
-import net.dv8tion.jda.api.events.Event
import net.dv8tion.jda.api.interactions.DiscordLocale
import net.dv8tion.jda.api.requests.GatewayIntent
import org.springframework.boot.context.properties.ConfigurationProperties
@@ -23,8 +22,6 @@ internal class BotCommandsCoreConfiguration(
override val disableExceptionsInDMs: Boolean = false,
override val enableOwnerBypass: Boolean = false,
override val ignoredIntents: Set = emptySet(),
- @Deprecated("Replaced by EventWaiterBuilder.ignoreMissingIntents()")
- override val ignoredEventIntents: Set> = emptySet(),
override val ignoreRestRateLimiter: Boolean = false,
override val enableShutdownHook: Boolean = true,
) : BConfigProps {
@@ -38,8 +35,6 @@ internal fun BConfigBuilder.applyConfig(configuration: BotCommandsCoreConfigurat
disableExceptionsInDMs = configuration.disableExceptionsInDMs
enableOwnerBypass = configuration.enableOwnerBypass
ignoredIntents += configuration.ignoredIntents
- @Suppress("DEPRECATION")
- ignoredEventIntents += configuration.ignoredEventIntents
ignoreRestRateLimiter = configuration.ignoreRestRateLimiter
}
From 9929eff04dfcb627828dec2c8e2bbd3f00c72f9c Mon Sep 17 00:00:00 2001
From: freya02 <41875020+freya022@users.noreply.github.com>
Date: Fri, 13 Mar 2026 17:44:10 +0100
Subject: [PATCH 2/7] jda-ktx: Remove deprecated migration helpers
---
BotCommands-jda-ktx/build.gradle.kts | 6 -
.../freya02/botcommands/jda/ktx/Channels.kt | 3 -
.../botcommands/jda/ktx/DeprecatedInBcCore.kt | 4 -
.../dev/freya02/botcommands/jda/ktx/Files.kt | 1 -
.../freya02/botcommands/jda/ktx/Mentions.kt | 1 -
.../botcommands/jda/ktx/ReplaceJdaKtx.kt | 4 -
.../jda/ktx/components/ActionRow.kt | 6 -
.../jda/ktx/components/IDisableable.kt | 7 -
.../jda/ktx/components/SelectMenus.kt | 3 -
.../jda/ktx/coroutines/Coroutines.kt | 4 -
.../jda/ktx/durations/Durations.kt | 16 --
.../jda/ktx/messages/ContentIntent.kt | 2 -
.../jda/ktx/messages/Converters.kt | 3 -
.../botcommands/jda/ktx/messages/Deletes.kt | 4 -
.../botcommands/jda/ktx/messages/Editing.kt | 5 -
.../botcommands/jda/ktx/messages/EditingTo.kt | 4 -
.../botcommands/jda/ktx/messages/Messages.kt | 11 -
.../jda/ktx/messages/ReplacingWith.kt | 4 -
.../botcommands/jda/ktx/messages/Sending.kt | 5 -
.../botcommands/jda/ktx/messages/SendingTo.kt | 4 -
.../botcommands/jda/ktx/ranges/Ranges.kt | 2 -
.../jda/ktx/requests/ErrorResponses.kt | 4 -
.../jda/ktx/requests/RestAction.kt | 6 -
.../jda/ktx/requests/RestResult.kt | 15 --
.../botcommands/jda/ktx/retrieve/Guild.kt | 8 -
.../retrieve/InvalidChannelTypeException.kt | 3 -
.../botcommands/jda/ktx/retrieve/JDA.kt | 8 -
.../jda/ktx/MigrationSnapshotTest.kt | 37 ---
.../src/test/resources/ksp_snapshot.zip | Bin 16321 -> 0 bytes
.../build.gradle.kts | 23 --
.../jda/ktx/deprecation/utils/KaAccessor.java | 14 --
.../jda/ktx/deprecation/CompatSourceFile.kt | 10 -
.../jda/ktx/deprecation/FindReplacePairs.kt | 24 --
.../jda/ktx/deprecation/RewriteFindReplace.kt | 19 --
.../aggregate/AggregateMigrationProcessor.kt | 41 ----
.../AggregateMigrationProcessorProvider.kt | 14 --
.../processor/bc/DeprecationProcessor.kt | 211 ------------------
.../bc/DeprecationProcessorProvider.kt | 14 --
.../processor/ktx/JdaKtxClassProcessor.kt | 26 ---
.../processor/ktx/JdaKtxFunctionProcessor.kt | 40 ----
.../processor/ktx/JdaKtxMigrationProcessor.kt | 111 ---------
.../ktx/JdaKtxMigrationProcessorProvider.kt | 15 --
.../jda/ktx/deprecation/render/KtRenderers.kt | 104 ---------
.../jda/ktx/deprecation/utils/Collections.kt | 9 -
.../jda/ktx/deprecation/utils/Recipe.kt | 31 ---
.../utils/RichKotlinClassMetadata.kt | 8 -
.../jda/ktx/deprecation/utils/Strings.kt | 8 -
...ols.ksp.processing.SymbolProcessorProvider | 3 -
settings.gradle.kts | 1 -
49 files changed, 906 deletions(-)
delete mode 100644 BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/DeprecatedInBcCore.kt
delete mode 100644 BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ReplaceJdaKtx.kt
delete mode 100644 BotCommands-jda-ktx/src/test/kotlin/dev/freya02/botcommands/jda/ktx/MigrationSnapshotTest.kt
delete mode 100644 BotCommands-jda-ktx/src/test/resources/ksp_snapshot.zip
delete mode 100644 jda-ktx-deprecation-processor/build.gradle.kts
delete mode 100644 jda-ktx-deprecation-processor/src/main/java/dev/freya02/botcommands/jda/ktx/deprecation/utils/KaAccessor.java
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/CompatSourceFile.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/FindReplacePairs.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/RewriteFindReplace.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/aggregate/AggregateMigrationProcessor.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/aggregate/AggregateMigrationProcessorProvider.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/bc/DeprecationProcessor.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/bc/DeprecationProcessorProvider.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/ktx/JdaKtxClassProcessor.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/ktx/JdaKtxFunctionProcessor.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/ktx/JdaKtxMigrationProcessor.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/processor/ktx/JdaKtxMigrationProcessorProvider.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/render/KtRenderers.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/utils/Collections.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/utils/Recipe.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/utils/RichKotlinClassMetadata.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/kotlin/dev/freya02/botcommands/jda/ktx/deprecation/utils/Strings.kt
delete mode 100644 jda-ktx-deprecation-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
diff --git a/BotCommands-jda-ktx/build.gradle.kts b/BotCommands-jda-ktx/build.gradle.kts
index b943cc508..4746cd3f4 100644
--- a/BotCommands-jda-ktx/build.gradle.kts
+++ b/BotCommands-jda-ktx/build.gradle.kts
@@ -5,8 +5,6 @@ plugins {
id("kotlin-conventions")
id("publish-conventions")
id("dokka-conventions")
-
- alias(libs.plugins.ksp)
}
dependencies {
@@ -15,8 +13,6 @@ dependencies {
compileOnly(libs.jda)
api(libs.kotlinx.coroutines.core)
- ksp(projects.jdaKtxDeprecationProcessor)
-
// -------------------- TEST DEPENDENCIES --------------------
testImplementation(libs.bundles.test)
@@ -29,8 +25,6 @@ dependencies {
tasks.named("test") {
useJUnitPlatform()
-
- environment("KSP_OUTPUT", layout.buildDirectory.dir("generated/ksp").get().asFile.path)
}
publishedProjectEnvironment {
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Channels.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Channels.kt
index 3387bf4b3..2174ce73c 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Channels.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Channels.kt
@@ -6,17 +6,14 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel
/**
* Same as [IGuildChannelContainer.getChannelById] but with a reified type parameter.
*/
-@ReplaceJdaKtx
inline fun IGuildChannelContainer.getChannel(id: Long): T? = getChannelById(T::class.java, id)
/**
* Same as [IGuildChannelContainer.getChannelById] but with a reified type parameter.
*/
-@ReplaceJdaKtx
inline fun IGuildChannelContainer.getChannel(id: String): T? = getChannelById(T::class.java, id)
/**
* Same as [IGuildChannelContainer.getChannelById] but with a reified type parameter.
*/
-@ReplaceJdaKtx
inline fun IGuildChannelContainer.getChannel(id: ULong): T? = getChannel(id.toLong())
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/DeprecatedInBcCore.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/DeprecatedInBcCore.kt
deleted file mode 100644
index a816388b9..000000000
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/DeprecatedInBcCore.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.freya02.botcommands.jda.ktx
-
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class DeprecatedInBcCore
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Files.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Files.kt
index 78c3b0998..d1f26d05a 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Files.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Files.kt
@@ -2,5 +2,4 @@ package dev.freya02.botcommands.jda.ktx
import net.dv8tion.jda.api.utils.FileUpload
-@ReplaceJdaKtx("dev.minn.jda.ktx.messages")
fun FileUpload.into() = listOf(this)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Mentions.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Mentions.kt
index eea603d9f..c527ead0f 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Mentions.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/Mentions.kt
@@ -7,7 +7,6 @@ import org.apache.commons.collections4.Bag
/**
* Same as [Mentions.getChannels] but with a reified type parameter.
*/
-@ReplaceJdaKtx
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun Mentions.getChannels(): List {
return getChannels(T::class.java)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ReplaceJdaKtx.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ReplaceJdaKtx.kt
deleted file mode 100644
index e7eb8df8f..000000000
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ReplaceJdaKtx.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.freya02.botcommands.jda.ktx
-
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class ReplaceJdaKtx(val pkg: String = "")
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/ActionRow.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/ActionRow.kt
index 944a9e952..931aa9770 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/ActionRow.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/ActionRow.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.components
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import net.dv8tion.jda.api.components.actionrow.ActionRow
import net.dv8tion.jda.api.components.actionrow.ActionRowChildComponent
import net.dv8tion.jda.api.components.buttons.Button
@@ -50,21 +49,16 @@ inline fun ActionRow(uniqueId: Int = -1, block: InlineActionRow.() -> Unit): Act
/**
* Construct an [ActionRow] from the provided components
*/
-@ReplaceJdaKtx
fun row(component: ActionRowChildComponent, vararg components: ActionRowChildComponent) = ActionRow.of(component, *components)
/**
* Construct an [ActionRow] from the provided components
*/
-@ReplaceJdaKtx
fun Collection.row() = ActionRow.of(this)
-@ReplaceJdaKtx("dev.minn.jda.ktx.messages")
@JvmName("intoComponents")
fun Collection.into(): List = listOf(this.row())
-@ReplaceJdaKtx("dev.minn.jda.ktx.messages")
fun ActionRowChildComponent.into(): List = row(this).into()
-@ReplaceJdaKtx("dev.minn.jda.ktx.messages")
fun T.into(): List = listOf(this)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/IDisableable.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/IDisableable.kt
index 08ad09e61..49cb8d6b5 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/IDisableable.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/IDisableable.kt
@@ -1,13 +1,11 @@
package dev.freya02.botcommands.jda.ktx.components
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import net.dv8tion.jda.api.components.Component
import net.dv8tion.jda.api.components.tree.ComponentTree
/**
* Returns a list containing the results of disabling/enabling each component in the original collection.
*/
-@ReplaceJdaKtx
@Suppress("UNCHECKED_CAST")
fun Iterable.withDisabled(disabled: Boolean): List =
ComponentTree.of(this.toList()).withDisabled(disabled).components as List
@@ -15,13 +13,11 @@ fun Iterable.withDisabled(disabled: Boolean): List =
/**
* Returns a list containing the results of disabling each component in the original collection.
*/
-@ReplaceJdaKtx
fun Iterable.asDisabled() = withDisabled(true)
/**
* Returns a list containing the results of enabling each component in the original collection.
*/
-@ReplaceJdaKtx
fun Iterable.asEnabled() = withDisabled(false)
/**
@@ -29,7 +25,6 @@ fun Iterable.asEnabled() = withDisabled(false)
*
* The operation is _intermediate_ and _stateless_.
*/
-@ReplaceJdaKtx
fun Sequence.withDisabled(disabled: Boolean) =
asIterable().withDisabled(disabled).asSequence()
@@ -38,7 +33,6 @@ fun Sequence.withDisabled(disabled: Boolean) =
*
* The operation is _intermediate_ and _stateless_.
*/
-@ReplaceJdaKtx
fun Sequence.asDisabled() = withDisabled(true)
/**
@@ -46,5 +40,4 @@ fun Sequence.asDisabled() = withDisabled(true)
*
* The operation is _intermediate_ and _stateless_.
*/
-@ReplaceJdaKtx
fun Sequence.asEnabled() = withDisabled(false)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/SelectMenus.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/SelectMenus.kt
index e50705197..8b4211617 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/SelectMenus.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/components/SelectMenus.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.components
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import net.dv8tion.jda.api.components.selections.SelectOption
import net.dv8tion.jda.api.components.selections.StringSelectMenu
import net.dv8tion.jda.api.entities.emoji.Emoji
@@ -14,7 +13,6 @@ import net.dv8tion.jda.api.entities.emoji.Emoji
* @param emoji The emoji of this option
* @param default Whether this option is selected by default
*/
-@ReplaceJdaKtx
fun SelectOption(
label: String,
value: String,
@@ -35,7 +33,6 @@ fun SelectOption(
* @param emoji The emoji of this option
* @param default Whether this option is selected by default
*/
-@ReplaceJdaKtx("dev.minn.jda.ktx.interactions.components")
fun StringSelectMenu.Builder.option(
label: String,
value: String,
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/coroutines/Coroutines.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/coroutines/Coroutines.kt
index f02526870..d69ddd48b 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/coroutines/Coroutines.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/coroutines/Coroutines.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.coroutines
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.future.await
@@ -14,13 +13,11 @@ import kotlin.coroutines.resumeWithException
/**
* Suspends until the REST request is finished and returns the result.
*/
-@ReplaceJdaKtx("dev.minn.jda.ktx.coroutines")
suspend fun RestAction.await(): T = submit(true).await()
/**
* Suspends until the gateway request is finished and returns the result.
*/
-@ReplaceJdaKtx("dev.minn.jda.ktx.coroutines")
suspend fun Task.await(): T = suspendCancellableCoroutine { cont ->
cont.invokeOnCancellation { cancel() }
onSuccess { r -> cont.resume(r) }
@@ -30,7 +27,6 @@ suspend fun Task.await(): T = suspendCancellableCoroutine { cont ->
/**
* Converts the pagination action to a [Flow].
*/
-@ReplaceJdaKtx
fun PaginationAction.asFlow(): Flow = flow {
cache(false)
var elements: List = await()
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/durations/Durations.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/durations/Durations.kt
index cbb9d061a..67ee8aa7e 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/durations/Durations.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/durations/Durations.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.durations
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.JDA
import net.dv8tion.jda.api.entities.BulkBanResponse
import net.dv8tion.jda.api.entities.Guild
@@ -25,21 +24,18 @@ import kotlin.time.toJavaDuration
/**
* @see RestAction.delay
*/
-@DeprecatedInBcCore
fun RestAction.delay(duration: Duration): RestAction =
delay(duration.toJavaDuration())
/**
* @see RestAction.delay
*/
-@DeprecatedInBcCore
fun RestAction.delay(duration: Duration, scheduler: ScheduledExecutorService): RestAction =
delay(duration.toJavaDuration(), scheduler)
/**
* @see RestAction.timeout
*/
-@DeprecatedInBcCore
@Suppress("UNCHECKED_CAST")
fun > T.timeout(duration: Duration): T =
timeout(duration.inWholeMilliseconds, TimeUnit.MILLISECONDS) as T
@@ -47,72 +43,60 @@ fun > T.timeout(duration: Duration): T =
/**
* @see JDA.awaitShutdown
*/
-@DeprecatedInBcCore
fun JDA.awaitShutdown(timeout: Duration): Boolean = awaitShutdown(timeout.toJavaDuration())
/**
* @see Guild.timeoutFor
*/
-@DeprecatedInBcCore
fun Guild.timeoutFor(user: UserSnowflake, duration: Duration): AuditableRestAction = timeoutFor(user, duration.toJavaDuration())
/**
* @see Member.timeoutFor
*/
-@DeprecatedInBcCore
fun Member.timeoutFor(duration: Duration): AuditableRestAction = timeoutFor(duration.toJavaDuration())
/**
* @see Member.ban
*/
-@DeprecatedInBcCore
fun Member.ban(deletionTimeframe: Duration): AuditableRestAction =
ban(deletionTimeframe.inWholeSeconds.toInt(), TimeUnit.SECONDS)
/**
* @see Guild.ban
*/
-@DeprecatedInBcCore
fun Guild.ban(user: UserSnowflake, deletionTimeframe: Duration): AuditableRestAction =
ban(user, deletionTimeframe.inWholeSeconds.toInt(), TimeUnit.SECONDS)
/**
* See [bulk ban from JDA](https://docs.jda.wiki/net/dv8tion/jda/api/entities/Guild.html#ban(java.util.Collection,java.time.Duration))
*/
-@DeprecatedInBcCore
fun Guild.ban(users: Collection, duration: Duration): AuditableRestAction =
ban(users, duration.toJavaDuration())
/**
* @see TimeFormat.after
*/
-@DeprecatedInBcCore
fun TimeFormat.after(duration: Duration): Timestamp = after(duration.toJavaDuration())
/**
* @see TimeFormat.before
*/
-@DeprecatedInBcCore
fun TimeFormat.before(duration: Duration): Timestamp = before(duration.toJavaDuration())
/**
* @see Timestamp.plus
*/
-@DeprecatedInBcCore
operator fun Timestamp.plus(duration: Duration): Timestamp = plus(duration.toJavaDuration())
/**
* @see Timestamp.minus
*/
-@DeprecatedInBcCore
operator fun Timestamp.minus(duration: Duration): Timestamp = minus(duration.toJavaDuration())
/**
* @see Task.setTimeout
*/
-@DeprecatedInBcCore
fun Task.setTimeout(duration: Duration): Task = setTimeout(duration.toJavaDuration())
/**
* @see GatewayTask.setTimeout
*/
-@DeprecatedInBcCore
fun GatewayTask.setTimeout(duration: Duration): Task = setTimeout(duration.toJavaDuration())
/**
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ContentIntent.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ContentIntent.kt
index 15eba33c7..b82d78044 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ContentIntent.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ContentIntent.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.internal.entities.ReceivedMessage
/**
@@ -8,7 +7,6 @@ import net.dv8tion.jda.internal.entities.ReceivedMessage
*
* **Note:** This applies to all threads while the current code is inside this function
*/
-@DeprecatedInBcCore
inline fun suppressContentWarning(block: () -> R): R {
val oldFlag = ReceivedMessage.didContentIntentWarning
ReceivedMessage.didContentIntentWarning = true
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Converters.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Converters.kt
index 79714a8b3..795b975b0 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Converters.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Converters.kt
@@ -1,19 +1,16 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.utils.messages.MessageCreateData
import net.dv8tion.jda.api.utils.messages.MessageEditData
/**
* @see MessageEditData.fromCreateData
*/
-@DeprecatedInBcCore
fun MessageCreateData.toEditData(): MessageEditData =
MessageEditData.fromCreateData(this)
/**
* @see MessageCreateData.fromEditData
*/
-@DeprecatedInBcCore
fun MessageEditData.toCreateData(): MessageCreateData =
MessageCreateData.fromEditData(this)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Deletes.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Deletes.kt
index 3c8080e8d..48463ab82 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Deletes.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Deletes.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import dev.freya02.botcommands.jda.ktx.durations.delay
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.interactions.InteractionHook
@@ -12,7 +11,6 @@ import kotlin.time.Duration
*
* **Note:** This delays the rest action by the given delay.
*/
-@DeprecatedInBcCore
fun RestAction.deleteDelayed(hook: InteractionHook, delay: Duration?): RestAction {
return withFiniteDelayOrSelf(delay) { finiteDelay ->
delay(finiteDelay).flatMapOriginal { hook.deleteOriginal() }
@@ -24,7 +22,6 @@ fun RestAction.deleteDelayed(hook: InteractionHook, delay: Duration?): Re
*
* **Note:** This delays the rest action by the given delay.
*/
-@DeprecatedInBcCore
fun RestAction.deleteDelayed(delay: Duration?): RestAction {
return withFiniteDelayOrSelf(delay) { finiteDelay ->
delay(finiteDelay).flatMapOriginal(InteractionHook::deleteOriginal)
@@ -36,7 +33,6 @@ fun RestAction.deleteDelayed(delay: Duration?): RestAction.deleteDelayed(delay: Duration?): RestAction {
return withFiniteDelayOrSelf(delay) { finiteDelay ->
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Editing.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Editing.kt
index 5a9ee2707..6c79917e6 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Editing.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Editing.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import net.dv8tion.jda.api.components.MessageTopLevelComponent
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.entities.MessageEmbed
@@ -25,7 +24,6 @@ import net.dv8tion.jda.api.utils.messages.MessageRequest
*
* @see IMessageEditCallback.editMessage
*/
-@ReplaceJdaKtx
@Suppress("FunctionName") // To facilitate imports
inline fun IMessageEditCallback.editMessage_(
content: String? = null,
@@ -50,7 +48,6 @@ inline fun IMessageEditCallback.editMessage_(
*
* @see InteractionHook.editMessageById
*/
-@ReplaceJdaKtx
inline fun InteractionHook.editMessage(
id: String = "@original",
content: String? = null,
@@ -75,7 +72,6 @@ inline fun InteractionHook.editMessage(
*
* @see MessageChannel.editMessageById
*/
-@ReplaceJdaKtx
inline fun MessageChannel.editMessage(
id: String,
content: String? = null,
@@ -99,7 +95,6 @@ inline fun MessageChannel.editMessage(
*
* @see Message.editMessage
*/
-@ReplaceJdaKtx
inline fun Message.edit(
content: String? = null,
embeds: Collection? = null,
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/EditingTo.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/EditingTo.kt
index 6922e6596..7fa3b1b28 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/EditingTo.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/EditingTo.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
import net.dv8tion.jda.api.interactions.InteractionHook
@@ -13,20 +12,17 @@ import net.dv8tion.jda.api.utils.messages.MessageEditData
/**
* @see IMessageEditCallback.editMessage
*/
-@DeprecatedInBcCore
fun MessageEditData.edit(callback: IMessageEditCallback): MessageEditCallbackAction =
callback.editMessage(this)
/**
* @see InteractionHook.editOriginal
*/
-@DeprecatedInBcCore
fun MessageEditData.edit(hook: InteractionHook): WebhookMessageEditAction =
hook.editOriginal(this)
/**
* @see MessageChannel.editMessageById
*/
-@DeprecatedInBcCore
fun MessageEditData.edit(channel: MessageChannel, id: Long): MessageEditAction =
channel.editMessageById(id, this)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Messages.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Messages.kt
index 921568b0f..bd118f2b7 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Messages.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Messages.kt
@@ -2,7 +2,6 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import dev.freya02.botcommands.jda.ktx.components.*
import dev.freya02.botcommands.jda.ktx.hex
import dev.freya02.botcommands.jda.ktx.hsb
@@ -42,7 +41,6 @@ typealias InlineMessageEdit = InlineMessage
@PublishedApi
internal val NO_CONTENT = emptyList()
-@ReplaceJdaKtx
inline fun MessageCreateBuilder(
content: String? = null,
embeds: Collection = NO_CONTENT,
@@ -69,7 +67,6 @@ inline fun MessageCreateBuilder(
InlineMessage(this).apply(builder)
}
-@ReplaceJdaKtx
inline fun MessageCreate(
content: String? = null,
embeds: Collection = NO_CONTENT,
@@ -103,7 +100,6 @@ inline fun MessageCreate(
* @param replace `true` to replace the entire message, `false` to only replace specified parts
* @param builder Additional configuration, can override the previously provided parameters
*/
-@ReplaceJdaKtx
inline fun MessageEditBuilder(
content: String? = null,
embeds: Collection? = null,
@@ -135,7 +131,6 @@ inline fun MessageEditBuilder(
* @param replace `true` to replace the entire message, `false` to only replace specified parts
* @param builder Additional configuration, can override the previously provided parameters
*/
-@ReplaceJdaKtx
inline fun MessageEdit(
content: String? = null,
embeds: Collection? = null,
@@ -156,7 +151,6 @@ inline fun MessageEdit(
builder
).build()
-@ReplaceJdaKtx
inline fun Embed(
color: Int? = null,
timestamp: TemporalAccessor? = null,
@@ -165,7 +159,6 @@ inline fun Embed(
return EmbedBuilder(color, timestamp, builder).build()
}
-@ReplaceJdaKtx
inline fun EmbedBuilder(
color: Int? = null,
timestamp: TemporalAccessor? = null,
@@ -178,7 +171,6 @@ inline fun EmbedBuilder(
InlineEmbed(this).apply(builder)
}
-@ReplaceJdaKtx
@MessageBuilderDSL
class InlineMessage(val builder: AbstractMessageBuilder) {
@@ -513,7 +505,6 @@ class InlineMessage(val builder: AbstractMessageBuilder) {
}
}
-@ReplaceJdaKtx
@MessageBuilderDSL
class InlineEmbed(val builder: EmbedBuilder) {
@@ -643,7 +634,6 @@ class Accumulator internal constructor() {
}
}
-@ReplaceJdaKtx
sealed interface MentionConfig {
val type: MentionType
@@ -688,7 +678,6 @@ class WhitelistMentionConfig(
}
}
-@ReplaceJdaKtx
data class Mentions(
var users: MentionConfig,
var roles: MentionConfig,
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ReplacingWith.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ReplacingWith.kt
index f0c240fb3..df67bdd63 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ReplacingWith.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/ReplacingWith.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.interactions.InteractionHook
import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction
@@ -10,20 +9,17 @@ import net.dv8tion.jda.api.utils.messages.MessageEditData
/**
* @see InteractionHook.editOriginal
*/
-@DeprecatedInBcCore
fun InteractionHook.replaceWith(data: MessageEditData): WebhookMessageEditAction =
editOriginal(data).setReplace(true)
/**
* @see InteractionHook.editOriginal
*/
-@DeprecatedInBcCore
fun InteractionHook.replaceWith(data: MessageCreateData): WebhookMessageEditAction =
editOriginal(data.toEditData()).setReplace(true)
/**
* @see InteractionHook.editOriginal
*/
-@DeprecatedInBcCore
fun InteractionHook.replaceWith(content: String): WebhookMessageEditAction =
editOriginal(content).setReplace(true)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Sending.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Sending.kt
index ef451b3ed..240d67e72 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Sending.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/Sending.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.ReplaceJdaKtx
import net.dv8tion.jda.api.components.MessageTopLevelComponent
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.entities.MessageEmbed
@@ -16,7 +15,6 @@ import net.dv8tion.jda.api.utils.messages.MessageRequest
/**
* @see IReplyCallback.reply
*/
-@ReplaceJdaKtx
inline fun IReplyCallback.reply_(
content: String? = null,
embeds: Collection = NO_CONTENT,
@@ -32,7 +30,6 @@ inline fun IReplyCallback.reply_(
/**
* @see InteractionHook.sendMessage
*/
-@ReplaceJdaKtx
inline fun InteractionHook.send(
content: String? = null,
embeds: Collection = NO_CONTENT,
@@ -48,7 +45,6 @@ inline fun InteractionHook.send(
/**
* @see MessageChannel.sendMessage
*/
-@ReplaceJdaKtx
inline fun MessageChannel.send(
content: String? = null,
embeds: Collection = NO_CONTENT,
@@ -64,7 +60,6 @@ inline fun MessageChannel.send(
* @see MessageChannel.sendMessage
* @see MessageCreateAction.setMessageReference
*/
-@ReplaceJdaKtx
inline fun Message.reply_(
content: String? = null,
embeds: Collection = NO_CONTENT,
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/SendingTo.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/SendingTo.kt
index c22589e37..1da202479 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/SendingTo.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/messages/SendingTo.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.messages
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.entities.Message
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
import net.dv8tion.jda.api.interactions.InteractionHook
@@ -13,20 +12,17 @@ import net.dv8tion.jda.api.utils.messages.MessageCreateData
/**
* @see IReplyCallback.reply
*/
-@DeprecatedInBcCore
fun MessageCreateData.send(callback: IReplyCallback, ephemeral: Boolean = false): ReplyCallbackAction =
callback.reply(this).setEphemeral(ephemeral)
/**
* @see InteractionHook.sendMessage
*/
-@DeprecatedInBcCore
fun MessageCreateData.send(hook: InteractionHook, ephemeral: Boolean = false): WebhookMessageCreateAction =
hook.sendMessage(this).setEphemeral(ephemeral)
/**
* @see MessageChannel.sendMessage
*/
-@DeprecatedInBcCore
fun MessageCreateData.send(channel: MessageChannel): MessageCreateAction =
channel.sendMessage(this)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ranges/Ranges.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ranges/Ranges.kt
index 5f443b141..7b0ed7fa3 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ranges/Ranges.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/ranges/Ranges.kt
@@ -1,10 +1,8 @@
package dev.freya02.botcommands.jda.ktx.ranges
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.components.selections.SelectMenu
/**
* The minimum and maximum amount of values a user can select, must not exceed [SelectMenu.OPTIONS_MAX_AMOUNT].
*/
-@DeprecatedInBcCore
fun > SelectMenu.Builder<*, B>.setRequiredRange(range: IntRange): B = setRequiredRange(range.first, range.last)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/ErrorResponses.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/ErrorResponses.kt
index 85aabd515..17e0f32bc 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/ErrorResponses.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/ErrorResponses.kt
@@ -2,7 +2,6 @@
package dev.freya02.botcommands.jda.ktx.requests
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.exceptions.ErrorResponseException
import net.dv8tion.jda.api.requests.ErrorResponse
import kotlin.contracts.ExperimentalContracts
@@ -16,7 +15,6 @@ import kotlin.contracts.contract
* @see runIgnoringResponse
* @see runIgnoringResponseOrNull
*/
-@DeprecatedInBcCore
inline fun runCatchingResponse(ignored: ErrorResponse, vararg ignoredResponses: ErrorResponse, block: () -> R): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -34,7 +32,6 @@ inline fun runCatchingResponse(ignored: ErrorResponse, vararg ignoredRespons
* @see ignore
* @see runIgnoringResponseOrNull
*/
-@DeprecatedInBcCore
inline fun runIgnoringResponse(ignored: ErrorResponse, vararg ignoredResponses: ErrorResponse, block: () -> Unit) {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -59,7 +56,6 @@ inline fun runIgnoringResponse(ignored: ErrorResponse, vararg ignoredResponses:
* @see runIgnoringResponse
* @see awaitOrNullOn
*/
-@DeprecatedInBcCore
inline fun runIgnoringResponseOrNull(ignored: ErrorResponse, vararg ignoredResponses: ErrorResponse, block: () -> R): R? {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestAction.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestAction.kt
index c58c0f6e7..b788656ea 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestAction.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestAction.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.requests
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import dev.freya02.botcommands.jda.ktx.coroutines.await
import net.dv8tion.jda.api.exceptions.ErrorHandler
import net.dv8tion.jda.api.requests.ErrorResponse
@@ -9,7 +8,6 @@ import net.dv8tion.jda.api.requests.RestAction
/**
* Awaits the completion of this RestAction.
*/
-@DeprecatedInBcCore
suspend fun RestAction<*>.awaitUnit() {
await()
}
@@ -17,7 +15,6 @@ suspend fun RestAction<*>.awaitUnit() {
/**
* Awaits the completion of this RestAction and returns `null`.
*/
-@DeprecatedInBcCore
suspend fun RestAction<*>.awaitNull(): R? {
await()
return null
@@ -30,7 +27,6 @@ suspend fun RestAction<*>.awaitNull(): R? {
*
* @see ErrorHandler
*/
-@DeprecatedInBcCore
fun RestAction<*>.queueIgnoring(ignored: ErrorResponse, vararg errorResponses: ErrorResponse) {
queue(null, ErrorHandler().ignore(ignored, *errorResponses))
}
@@ -43,7 +39,6 @@ fun RestAction<*>.queueIgnoring(ignored: ErrorResponse, vararg errorResponses: E
*
* @see runIgnoringResponseOrNull
*/
-@DeprecatedInBcCore
suspend fun RestAction.awaitOrNullOn(ignored: ErrorResponse, vararg errorResponses: ErrorResponse): R? {
return runIgnoringResponseOrNull(ignored, *errorResponses) {
await()
@@ -53,7 +48,6 @@ suspend fun RestAction.awaitOrNullOn(ignored: ErrorResponse, vararg error
/**
* Awaits the completion of this RestAction and wraps it in a Result.
*/
-@DeprecatedInBcCore
suspend fun RestAction.awaitCatching(): RestResult {
return runCatchingRest { await() }
}
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestResult.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestResult.kt
index 2ee791aa6..877d4bddf 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestResult.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/requests/RestResult.kt
@@ -2,7 +2,6 @@
package dev.freya02.botcommands.jda.ktx.requests
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import net.dv8tion.jda.api.exceptions.ErrorResponseException
import net.dv8tion.jda.api.requests.ErrorResponse
import kotlin.contracts.ExperimentalContracts
@@ -21,7 +20,6 @@ import kotlin.reflect.KClass
*/
@JvmInline
@Suppress("UNCHECKED_CAST")
-@DeprecatedInBcCore
value class RestResult @PublishedApi internal constructor(
@PublishedApi internal val value: Any?
) {
@@ -175,7 +173,6 @@ value class RestResult @PublishedApi internal constructor(
*
* Returns the original `RestResult` unchanged.
*/
-@DeprecatedInBcCore
inline fun RestResult.onErrorResponseException(block: (ErrorResponseException) -> Unit): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -194,7 +191,6 @@ inline fun RestResult.onErrorResponseException(block: (ErrorResponseExcep
* @see ignore
* @see handle
*/
-@DeprecatedInBcCore
inline fun RestResult.onErrorResponse(block: (ErrorResponse) -> Unit): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -213,7 +209,6 @@ inline fun RestResult.onErrorResponse(block: (ErrorResponse) -> Unit): Re
* @see ignore
* @see handle
*/
-@DeprecatedInBcCore
inline fun RestResult.onErrorResponse(error: ErrorResponse, block: (ErrorResponseException) -> Unit): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -232,7 +227,6 @@ inline fun RestResult.onErrorResponse(error: ErrorResponse, block: (Error
*
* @see handle
*/
-@DeprecatedInBcCore
inline fun RestResult.ignore(predicate: (Throwable) -> Boolean): RestResult {
contract {
callsInPlace(predicate, InvocationKind.AT_MOST_ONCE)
@@ -259,7 +253,6 @@ inline fun RestResult.ignore(predicate: (Throwable) -> Boolean): RestResu
*
* @see handle
*/
-@DeprecatedInBcCore
fun RestResult.ignore(ignored: ErrorResponse, vararg responses: ErrorResponse): RestResult =
ignore { it is ErrorResponseException && (it.errorResponse == ignored || it.errorResponse in responses) }
@@ -272,7 +265,6 @@ fun RestResult.ignore(ignored: ErrorResponse, vararg responses: ErrorResp
*
* @see handle
*/
-@DeprecatedInBcCore
fun RestResult.ignore(ignored: KClass, vararg types: KClass): RestResult =
ignore { throwable -> ignored.isInstance(throwable) || types.any { it.isInstance(throwable) } }
@@ -284,7 +276,6 @@ fun RestResult.ignore(ignored: KClass, vararg types: KClas
*
* @see ignore
*/
-@DeprecatedInBcCore
inline fun RestResult.recover(predicate: (Throwable) -> Boolean, block: (Throwable) -> R): RestResult {
contract {
callsInPlace(predicate, InvocationKind.AT_MOST_ONCE)
@@ -309,7 +300,6 @@ inline fun RestResult.recover(predicate: (Throwable) -> Boolean, b
*
* @see ignore
*/
-@DeprecatedInBcCore
inline fun RestResult.recover(response: ErrorResponse, vararg responses: ErrorResponse, block: (ErrorResponseException) -> R): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -329,7 +319,6 @@ inline fun RestResult.recover(response: ErrorResponse, vararg resp
*
* @see ignore
*/
-@DeprecatedInBcCore
inline fun RestResult.recover(type: KClass, vararg types: KClass, block: (Throwable) -> R): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -351,7 +340,6 @@ inline fun RestResult.recover(type: KClass, vararg
*
* @see ignore
*/
-@DeprecatedInBcCore
inline fun RestResult.handle(predicate: (Throwable) -> Boolean, block: (Throwable) -> Unit): RestResult {
contract {
callsInPlace(predicate, InvocationKind.UNKNOWN)
@@ -379,7 +367,6 @@ inline fun RestResult.handle(predicate: (Throwable) -> Boolean, block: (T
*
* @see ignore
*/
-@DeprecatedInBcCore
inline fun RestResult.handle(type: ErrorResponse, vararg responses: ErrorResponse, block: (ErrorResponseException) -> Unit): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -401,7 +388,6 @@ inline fun RestResult.handle(type: ErrorResponse, vararg responses: Error
*
* @see ignore
*/
-@DeprecatedInBcCore
inline fun RestResult.handle(type: KClass, vararg types: KClass, block: (Throwable) -> Unit): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
@@ -418,7 +404,6 @@ inline fun RestResult.handle(type: KClass, vararg types: K
* catching any [Throwable] exception that was thrown from the [block] function execution
* and encapsulating it as a failure.
*/
-@DeprecatedInBcCore
inline fun runCatchingRest(block: () -> T): RestResult {
contract {
callsInPlace(block, InvocationKind.AT_MOST_ONCE)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/Guild.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/Guild.kt
index e0b3c6ee4..f3679c403 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/Guild.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/Guild.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.retrieve
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import dev.freya02.botcommands.jda.ktx.IgnoreForMatch
import dev.freya02.botcommands.jda.ktx.coroutines.await
import dev.freya02.botcommands.jda.ktx.deferredRestAction
@@ -37,7 +36,6 @@ import net.dv8tion.jda.internal.requests.RestActionImpl
*
* @see Guild.retrieveMemberById
*/
-@DeprecatedInBcCore
suspend fun Guild.retrieveMemberByIdOrNull(userId: String, @IgnoreForMatch useCache: Boolean = true): Member? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_MEMBER, ErrorResponse.UNKNOWN_USER) {
retrieveMemberById(userId).useCache(useCache).await()
@@ -55,7 +53,6 @@ suspend fun Guild.retrieveMemberByIdOrNull(userId: String, @IgnoreForMatch useCa
*
* @see Guild.retrieveMemberById
*/
-@DeprecatedInBcCore
suspend fun Guild.retrieveMemberByIdOrNull(userId: Long, @IgnoreForMatch useCache: Boolean = true): Member? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_MEMBER, ErrorResponse.UNKNOWN_USER) {
retrieveMemberById(userId).useCache(useCache).await()
@@ -73,7 +70,6 @@ suspend fun Guild.retrieveMemberByIdOrNull(userId: Long, @IgnoreForMatch useCach
*
* @see Guild.retrieveMember
*/
-@DeprecatedInBcCore
suspend fun Guild.retrieveMemberOrNull(user: UserSnowflake, @IgnoreForMatch useCache: Boolean = true): Member? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_MEMBER, ErrorResponse.UNKNOWN_USER) {
retrieveMember(user).useCache(useCache).await()
@@ -87,7 +83,6 @@ suspend fun Guild.retrieveMemberOrNull(user: UserSnowflake, @IgnoreForMatch useC
*
* @see Guild.retrieveBan
*/
-@DeprecatedInBcCore
suspend fun Guild.retrieveBanOrNull(user: UserSnowflake): Ban? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_BAN) {
retrieveBan(user).await()
@@ -102,7 +97,6 @@ suspend fun Guild.retrieveBanOrNull(user: UserSnowflake): Ban? {
*
* @see Guild.retrieveVanityInvite
*/
-@DeprecatedInBcCore
suspend fun Guild.retrieveVanityInviteOrNull(): VanityInvite? {
if (vanityCode == null) return null
@@ -120,7 +114,6 @@ suspend fun Guild.retrieveVanityInviteOrNull(): VanityInvite? {
*
* @see retrieveThreadChannelOrNull
*/
-@DeprecatedInBcCore
fun Guild.retrieveThreadChannelById(id: Long): CacheRestAction {
return jda.deferredRestAction(
valueSupplier = { getThreadChannelById(id) },
@@ -162,7 +155,6 @@ fun Guild.retrieveThreadChannelById(id: String): CacheRestAction
*
* @see retrieveThreadChannelById
*/
-@DeprecatedInBcCore
@Deprecated("Replaced by retrieveThreadChannelByIdOrNull")
@Suppress("deprecated")
suspend fun Guild.retrieveThreadChannelOrNull(id: Long): ThreadChannel? {
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/InvalidChannelTypeException.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/InvalidChannelTypeException.kt
index 5e503b42d..e0390f2a9 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/InvalidChannelTypeException.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/InvalidChannelTypeException.kt
@@ -1,11 +1,8 @@
package dev.freya02.botcommands.jda.ktx.retrieve
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
-
/**
* Exception thrown when retrieving a channel by ID, but the type is incorrect.
*
* @see retrieveThreadChannelById
*/
-@DeprecatedInBcCore
class InvalidChannelTypeException(message: String) : IllegalArgumentException(message)
diff --git a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/JDA.kt b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/JDA.kt
index c3f3a41aa..22dd707b3 100644
--- a/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/JDA.kt
+++ b/BotCommands-jda-ktx/src/main/kotlin/dev/freya02/botcommands/jda/ktx/retrieve/JDA.kt
@@ -1,6 +1,5 @@
package dev.freya02.botcommands.jda.ktx.retrieve
-import dev.freya02.botcommands.jda.ktx.DeprecatedInBcCore
import dev.freya02.botcommands.jda.ktx.IgnoreForMatch
import dev.freya02.botcommands.jda.ktx.coroutines.await
import dev.freya02.botcommands.jda.ktx.requests.runIgnoringResponseOrNull
@@ -22,7 +21,6 @@ import net.dv8tion.jda.api.requests.ErrorResponse
*
* @see JDA.retrieveUserById
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveUserByIdOrNull(userId: String, @IgnoreForMatch useCache: Boolean = true): User? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_USER) {
retrieveUserById(userId).useCache(useCache).await()
@@ -39,7 +37,6 @@ suspend fun JDA.retrieveUserByIdOrNull(userId: String, @IgnoreForMatch useCache:
*
* @see JDA.retrieveUserById
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveUserByIdOrNull(userId: Long, @IgnoreForMatch useCache: Boolean = true): User? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_USER) {
retrieveUserById(userId).useCache(useCache).await()
@@ -53,7 +50,6 @@ suspend fun JDA.retrieveUserByIdOrNull(userId: Long, @IgnoreForMatch useCache: B
*
* @see JDA.retrieveSticker
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveStickerOrNull(sticker: StickerSnowflake): StickerUnion? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_STICKER) {
retrieveSticker(sticker).await()
@@ -67,7 +63,6 @@ suspend fun JDA.retrieveStickerOrNull(sticker: StickerSnowflake): StickerUnion?
*
* @see JDA.retrieveEntitlementById
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveEntitlementByIdOrNull(entitlementId: String): Entitlement? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_ENTITLEMENT) {
retrieveEntitlementById(entitlementId).await()
@@ -81,7 +76,6 @@ suspend fun JDA.retrieveEntitlementByIdOrNull(entitlementId: String): Entitlemen
*
* @see JDA.retrieveEntitlementById
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveEntitlementByIdOrNull(entitlementId: Long): Entitlement? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_ENTITLEMENT) {
retrieveEntitlementById(entitlementId).await()
@@ -95,7 +89,6 @@ suspend fun JDA.retrieveEntitlementByIdOrNull(entitlementId: Long): Entitlement?
*
* @see JDA.retrieveWebhookById
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveWebhookByIdOrNull(webhookId: String): Webhook? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_WEBHOOK) {
retrieveWebhookById(webhookId).await()
@@ -109,7 +102,6 @@ suspend fun JDA.retrieveWebhookByIdOrNull(webhookId: String): Webhook? {
*
* @see JDA.retrieveWebhookById
*/
-@DeprecatedInBcCore
suspend fun JDA.retrieveWebhookByIdOrNull(webhookId: Long): Webhook? {
return runIgnoringResponseOrNull(ErrorResponse.UNKNOWN_WEBHOOK) {
retrieveWebhookById(webhookId).await()
diff --git a/BotCommands-jda-ktx/src/test/kotlin/dev/freya02/botcommands/jda/ktx/MigrationSnapshotTest.kt b/BotCommands-jda-ktx/src/test/kotlin/dev/freya02/botcommands/jda/ktx/MigrationSnapshotTest.kt
deleted file mode 100644
index 145fc29f0..000000000
--- a/BotCommands-jda-ktx/src/test/kotlin/dev/freya02/botcommands/jda/ktx/MigrationSnapshotTest.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package dev.freya02.botcommands.jda.ktx
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import kotlin.io.path.Path
-import kotlin.io.path.readBytes
-import kotlin.test.Test
-import kotlin.test.fail
-
-class MigrationSnapshotTest {
-
- private val kspOutput = Path(System.getenv("KSP_OUTPUT"))
-
- @Test
- fun `Ensure generated migration files are not modified`() {
- val diffFiles = mutableSetOf()
-
- MigrationSnapshotTest::class.java.getResourceAsStream("/ksp_snapshot.zip")!!.use { inputStream ->
- ZipInputStream(inputStream).use { zipStream ->
- var entry: ZipEntry? = null
- while (zipStream.nextEntry.also { entry = it } != null) {
- if (entry!!.isDirectory) continue
- val frozenBytes = zipStream.readAllBytes()
- val generatedBytes = kspOutput.resolve(entry.name).readBytes()
-
- if (!(frozenBytes contentEquals generatedBytes)) {
- diffFiles += entry.name
- }
- }
- }
- }
-
- if (diffFiles.isNotEmpty()) {
- fail("Migration files should have not changed:\n${diffFiles.joinToString("\n")}")
- }
- }
-}
diff --git a/BotCommands-jda-ktx/src/test/resources/ksp_snapshot.zip b/BotCommands-jda-ktx/src/test/resources/ksp_snapshot.zip
deleted file mode 100644
index 4e1d3f59098bbd005ccfcb46657fb7d2a865f89b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 16321
zcmb_@1y~(R(l&0v-QC?ixVr_1aDaom1$PPVArRbyy99SgfZ$FD?jGEJvb(w2uzT;f
zyZM`Q&dkFzUGH>P*Hle)y-Kp+5a=M^TSyA0?%z)S@dNpIv<8^lFe&}%CGbBkv9xuv
z`pYYko?K~e`xjy{|Mg;1b0;%r!@uZ5^rwAH9Dr^BW>(g}=uG#2cQ&+jGP1R{2G|%o
z{)Hf>|4tCV&ipTgvH$nNjBFi%e<6|gf0XF#WN!6i*kB+qASRDX<%X7O_<6*o3_GPf~RvlX?qwgWgZS~~5k$=jl_Ah+CTM4bD^C44BPs-dN3hg1%QgGGda
zh2`0mHe9L2^1xRnx%X)KvY3xoM}jhay;7dcwR&N~uSXquwW;(1v4sfO0TIoL$EF@?
z$nXZ{<4Ioji?^piT{_1rx2c~QFzV=oV$;KAjyrkR{1VP1-d9ycwG-Pnx=DY;y%!BL
z4h}}A`F2Yg95wsrY6E!a-c=RT%;R;&PKzxR@XBpdNw8q&->M&oo5;<_**Jch`U
z;qc|eO_g{FLYQVjcIM_&Cib}1+>u&B=D?B5A!EBZ&w8>O3vl$#b`c!d&+ULbalfm~
z{U)<`qG{G`f&hbzIjKJ7x0Nh95a4|7xlPI%gIC0PtN4Va5SM9Vj#3@T5;-0<{dV>E
z)q;FuXY-7C$D{A_SVaT}Tr#bk`!<`@Bx(t7;2G!Qr$vh<31b)BuVqW`m#!;%7;Vef
zNl9TaSm_yvh!ibc=5xsJ
z^+&@6ULH1VcTqZ-_xKlZ^Ij}C-p#JcOla~q)lHhorEqVK
zbdf}RChXbIfU=Y9at@+ebY}0_RZPXLVNm3YYam14oD7v>$c%9f^J*1jMjozuA*AgK
zP~s-{&{Xf;&OtL;X}D3ZH}G`d#yVJ5*By4W7l|@3g9EtQ+G*q}PT_8NNV@o`V!CFC
zMVM+YH00R@)15N1`yTl+$^2e+(0J0LLLZi;&;H$r`2;h6}l
z`>GZ|!SqphfLu+)p#dz?dPs&|!GfqIpF7&aDV>TTG!W67WeAB>j>GCJO>BgU3^)~RHDf5`fmNU6yL4i{L%VvmF18V*3rZ-mZPu`
zGkT`ZIoqlebV~nj{R@xQueOb&`r&WZ&$CDZMDU3*jKws9LU22%>~2PM7qE(Y&c2+Z
zx$>=LwqBoOglwn*&BUJr2H}W?I>bS#&G+c&)Ov8nq@XJkJjVl~G-6CxR1BQKaxi_Z3?!x>;)2HHr@VP1=S){yiqwZIXpr)s$2@O++
zdQGbdHi>s6^*F6Z`amE0*(2L@o%%Q0z`@#h5fbEecp%9R<*G!kE)Q)};#tR5tG1bh
zXj`-h1yb+}#ZNS7t%a>0KT5)8ZXRq9)*Khf61;=uD9r?~RWc%cklDXiGq2Y2SZq$5
z19x1>^UM@o#z(8FuNF0cb`KjJbeATm|7wCC1JvgoiN75(NevDC3M00t8b+(tizoI>=Fo2qp9S4BJfDS{g53t-FD({(3YRl4C-S4pYsg2_S~ICkX1L%^W+SweYZsEql|4!hj^AYCoMSuqsxb6;OT_381~+iBgWVz
zs{e&;%;K12`Fpz{80ejh1OUtJcxYweOCQXsK7q;5%LB#Ts@sBvbY35jU(E&eErp2c
zV+;+!@VkEP(Ndfqzs^=pfB3ci6g}H{PW0fzGrHHhR`wf3dgV}Luwx%+kRjxuxO$k4
zC1hk1hJq+L;;PW#?+*ELrDoqyP(|(26ComNW+Nd*_g`coniEna#7<4q%Tp*@yrNo7
zCOuXlgHgfPTNMyi3-l_2)?$()Z|phz(uU+AB5BCo&96?PV2%wd-6^M<@9&GKO2V-s
z7IM7BB@c=85LL-R#)Tp+9|{+phh8PB2FJBFlf+a+KOl&s{6TGUx&bpq8PU&8RugGbw?zx{&02;z=O~TF_aS2YE?m^f?!m=`7OG>ur3GX^OQ9EI4BY?PNsRl$
z9t(=zD-?OFteW%Jw1LY_7938ZM@G7O@a>G4VkC_0Vb~pGyfh=H!35cC+bI}v=QMrr
zUK!mN1VDcOgT43}H8(u`w1VrvLv@Eq3vr37$gf*yer^y_q{lYCUu|LH!;-}iM~1Pm
z7qHC%?{2A`=Fi6Pw(__}WX-5oB4XPv5wClu(r))}X;{%aR;h%ju3Uj
zmPme6?nNn>)~KTsh@(n%`|8x!jZB`Mk0+Rjv8*-Kr=@{c(2|JDs)xw$E=FDDj7|Lj
zDc3*{uOk{7R4Bqx)uiQ>soxAYbpFR!((a*GJ=Oxp&AdvSU42!W3&LG!z6J<$T(4*;
zP~@o#jlw%H19;#|D76d8?>A428a`%#KrMNH7%9%Y5}S;n6?f=BC0s^d;b2XXnkN<$
z{wA`K(ETxd8Lp@Vws}Op$icAPwRZd9W)8>kTfQc=t_7=l>{Roq5(~R%&=8^^->W3Sgo@6)v4qCF
z*=}%nLwhg9q662Zw{wXNfF)1e39q95A^R$E16;qLxmQN~7Y8_iP+%Lj`wP}W;jCO8
zrc7|Ayp3)Wbj;~bt;7dpbB$u=#dBDNbDpahaHvY&w+aHa-M~EL{&8u6W4duob15UmvVxYeF<1t#w)}l}YCg&+EGT38~0W
z&{$3-FYyf(O5GNe@KUV1aK;9gm?wU{2r5Q<3t1fKoKr)cJiGFZ-~I%=(Q2ov`@?ld
zN$KlwBrjUYqJh+VqF_peL0LQ5F*d3J_!Zjs6T$kLbRx#2F6P=a<~q(EaJ);m{e_qv
zZ0v19yj<^OS8g{Bn}hVqW~MeXtw}Y(luKb`bt_mRuRb$wXoLb<;dRi08msxZG90Qo
zfI-E3Ak$RAOT!AEhab3gEETrAw_fs6=;9?ur{mg?c%8>=*!D-RCr3ZrL>Aa>P&8Tv
zU%^P(u#YeJUx~CYsO?;fH8k6v%yI4~Md4j~ZLPTauaCkK8S{sS3)X;qU|f+fDv9}+
z4b%PBc+kc}^1ze8wMjflJleUyjljUVm{$pnCfJR04~&MCjEnr^ZCxv@Eoz*(|D34T
zjBR(DKbv(Pc*L$Y{;+!~afz|AK8U?;LsROt0%kkk73)&H$v
zN7}{(U}bJBY6h^e0a~fK*#X5}jevGe=C(F}JkGraE8#ksk$sn+E28jjJ4i_iBX@Ub
zz5JS@J6~;%>X0