Add Message.applicationId (kordlib#289)

DRSchlaubi · May 26, 2021 · e300c5b · e300c5b
1 parent f1c2bf8
commit e300c5b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/common/src/main/kotlin/entity/DiscordMessage.kt b/common/src/main/kotlin/entity/DiscordMessage.kt
@@ -61,6 +61,7 @@ import kotlin.contracts.contract
  * @param flags Message flags.
  * @param stickers The stickers sent with the message (bots currently can only receive messages with stickers, not send).
  * @param referencedMessage the message associated with [messageReference].
+ * @param applicationId if the message is a response to an [Interaction][DiscordInteraction], this is the id of the interaction's application
  */
 @Serializable
 data class DiscordMessage(
@@ -93,6 +94,8 @@ data class DiscordMessage(
  val type: MessageType,
  val activity: Optional<MessageActivity> = Optional.Missing(),
  val application: Optional<MessageApplication> = Optional.Missing(),
+ @SerialName("application_id")
+ val applicationId: OptionalSnowflake = OptionalSnowflake.Missing,
  @SerialName("message_reference")
  val messageReference: Optional<DiscordMessageReference> = Optional.Missing(),
  val flags: Optional<MessageFlags> = Optional.Missing(),

diff --git a/core/src/main/kotlin/cache/data/MessageData.kt b/core/src/main/kotlin/cache/data/MessageData.kt
@@ -30,6 +30,7 @@ data class MessageData(
  val type: MessageType,
  val activity: Optional<MessageActivity> = Optional.Missing(),
  val application: Optional<MessageApplication> = Optional.Missing(),
+ val applicationId: OptionalSnowflake = OptionalSnowflake.Missing,
  val messageReference: Optional<MessageReferenceData> = Optional.Missing(),
  val flags: Optional<MessageFlags> = Optional.Missing(),
  val stickers: Optional<List<MessageStickerData>> = Optional.Missing(),
@@ -92,6 +93,7 @@ data class MessageData(
  type,
  activity,
  application,
+ applicationId,
  messageReference,
  flags,
  stickers = stickers,
@@ -124,6 +126,7 @@ data class MessageData(
  type,
  activity,
  application,
+ applicationId,
  messageReference.map { MessageReferenceData.from(it) },
  flags,
  stickers.mapList { MessageStickerData.from(it) },

diff --git a/core/src/main/kotlin/entity/Message.kt b/core/src/main/kotlin/entity/Message.kt
@@ -13,6 +13,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.Interaction
 import dev.kord.core.exception.EntityNotFoundException
 import dev.kord.core.supplier.EntitySupplier
 import dev.kord.core.supplier.EntitySupplyStrategy
@@ -102,6 +103,11 @@ class Message(
  */
  val stickers: List<MessageSticker> get() = data.stickers.orEmpty().map { MessageSticker(it, kord) }
 
+ /**
+ * If the message is a response to an [Interaction], this is the id of the interaction's application
+ */
+ val applicationId: Snowflake? get() = data.applicationId.value
+
  /**
  * The message being replied to.
  *