Add Channel to interactions (#261)

disgoorg · Apr 6, 2023 · a3e65bd · a3e65bd
1 parent f689ccb
commit a3e65bd
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 10 deletions.
diff --git a/discord/channel.go b/discord/channel.go
@@ -1145,6 +1145,11 @@ type FollowChannel struct {
 	ChannelID snowflake.ID `json:"webhook_channel_id"`
 }
 
+type PartialChannel struct {
+	ID   snowflake.ID `json:"id"`
+	Type ChannelType  `json:"type"`
+}
+
 // VideoQualityMode https://com/developers/docs/resources/channel#channel-object-video-quality-modes
 type VideoQualityMode int
 

diff --git a/discord/interaction.go b/discord/interaction.go
@@ -21,13 +21,15 @@ const (
 )
 
 type rawInteraction struct {
-	ID             snowflake.ID    `json:"id"`
-	Type           InteractionType `json:"type"`
-	ApplicationID  snowflake.ID    `json:"application_id"`
-	Token          string          `json:"token"`
-	Version        int             `json:"version"`
-	GuildID        *snowflake.ID   `json:"guild_id,omitempty"`
+	ID            snowflake.ID    `json:"id"`
+	Type          InteractionType `json:"type"`
+	ApplicationID snowflake.ID    `json:"application_id"`
+	Token         string          `json:"token"`
+	Version       int             `json:"version"`
+	GuildID       *snowflake.ID   `json:"guild_id,omitempty"`
+	// Deprecated: Use Channel instead
 	ChannelID      snowflake.ID    `json:"channel_id,omitempty"`
+	Channel        *PartialChannel `json:"channel,omitempty"`
 	Locale         Locale          `json:"locale,omitempty"`
 	GuildLocale    *Locale         `json:"guild_locale,omitempty"`
 	Member         *ResolvedMember `json:"member,omitempty"`
@@ -44,6 +46,7 @@ type Interaction interface {
 	Version() int
 	GuildID() *snowflake.ID
 	ChannelID() snowflake.ID
+	Channel() *PartialChannel
 	Locale() Locale
 	GuildLocale() *Locale
 	Member() *ResolvedMember

diff --git a/discord/interaction_application_command.go b/discord/interaction_application_command.go
@@ -72,6 +72,7 @@ func (i *ApplicationCommandInteraction) UnmarshalJSON(data []byte) error {
 	i.baseInteraction.version = interaction.Version
 	i.baseInteraction.guildID = interaction.GuildID
 	i.baseInteraction.channelID = interaction.ChannelID
+	i.baseInteraction.channel = interaction.Channel
 	i.baseInteraction.locale = interaction.Locale
 	i.baseInteraction.guildLocale = interaction.GuildLocale
 	i.baseInteraction.member = interaction.Member
@@ -95,6 +96,7 @@ func (i ApplicationCommandInteraction) MarshalJSON() ([]byte, error) {
 			Version:        i.version,
 			GuildID:        i.guildID,
 			ChannelID:      i.channelID,
+			Channel:        i.channel,
 			Locale:         i.locale,
 			GuildLocale:    i.guildLocale,
 			Member:         i.member,

diff --git a/discord/interaction_autocomplete.go b/discord/interaction_autocomplete.go
@@ -29,6 +29,7 @@ func (i *AutocompleteInteraction) UnmarshalJSON(data []byte) error {
 	i.baseInteraction.version = interaction.Version
 	i.baseInteraction.guildID = interaction.GuildID
 	i.baseInteraction.channelID = interaction.ChannelID
+	i.baseInteraction.channel = interaction.Channel
 	i.baseInteraction.locale = interaction.Locale
 	i.baseInteraction.guildLocale = interaction.GuildLocale
 	i.baseInteraction.member = interaction.Member
@@ -52,6 +53,7 @@ func (i AutocompleteInteraction) MarshalJSON() ([]byte, error) {
 			Version:        i.version,
 			GuildID:        i.guildID,
 			ChannelID:      i.channelID,
+			Channel:        i.channel,
 			Locale:         i.locale,
 			GuildLocale:    i.guildLocale,
 			Member:         i.member,

diff --git a/discord/interaction_base.go b/discord/interaction_base.go
@@ -13,6 +13,7 @@ type baseInteraction struct {
 	version        int
 	guildID        *snowflake.ID
 	channelID      snowflake.ID
+	channel        *PartialChannel
 	locale         Locale
 	guildLocale    *Locale
 	member         *ResolvedMember
@@ -35,9 +36,14 @@ func (i baseInteraction) Version() int {
 func (i baseInteraction) GuildID() *snowflake.ID {
 	return i.guildID
 }
+
+// Deprecated: Use Channel() instead
 func (i baseInteraction) ChannelID() snowflake.ID {
 	return i.channelID
 }
+func (i baseInteraction) Channel() *PartialChannel {
+	return i.channel
+}
 func (i baseInteraction) Locale() Locale {
 	return i.locale
 }

diff --git a/discord/interaction_component.go b/discord/interaction_component.go
@@ -82,6 +82,7 @@ func (i *ComponentInteraction) UnmarshalJSON(data []byte) error {
 	i.baseInteraction.version = interaction.Version
 	i.baseInteraction.guildID = interaction.GuildID
 	i.baseInteraction.channelID = interaction.ChannelID
+	i.baseInteraction.channel = interaction.Channel
 	i.baseInteraction.locale = interaction.Locale
 	i.baseInteraction.guildLocale = interaction.GuildLocale
 	i.baseInteraction.member = interaction.Member
@@ -108,6 +109,7 @@ func (i ComponentInteraction) MarshalJSON() ([]byte, error) {
 			Version:        i.version,
 			GuildID:        i.guildID,
 			ChannelID:      i.channelID,
+			Channel:        i.channel,
 			Locale:         i.locale,
 			GuildLocale:    i.guildLocale,
 			Member:         i.member,

diff --git a/discord/interaction_modal_submit.go b/discord/interaction_modal_submit.go
@@ -26,6 +26,7 @@ func (i *ModalSubmitInteraction) UnmarshalJSON(data []byte) error {
 	i.baseInteraction.version = interaction.Version
 	i.baseInteraction.guildID = interaction.GuildID
 	i.baseInteraction.channelID = interaction.ChannelID
+	i.baseInteraction.channel = interaction.Channel
 	i.baseInteraction.locale = interaction.Locale
 	i.baseInteraction.guildLocale = interaction.GuildLocale
 	i.baseInteraction.member = interaction.Member
@@ -49,6 +50,7 @@ func (i ModalSubmitInteraction) MarshalJSON() ([]byte, error) {
 			Version:        i.version,
 			GuildID:        i.guildID,
 			ChannelID:      i.channelID,
+			Channel:        i.channel,
 			Locale:         i.locale,
 			GuildLocale:    i.guildLocale,
 			Member:         i.member,

diff --git a/discord/interaction_ping.go b/discord/interaction_ping.go
@@ -72,6 +72,10 @@ func (PingInteraction) ChannelID() snowflake.ID {
 	return 0
 }
 
+func (PingInteraction) Channel() *PartialChannel {
+	return nil
+}
+
 func (PingInteraction) Locale() Locale {
 	return ""
 }

diff --git a/events/interaction_events.go b/events/interaction_events.go
@@ -51,7 +51,7 @@ func (e *ApplicationCommandInteractionCreate) Guild() (discord.Guild, bool) {
 // Channel returns the discord.GuildMessageChannel that the interaction happened in.
 // This only returns cached channels.
 func (e *ApplicationCommandInteractionCreate) Channel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.ChannelID())
+	return e.Client().Caches().GuildMessageChannel(e.ApplicationCommandInteraction.Channel().ID)
 }
 
 // CreateMessage responds to the interaction with a new message.
@@ -93,7 +93,7 @@ func (e *ComponentInteractionCreate) Guild() (discord.Guild, bool) {
 // Channel returns the discord.GuildMessageChannel that the interaction happened in.
 // This only returns cached channels.
 func (e *ComponentInteractionCreate) Channel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.ChannelID())
+	return e.Client().Caches().GuildMessageChannel(e.ComponentInteraction.Channel().ID)
 }
 
 // CreateMessage responds to the interaction with a new message.
@@ -145,7 +145,7 @@ func (e *AutocompleteInteractionCreate) Guild() (discord.Guild, bool) {
 // Channel returns the discord.GuildMessageChannel that the interaction happened in.
 // This only returns cached channels.
 func (e *AutocompleteInteractionCreate) Channel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.ChannelID())
+	return e.Client().Caches().GuildMessageChannel(e.AutocompleteInteraction.Channel().ID)
 }
 
 // Result responds to the interaction with a slice of choices.
@@ -173,7 +173,7 @@ func (e *ModalSubmitInteractionCreate) Guild() (discord.Guild, bool) {
 // Channel returns the discord.GuildMessageChannel that the interaction happened in.
 // This only returns cached channels.
 func (e *ModalSubmitInteractionCreate) Channel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.ChannelID())
+	return e.Client().Caches().GuildMessageChannel(e.ModalSubmitInteraction.Channel().ID)
 }
 
 // CreateMessage responds to the interaction with a new message.