change Interaction.Channel from PartialChannel to InteractionChannel

Author: topi314

discord/interaction.go

@@ -28,13 +28,13 @@ type rawInteraction struct {
 	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"`
-	User           *User           `json:"user,omitempty"`
-	AppPermissions *Permissions    `json:"app_permissions,omitempty"`
+	ChannelID      snowflake.ID       `json:"channel_id,omitempty"`
+	Channel        InteractionChannel `json:"channel,omitempty"`
+	Locale         Locale             `json:"locale,omitempty"`
+	GuildLocale    *Locale            `json:"guild_locale,omitempty"`
+	Member         *ResolvedMember    `json:"member,omitempty"`
+	User           *User              `json:"user,omitempty"`
+	AppPermissions *Permissions       `json:"app_permissions,omitempty"`
 }
 
 // Interaction is used for easier unmarshalling of different Interaction(s)
@@ -47,7 +47,7 @@ type Interaction interface {
 	GuildID() *snowflake.ID
 	// Deprecated: Use Interaction.Channel instead
 	ChannelID() snowflake.ID
-	Channel() *PartialChannel
+	Channel() InteractionChannel
 	Locale() Locale
 	GuildLocale() *Locale
 	Member() *ResolvedMember
@@ -121,4 +121,8 @@ type (
 		ThreadMetadata ThreadMetadata `json:"thread_metadata"`
 		ParentID       snowflake.ID   `json:"parent_id"`
 	}
+	InteractionChannel struct {
+		MessageChannel
+		Permissions Permissions `json:"permissions"`
+	}
 )

discord/interaction_base.go

@@ -13,7 +13,7 @@ type baseInteraction struct {
 	version        int
 	guildID        *snowflake.ID
 	channelID      snowflake.ID
-	channel        *PartialChannel
+	channel        InteractionChannel
 	locale         Locale
 	guildLocale    *Locale
 	member         *ResolvedMember
@@ -41,7 +41,7 @@ func (i baseInteraction) GuildID() *snowflake.ID {
 func (i baseInteraction) ChannelID() snowflake.ID {
 	return i.channelID
 }
-func (i baseInteraction) Channel() *PartialChannel {
+func (i baseInteraction) Channel() InteractionChannel {
 	return i.channel
 }
 func (i baseInteraction) Locale() Locale {

discord/interaction_ping.go

@@ -72,8 +72,8 @@ func (PingInteraction) ChannelID() snowflake.ID {
 	return 0
 }
 
-func (PingInteraction) Channel() *PartialChannel {
-	return nil
+func (PingInteraction) Channel() InteractionChannel {
+	return InteractionChannel{}
 }
 
 func (PingInteraction) Locale() Locale {

events/interaction_events.go

@@ -25,12 +25,6 @@ func (e *InteractionCreate) Guild() (discord.Guild, bool) {
 	return discord.Guild{}, false
 }
 
-// MessageChannel returns the discord.GuildMessageChannel that the interaction happened in.
-// This only returns cached channels.
-func (e *InteractionCreate) MessageChannel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.Channel().ID)
-}
-
 // ApplicationCommandInteractionCreate is the base struct for all application command interaction create events.
 type ApplicationCommandInteractionCreate struct {
 	*GenericEvent
@@ -48,12 +42,6 @@ func (e *ApplicationCommandInteractionCreate) Guild() (discord.Guild, bool) {
 	return discord.Guild{}, false
 }
 
-// MessageChannel returns the discord.GuildMessageChannel that the interaction happened in.
-// This only returns cached channels.
-func (e *ApplicationCommandInteractionCreate) MessageChannel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.Channel().ID)
-}
-
 // CreateMessage responds to the interaction with a new message.
 func (e *ApplicationCommandInteractionCreate) CreateMessage(messageCreate discord.MessageCreate, opts ...rest.RequestOpt) error {
 	return e.Respond(discord.InteractionResponseTypeCreateMessage, messageCreate, opts...)
@@ -90,12 +78,6 @@ func (e *ComponentInteractionCreate) Guild() (discord.Guild, bool) {
 	return discord.Guild{}, false
 }
 
-// MessageChannel returns the discord.GuildMessageChannel that the interaction happened in.
-// This only returns cached channels.
-func (e *ComponentInteractionCreate) MessageChannel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.Channel().ID)
-}
-
 // CreateMessage responds to the interaction with a new message.
 func (e *ComponentInteractionCreate) CreateMessage(messageCreate discord.MessageCreate, opts ...rest.RequestOpt) error {
 	return e.Respond(discord.InteractionResponseTypeCreateMessage, messageCreate, opts...)
@@ -142,12 +124,6 @@ func (e *AutocompleteInteractionCreate) Guild() (discord.Guild, bool) {
 	return discord.Guild{}, false
 }
 
-// MessageChannel returns the discord.GuildMessageChannel that the interaction happened in.
-// This only returns cached channels.
-func (e *AutocompleteInteractionCreate) MessageChannel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.Channel().ID)
-}
-
 // Result responds to the interaction with a slice of choices.
 func (e *AutocompleteInteractionCreate) Result(choices []discord.AutocompleteChoice, opts ...rest.RequestOpt) error {
 	return e.Respond(discord.InteractionResponseTypeApplicationCommandAutocompleteResult, discord.AutocompleteResult{Choices: choices}, opts...)
@@ -170,12 +146,6 @@ func (e *ModalSubmitInteractionCreate) Guild() (discord.Guild, bool) {
 	return discord.Guild{}, false
 }
 
-// MessageChannel returns the discord.GuildMessageChannel that the interaction happened in.
-// This only returns cached channels.
-func (e *ModalSubmitInteractionCreate) MessageChannel() (discord.GuildMessageChannel, bool) {
-	return e.Client().Caches().GuildMessageChannel(e.Channel().ID)
-}
-
 // CreateMessage responds to the interaction with a new message.
 func (e *ModalSubmitInteractionCreate) CreateMessage(messageCreate discord.MessageCreate, opts ...rest.RequestOpt) error {
 	return e.Respond(discord.InteractionResponseTypeCreateMessage, messageCreate, opts...)