Add fields to remaining builders

kordlib · Sep 17, 2024 · 58410a8 · 58410a8
1 parent 60548fc
commit 58410a8
Show file tree

Hide file tree

Showing 8 changed files with 147 additions and 20 deletions.
diff --git a/...rated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationIntegrationType.kt b/...rated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationIntegrationType.kt
@@ -53,7 +53,7 @@ public sealed class ApplicationIntegrationType(
     /**
      * App is installable to users
      */
-    public object UserInstall : ApplicationIntegrationType(0)
+    public object UserInstall : ApplicationIntegrationType(1)
 
     internal object Serializer : KSerializer<ApplicationIntegrationType> {
         override val descriptor: SerialDescriptor =
@@ -75,6 +75,7 @@ public sealed class ApplicationIntegrationType(
         public val entries: List<ApplicationIntegrationType> by lazy(mode = PUBLICATION) {
             listOf(
                 GuildInstall,
+                UserInstall,
             )
         }
 
@@ -84,6 +85,7 @@ public sealed class ApplicationIntegrationType(
          */
         public fun from(`value`: Int): ApplicationIntegrationType = when (value) {
             0 -> GuildInstall
+            1 -> UserInstall
             else -> Unknown(value)
         }
     }

diff --git a/rest/api/rest.api b/rest/api/rest.api
diff --git a/rest/api/rest.klib.api b/rest/api/rest.klib.api
diff --git a/rest/src/commonMain/kotlin/builder/interaction/ApplicationCommandBuilders.kt b/rest/src/commonMain/kotlin/builder/interaction/ApplicationCommandBuilders.kt
@@ -69,6 +69,23 @@ public interface ApplicationCommandModifyBuilder : LocalizedNameModifyBuilder,
     @Deprecated("'defaultPermission' is deprecated in favor of 'defaultMemberPermissions' and 'dmPermission'. Setting 'defaultPermission' to false can be replaced by setting 'defaultMemberPermissions' to empty Permissions and 'dmPermission' to false ('dmPermission' is only available for global commands).")
     public var defaultPermission: Boolean?
 
+    public var integrationTypes: MutableList<ApplicationIntegrationType>?
+    public var contexts: MutableList<InteractionContextType>?
+
     /** Indicates whether the command is age-restricted. */
     public var nsfw: Boolean?
+
+    /**
+     * Requires this command to be executed in a specific [installation context][ApplicationIntegrationType].
+     */
+    public fun requireIntegrationTypes(vararg types: ApplicationIntegrationType) {
+        integrationTypes?.addAll(types) ?: run { integrationTypes = types.toMutableList() }
+    }
+
+    /**
+     * Requires this command to be executed in a specific [interaction context][InteractionContextType].
+     */
+    public fun requireContext(vararg types: InteractionContextType) {
+        contexts?.addAll(types) ?: run { contexts = types.toMutableList() }
+    }
 }
diff --git a/rest/src/commonMain/kotlin/builder/interaction/InputChatBuilders.kt b/rest/src/commonMain/kotlin/builder/interaction/InputChatBuilders.kt
@@ -171,6 +171,8 @@ internal class ChatInputCreateBuilderImpl(
             state.defaultMemberPermissions,
             state.dmPermission,
             @Suppress("DEPRECATION") state.defaultPermission,
+            integrationTypes = state.integrationTypes,
+            contexts = state.contexts,
             nsfw = state.nsfw,
         )
 
@@ -203,7 +205,8 @@ internal class ChatInputModifyBuilderImpl : GlobalChatInputModifyBuilder {
 
     @Deprecated("'defaultPermission' is deprecated in favor of 'defaultMemberPermissions' and 'dmPermission'. Setting 'defaultPermission' to false can be replaced by setting 'defaultMemberPermissions' to empty Permissions and 'dmPermission' to false ('dmPermission' is only available for global commands).")
     override var defaultPermission: Boolean? by @Suppress("DEPRECATION") state::defaultPermission.delegate()
-
+    override var integrationTypes: MutableList<ApplicationIntegrationType>? by state::integrationTypes.delegate()
+    override var contexts: MutableList<InteractionContextType>? by state::contexts.delegate()
     override var nsfw: Boolean? by state::nsfw.delegate()
 
     override fun toRequest(): ApplicationCommandModifyRequest {
@@ -216,6 +219,8 @@ internal class ChatInputModifyBuilderImpl : GlobalChatInputModifyBuilder {
             state.defaultMemberPermissions,
             state.dmPermission,
             @Suppress("DEPRECATION") state.defaultPermission,
+            integrationTypes = state.integrationTypes,
+            contexts = state.contexts,
             nsfw = state.nsfw,
         )
 

diff --git a/rest/src/commonMain/kotlin/builder/interaction/MessageCommandBuilders.kt b/rest/src/commonMain/kotlin/builder/interaction/MessageCommandBuilders.kt
@@ -31,7 +31,8 @@ internal class MessageCommandModifyBuilderImpl : GlobalMessageCommandModifyBuild
 
     @Deprecated("'defaultPermission' is deprecated in favor of 'defaultMemberPermissions' and 'dmPermission'. Setting 'defaultPermission' to false can be replaced by setting 'defaultMemberPermissions' to empty Permissions and 'dmPermission' to false ('dmPermission' is only available for global commands).")
     override var defaultPermission: Boolean? by @Suppress("DEPRECATION") state::defaultPermission.delegate()
-
+    override var integrationTypes: MutableList<ApplicationIntegrationType>? by state::integrationTypes.delegate()
+    override var contexts: MutableList<InteractionContextType>? by state::contexts.delegate()
     override var nsfw: Boolean? by state::nsfw.delegate()
 
     override fun toRequest(): ApplicationCommandModifyRequest {
@@ -41,6 +42,8 @@ internal class MessageCommandModifyBuilderImpl : GlobalMessageCommandModifyBuild
             dmPermission = state.dmPermission,
             defaultMemberPermissions = state.defaultMemberPermissions,
             defaultPermission = @Suppress("DEPRECATION") state.defaultPermission,
+            integrationTypes = state.integrationTypes,
+            contexts = state.contexts,
             nsfw = state.nsfw,
         )
 
@@ -83,6 +86,8 @@ internal class MessageCommandCreateBuilderImpl(override var name: String) : Glob
             dmPermission = state.dmPermission,
             defaultMemberPermissions = state.defaultMemberPermissions,
             defaultPermission = @Suppress("DEPRECATION") state.defaultPermission,
+            integrationTypes = state.integrationTypes,
+            contexts = state.contexts,
             nsfw = state.nsfw,
         )
     }

diff --git a/rest/src/commonMain/kotlin/builder/interaction/UserCommandBuilders.kt b/rest/src/commonMain/kotlin/builder/interaction/UserCommandBuilders.kt
@@ -27,7 +27,8 @@ internal class UserCommandModifyBuilderImpl : GlobalUserCommandModifyBuilder {
     override var defaultMemberPermissions: Permissions? by state::defaultMemberPermissions.delegate()
     @Suppress("OVERRIDE_DEPRECATION")
     override var dmPermission: Boolean? by state::dmPermission.delegate()
-
+    override var integrationTypes: MutableList<ApplicationIntegrationType>? by state::integrationTypes.delegate()
+    override var contexts: MutableList<InteractionContextType>? by state::contexts.delegate()
     @Deprecated("'defaultPermission' is deprecated in favor of 'defaultMemberPermissions' and 'dmPermission'. Setting 'defaultPermission' to false can be replaced by setting 'defaultMemberPermissions' to empty Permissions and 'dmPermission' to false ('dmPermission' is only available for global commands).")
     override var defaultPermission: Boolean? by @Suppress("DEPRECATION") state::defaultPermission.delegate()
 
@@ -40,6 +41,8 @@ internal class UserCommandModifyBuilderImpl : GlobalUserCommandModifyBuilder {
             dmPermission = state.dmPermission,
             defaultMemberPermissions = state.defaultMemberPermissions,
             defaultPermission = @Suppress("DEPRECATION") state.defaultPermission,
+            integrationTypes = state.integrationTypes,
+            contexts = state.contexts,
             nsfw = state.nsfw,
         )
     }
@@ -78,6 +81,8 @@ internal class UserCommandCreateBuilderImpl(override var name: String) : GlobalU
             defaultMemberPermissions = state.defaultMemberPermissions,
             dmPermission = state.dmPermission,
             defaultPermission = @Suppress("DEPRECATION") state.defaultPermission,
+            integrationTypes = state.integrationTypes,
+            contexts = state.contexts,
             nsfw = state.nsfw,
         )
     }

diff --git a/rest/src/commonMain/kotlin/json/request/InteractionsRequests.kt b/rest/src/commonMain/kotlin/json/request/InteractionsRequests.kt
@@ -25,6 +25,9 @@ public data class ApplicationCommandCreateRequest(
     @Deprecated("'defaultPermission' is deprecated in favor of 'defaultMemberPermissions' and 'dmPermission'. Setting 'defaultPermission' to false can be replaced by setting 'defaultMemberPermissions' to empty Permissions and 'dmPermission' to false ('dmPermission' is only available for global commands).")
     @SerialName("default_permission")
     val defaultPermission: OptionalBoolean = OptionalBoolean.Missing,
+    @SerialName("integration_types")
+    val integrationTypes: Optional<List<ApplicationIntegrationType>> = Optional.Missing(),
+    val contexts: Optional<List<InteractionContextType>?> = Optional.Missing(),
     val nsfw: OptionalBoolean = OptionalBoolean.Missing,
 )
 
@@ -44,6 +47,9 @@ public data class ApplicationCommandModifyRequest(
     @Deprecated("'defaultPermission' is deprecated in favor of 'defaultMemberPermissions' and 'dmPermission'. Setting 'defaultPermission' to false can be replaced by setting 'defaultMemberPermissions' to empty Permissions and 'dmPermission' to false ('dmPermission' is only available for global commands).")
     @SerialName("default_permission")
     val defaultPermission: OptionalBoolean = OptionalBoolean.Missing,
+    @SerialName("integration_types")
+    val integrationTypes: Optional<List<ApplicationIntegrationType>> = Optional.Missing(),
+    val contexts: Optional<List<InteractionContextType>?> = Optional.Missing(),
     val nsfw: OptionalBoolean = OptionalBoolean.Missing,
 )