Improve slash command API and add support for components

build.gradle.kts

@@ -5,6 +5,7 @@ import org.apache.commons.codec.binary.Base64
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
     }
     dependencies {
@@ -20,7 +21,7 @@ buildscript {
 
 plugins {
     id("org.jetbrains.kotlin.jvm") version Versions.kotlin
-    id("org.jetbrains.dokka") version "1.4.0"
+    id("org.jetbrains.dokka") version "1.4.30"
     id("org.ajoberstar.git-publish") version "2.1.3"
 
     signing
@@ -32,7 +33,6 @@ apply(plugin = "binary-compatibility-validator")
 
 repositories {
     mavenCentral()
-    jcenter()
     mavenLocal()
 }
 
@@ -218,7 +218,6 @@ tasks {
     dokkaHtmlMultiModule.configure {
         dependsOn(clean)
         outputDirectory.set(file(dokkaOutputDir))
-        documentationFileName.set("DokkaDescription.md")
     }
 
 

buildSrc/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin-api", version = "1.4.0"))
+    implementation(kotlin("gradle-plugin-api", version = "1.4.21"))
     implementation(gradleApi())
     implementation(localGroovy())
 }

buildSrc/src/main/kotlin/Compiler.kt

@@ -1,5 +1,4 @@
 object CompilerArguments {
-    const val inlineClasses = "-XXLanguage:+InlineClasses"
     const val coroutines = "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     const val time = "-Xopt-in=kotlin.time.ExperimentalTime"
     const val stdLib = "-Xopt-in=kotlin.ExperimentalStdlibApi"

buildSrc/src/main/kotlin/Dependencies.kt

@@ -1,11 +1,12 @@
 object Versions {
-    const val kotlin = "1.4.32"
-    const val kotlinxSerialization = "1.1.0"
-    const val ktor = "1.5.2"
-    const val kotlinxCoroutines = "1.4.2"
-    const val kotlinLogging = "2.0.4"
-    const val atomicFu = "0.15.1"
-    const val binaryCompatibilityValidator = "0.4.0"
+    const val kotlin = "1.5.10"
+    const val kotlinxSerialization = "1.2.1"
+    const val ktor = "1.6.0"
+    const val kotlinxCoroutines = "1.5.0"
+    const val kotlinLogging = "2.0.6"
+    const val dateTime = "0.2.1"
+    const val atomicFu = "0.16.1"
+    const val binaryCompatibilityValidator = "0.5.0"
 
     //test deps
     const val kotlinTest = kotlin
@@ -28,6 +29,7 @@ object Dependencies {
         "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}"
     const val `kotlinx-coroutines` = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinxCoroutines}"
     const val `kotlinx-atomicfu` = "org.jetbrains.kotlinx:atomicfu-jvm:${Versions.atomicFu}"
+    const val `kotlinx-datetime` = "org.jetbrains.kotlinx:kotlinx-datetime:${Versions.dateTime}"
 
     const val `kotlin-logging` = "io.github.microutils:kotlin-logging:${Versions.kotlinLogging}"
 

common/build.gradle.kts

@@ -13,11 +13,14 @@ configurations {
     }
 }
 
+dependencies {
+    api(Dependencies.`kotlinx-datetime`)
+}
+
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         jvmTarget = Jvm.target
         freeCompilerArgs = listOf(
-                CompilerArguments.inlineClasses,
                 CompilerArguments.coroutines,
                 CompilerArguments.time,
                 CompilerArguments.optIn

common/src/main/kotlin/entity/DiscordActivity.kt

@@ -35,7 +35,8 @@ data class DiscordActivity(
     val assets: Optional<DiscordActivityAssets> = Optional.Missing(),
     val secrets: Optional<DiscordActivitySecrets> = Optional.Missing(),
     val instance: OptionalBoolean = OptionalBoolean.Missing,
-    val flags: Optional<ActivityFlags> = Optional.Missing()
+    val flags: Optional<ActivityFlags> = Optional.Missing(),
+    val buttons: Optional<List<String>> = Optional.Missing()
 )
 
 enum class ActivityFlag(val value: Int) {

common/src/main/kotlin/entity/DiscordComponent.kt

@@ -0,0 +1,140 @@
+package dev.kord.common.entity
+
+import dev.kord.common.annotation.KordPreview
+import dev.kord.common.entity.optional.Optional
+import dev.kord.common.entity.optional.OptionalBoolean
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+/**
+ * Represent a [intractable component within a message sent in Discord](https://discord.com/developers/docs/interactions/message-components#what-are-components).
+ *
+ * @property type the [ComponentType] of the component
+ * @property style the [ButtonStyle] of the component (if it is a button)
+ * @property style the text that appears on the button (if the component is a button)
+ * @property emoji an [DiscordPartialEmoji] that appears on the button (if the component is a button)
+ * @property customId a developer-defined identifier for the button, max 100 characters
+ * @property url a url for link-style buttons
+ * @property disabled whether the button is disabled, default `false`
+ * @property components a list of child components (for action rows)
+ */
+@KordPreview
+@Serializable
+data class DiscordComponent(
+    val type: ComponentType,
+    val style: Optional<ButtonStyle> = Optional.Missing(),
+    val label: Optional<String> = Optional.Missing(),
+    val emoji: Optional<DiscordPartialEmoji> = Optional.Missing(),
+    @SerialName("custom_id")
+    val customId: Optional<String> = Optional.Missing(),
+    val url: Optional<String> = Optional.Missing(),
+    val disabled: OptionalBoolean = OptionalBoolean.Missing,
+    val components: Optional<List<DiscordComponent>> = Optional.Missing()
+)
+
+/**
+ * Representation of different [DiscordComponent] types.
+ *
+ * @property value the raw type value used by the Discord API
+ */
+@KordPreview
+@Serializable(with = ComponentType.Serializer::class)
+sealed class ComponentType(val value: Int) {
+
+    /**
+     * Fallback type used for types that haven't been added to Kord yet.
+     */
+    class Unknown(value: Int) : ComponentType(value)
+
+    /**
+     * A container for other components.
+     */
+    object ActionRow : ComponentType(1)
+
+    /**
+     * A clickable button.
+     */
+    object Button : ComponentType(2)
+
+    companion object Serializer : KSerializer<ComponentType> {
+        override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("ComponentType", PrimitiveKind.INT)
+
+        override fun deserialize(decoder: Decoder): ComponentType =
+            when (val value = decoder.decodeInt()) {
+                1 -> ActionRow
+                2 -> Button
+                else -> Unknown(value)
+            }
+
+        override fun serialize(encoder: Encoder, value: ComponentType) = encoder.encodeInt(value.value)
+    }
+}
+
+/**
+ * Representation of different ButtonStyles.
+ *
+ * A cheat sheet on how the styles look like can be found [here](https://discord.com/assets/7bb017ce52cfd6575e21c058feb3883b.png)
+ *
+ * @see ComponentType.Button
+ */
+@KordPreview
+@Serializable(with = ButtonStyle.Serializer::class)
+sealed class ButtonStyle(val value: Int) {
+
+    /**
+     * A fallback style used for styles that haven't been added to Kord yet.
+     */
+    class Unknown(value: Int) : ButtonStyle(value)
+
+    /**
+     * Blurple.
+     * Requires: [DiscordComponent.customId]
+     */
+    object Primary : ButtonStyle(1)
+
+    /**
+     * Grey.
+     * Requires: [DiscordComponent.customId]
+     */
+    object Secondary : ButtonStyle(2)
+
+    /**
+     * Green
+     * Requires: [DiscordComponent.customId]
+     */
+    object Success : ButtonStyle(3)
+
+    /**
+     * Red.
+     * Requires: [DiscordComponent.customId]
+     */
+    object Danger : ButtonStyle(4)
+
+    /**
+     * Grey, navigates to an URL.
+     * Requires: [DiscordComponent.url]
+     */
+    object Link : ButtonStyle(5)
+
+    companion object Serializer : KSerializer<ButtonStyle> {
+        override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("ButtonStyle", PrimitiveKind.INT)
+
+        override fun deserialize(decoder: Decoder): ButtonStyle =
+            when (val value = decoder.decodeInt()) {
+                1 -> Primary
+                2 -> Secondary
+                3 -> Success
+                4 -> Danger
+                5 -> Link
+                else -> Unknown(value)
+            }
+
+        override fun serialize(encoder: Encoder, value: ButtonStyle) = encoder.encodeInt(value.value)
+    }
+}

common/src/main/kotlin/entity/DiscordEmoji.kt

@@ -47,7 +47,7 @@ data class DiscordUpdatedEmojis(
  */
 @Serializable
 data class DiscordPartialEmoji(
-    val id: Snowflake?,
-    val name: String?,
+    val id: Snowflake? = null,
+    val name: String? = null,
     val animated: OptionalBoolean = OptionalBoolean.Missing,
 )

common/src/main/kotlin/entity/DiscordGuild.kt

@@ -74,6 +74,7 @@ data class DiscordUnavailableGuild(
  * @param approximateMemberCount The approximate number of members in this guild, returned from the `GET /guild/<id>` endpoint when `with_counts` is `true`.
  * @param approximatePresenceCount The approximate number of non-offline members in this guild, returned from the `GET /guild/<id>` endpoint when `with_counts` is `true`.
  * @param welcomeScreen The welcome screen of a Community guild, shown to new members.
+ * @param nsfw true if this guild is [designated as NSFW](https://support.discord.com/hc/en-us/articles/1500005389362-NSFW-Server-Designation)
  */
 @Serializable
 data class DiscordGuild(
@@ -150,7 +151,9 @@ data class DiscordGuild(
     val approximateMemberCount: OptionalInt = OptionalInt.Missing,
     @SerialName("approximate_presence_count")
     val approximatePresenceCount: OptionalInt = OptionalInt.Missing,
-
+    @SerialName("welcome_screen")
+    val welcomeScreen: Optional<DiscordWelcomeScreen> = Optional.Missing(),
+    val nsfw: Boolean
     )
 
 /**