app commands: Renamed slashGuildIds property to guildsToUpdate

Author: freya022

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BApplicationConfig.kt

@@ -19,6 +19,7 @@ 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
@@ -50,8 +51,20 @@ interface BApplicationConfig {
      *
      * 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<Long>
+    val slashGuildIds: List<Long> get() = guildsToUpdate
+
+    /**
+     * If not empty, application commands will only be updated in these guilds.
+     *
+     * Existing commands won't be removed in other guilds, global commands will still be updated.
+     *
+     * Spring property: `botcommands.application.guildsToUpdate`
+     */
+    @ConfigurationValue(path = "botcommands.application.guildsToUpdate")
+    val guildsToUpdate: List<Long>
 
     /**
      * Test guilds IDs for all commands annotated with [Test]
@@ -147,7 +160,9 @@ interface BApplicationConfig {
 class BApplicationConfigBuilder internal constructor() : BApplicationConfig {
     @set:JvmName("enable")
     override var enable: Boolean = true
-    override val slashGuildIds: MutableList<Long> = mutableListOf()
+    @Deprecated("Replaced by 'guildsToUpdate'", replaceWith = ReplaceWith("guildToUpdate"))
+    override val slashGuildIds: MutableList<Long> get() = guildsToUpdate
+    override val guildsToUpdate: MutableList<Long> = mutableListOf()
     override val testGuildIds: MutableList<Long> = mutableListOf()
     @set:DevConfig
     @set:JvmName("disableAutocompleteCache")
@@ -345,7 +360,7 @@ class BApplicationConfigBuilder internal constructor() : BApplicationConfig {
 
         return object : BApplicationConfig {
             override val enable = this@BApplicationConfigBuilder.enable
-            override val slashGuildIds = this@BApplicationConfigBuilder.slashGuildIds.toImmutableList()
+            override val guildsToUpdate = this@BApplicationConfigBuilder.guildsToUpdate.toImmutableList()
             override val testGuildIds = this@BApplicationConfigBuilder.testGuildIds.toImmutableList()
             override val disableAutocompleteCache = this@BApplicationConfigBuilder.disableAutocompleteCache
             override val cache = this@BApplicationConfigBuilder.cache?.build()
@@ -356,4 +371,4 @@ class BApplicationConfigBuilder internal constructor() : BApplicationConfig {
             override val logMissingLocalizationKeys = this@BApplicationConfigBuilder.logMissingLocalizationKeys
         }
     }
-}
+}

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/commands/application/ApplicationCommandsBuilder.kt

@@ -109,10 +109,10 @@ internal class ApplicationCommandsBuilder(
     }
 
     internal suspend fun updateGuildCommands(guild: Guild, force: Boolean = false): CommandUpdateResult {
-        val slashGuildIds = context.applicationConfig.slashGuildIds
-        if (slashGuildIds.isNotEmpty()) {
-            if (guild.idLong !in slashGuildIds) {
-                logger.trace { "Skipping application command updates in ${guild.name} (${guild.id}) as it is not in ${BApplicationConfig::slashGuildIds.reference}" }
+        val guildsToUpdate = context.applicationConfig.guildsToUpdate
+        if (guildsToUpdate.isNotEmpty()) {
+            if (guild.idLong !in guildsToUpdate) {
+                logger.trace { "Skipping application command updates in ${guild.name} (${guild.id}) as it is not in ${BApplicationConfig::guildsToUpdate.reference}" }
                 firstGuildUpdates.add(guild.idLong)
                 return CommandUpdateResult(guild, false, listOf())
             }
@@ -207,4 +207,4 @@ internal class ApplicationCommandsBuilder(
                     logger.error(it) { "Errors occurred while registering global commands" }
             }
     }
-}
+}

BotCommands-spring/src/main/kotlin/io/github/freya022/botcommands/internal/core/config/BotCommandsConfigurations.kt

@@ -128,7 +128,8 @@ internal fun BLocalizationConfigBuilder.applyConfig(configuration: BotCommandsLo
 @ConfigurationProperties(prefix = "botcommands.application", ignoreUnknownFields = true)
 internal class BotCommandsApplicationConfiguration(
     override val enable: Boolean = true,
-    override val slashGuildIds: List<Long> = emptyList(),
+    slashGuildIds: List<Long> = emptyList(),
+    guildsToUpdate: List<Long> = emptyList(),
     override val testGuildIds: List<Long> = emptyList(),
     override val disableAutocompleteCache: Boolean = false,
     override val forceGuildCommands: Boolean = false,
@@ -139,6 +140,11 @@ internal class BotCommandsApplicationConfiguration(
 ) : BApplicationConfig {
     override val cache: Nothing get() = unusable()
 
+    override val guildsToUpdate: List<Long> = when {
+        guildsToUpdate.isNotEmpty() -> guildsToUpdate
+        else -> slashGuildIds
+    }
+
     class Cache(
         /**
          * Type of application commands cache.
@@ -179,7 +185,7 @@ internal class BotCommandsApplicationConfiguration(
 @OptIn(DevConfig::class)
 internal fun BApplicationConfigBuilder.applyConfig(configuration: BotCommandsApplicationConfiguration) = apply {
     enable = configuration.enable
-    slashGuildIds += configuration.slashGuildIds
+    guildsToUpdate += configuration.guildsToUpdate
     testGuildIds += configuration.testGuildIds
     disableAutocompleteCache = configuration.disableAutocompleteCache
     configureCache(configuration)