Message interaction

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

@@ -1,5 +1,6 @@
 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 dev.kord.common.entity.optional.OptionalInt
@@ -99,6 +100,7 @@ data class DiscordMessage(
     val stickers: Optional<List<DiscordMessageSticker>> = Optional.Missing(),
     @SerialName("referenced_message")
     val referencedMessage: Optional<DiscordMessage?> = Optional.Missing(),
+    val interaction: Optional<DiscordMessageInteraction> = Optional.Missing()
 )
 
 /**
@@ -789,3 +791,12 @@ data class AllowedMentions(
     @SerialName("replied_user")
     val repliedUser: OptionalBoolean = OptionalBoolean.Missing
 )
+
+@KordPreview
+@Serializable
+data class DiscordMessageInteraction(
+    val id: Snowflake,
+    val type: InteractionType,
+    val name: String,
+    val user: DiscordUser
+)

core/src/main/kotlin/cache/data/MessageData.kt

@@ -1,6 +1,8 @@
 package dev.kord.core.cache.data
 
+import cache.data.MessageInteractionData
 import dev.kord.cache.api.data.description
+import dev.kord.common.annotation.KordPreview
 import dev.kord.common.entity.*
 import dev.kord.common.entity.optional.*
 import kotlinx.serialization.Serializable
@@ -34,6 +36,7 @@ data class MessageData(
     val flags: Optional<MessageFlags> = Optional.Missing(),
     val stickers: Optional<List<MessageStickerData>> = Optional.Missing(),
     val referencedMessage: Optional<MessageData?> = Optional.Missing(),
+    val messageInteraction: Optional<MessageInteractionData> = Optional.Missing()
 ) {
 
     fun plus(selfId: Snowflake, reaction: MessageReactionAddData): MessageData {
@@ -127,7 +130,8 @@ data class MessageData(
                 messageReference.map { MessageReferenceData.from(it) },
                 flags,
                 stickers.mapList { MessageStickerData.from(it) },
-                referencedMessage.mapNotNull { from(it) }
+                referencedMessage.mapNotNull { from(it) },
+                interaction.map { MessageInteractionData.from(it) }
             )
         }
     }

core/src/main/kotlin/cache/data/MessageInteractionData.kt

@@ -0,0 +1,24 @@
+package cache.data;
+
+import dev.kord.common.annotation.KordPreview
+import dev.kord.common.entity.DiscordMessageInteraction
+import dev.kord.common.entity.InteractionType
+import dev.kord.common.entity.Snowflake
+import dev.kord.core.cache.data.UserData
+import dev.kord.core.cache.data.toData
+import kotlinx.serialization.Serializable
+
+@KordPreview
+@Serializable
+data class MessageInteractionData(
+    val id:Snowflake,
+    val type:InteractionType,
+    val name:String,
+    val user: Snowflake
+) {
+    companion object {
+        fun from(entity: DiscordMessageInteraction): MessageInteractionData = with(entity) {
+            MessageInteractionData(id, type, name, user.id)
+        }
+    }
+}

core/src/main/kotlin/entity/Message.kt

@@ -1,7 +1,10 @@
 package dev.kord.core.entity
 
+import dev.kord.common.annotation.KordPreview
 import dev.kord.common.entity.MessageType
 import dev.kord.common.entity.Snowflake
+import dev.kord.common.entity.optional.map
+import dev.kord.common.entity.optional.mapNullable
 import dev.kord.common.entity.optional.orEmpty
 import dev.kord.common.exception.RequestException
 import dev.kord.core.Kord
@@ -13,6 +16,7 @@ import dev.kord.core.entity.channel.Channel
 import dev.kord.core.entity.channel.GuildChannel
 import dev.kord.core.entity.channel.GuildMessageChannel
 import dev.kord.core.entity.channel.MessageChannel
+import dev.kord.core.entity.interaction.MessageInteraction
 import dev.kord.core.exception.EntityNotFoundException
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
@@ -174,6 +178,12 @@ class Message(
      */
     val mentionedUserBehaviors: Set<UserBehavior> get() = data.mentions.map { UserBehavior(it, kord) }.toSet()
 
+    /**
+     * The [MessageInteraction] sent on this message object when it is a response to an [dev.kord.core.entity.interaction.Interaction].
+     */
+    @KordPreview
+    val interaction: MessageInteraction? get() = data.messageInteraction.mapNullable { MessageInteraction(it, kord) }.value
+
     /**
      * The [users][User] mentioned in this message.
      *

core/src/main/kotlin/entity/interaction/MessageInteraction.kt

@@ -0,0 +1,40 @@
+package dev.kord.core.entity.interaction
+
+import cache.data.MessageInteractionData
+import dev.kord.common.annotation.KordPreview
+import dev.kord.common.entity.InteractionType
+import dev.kord.common.entity.Snowflake
+import dev.kord.core.Kord
+import dev.kord.core.behavior.UserBehavior
+import dev.kord.core.entity.KordEntity
+import dev.kord.core.entity.Message
+
+/**
+ * An instance of [MessageInteraction](https://discord.com/developers/docs/interactions/slash-commands#messageinteraction)
+ * This is sent on the [Message] object when the message is a response to an [Interaction].
+ */
+@KordPreview
+class MessageInteraction(
+    val data: MessageInteractionData,
+    override val kord: Kord,
+) : KordEntity {
+    /**
+     * [id][Interaction.id] of the [Interaction] this message is responding to.
+     */
+    override val id: Snowflake get() = data.id
+
+    /**
+     * 	the [name][ApplicationCommand.name] of the [ApplicationCommand] that triggered this message.
+     */
+    val name: String get() = data.name
+
+    /**
+     * The [UserBehavior] of the [user][Interaction.user] who invoked the [Interaction]
+     */
+    val user: UserBehavior get() = UserBehavior(data.id, kord)
+
+    /**
+     * the [InteractionType] of the interaction [MessageInteraction].
+     */
+    val type: InteractionType get() = data.type
+}