Introduce PartialEmoji

disgoorg · Apr 1, 2023 · fe8db22 · fe8db22
1 parent 6125af7
commit fe8db22
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 28 deletions.
diff --git a/discord/emoji.go b/discord/emoji.go
@@ -56,8 +56,8 @@ type EmojiUpdate struct {
 	Roles *[]snowflake.ID `json:"roles,omitempty"`
 }
 
-type ReactionEmoji struct {
-	ID       snowflake.ID `json:"id,omitempty"`
-	Name     string       `json:"name,omitempty"`
-	Animated bool         `json:"animated"`
+type PartialEmoji struct {
+	ID       *snowflake.ID `json:"id"`
+	Name     *string       `json:"name"`
+	Animated bool          `json:"animated"`
 }
diff --git a/discord/guild_onboarding.go b/discord/guild_onboarding.go
@@ -23,8 +23,7 @@ type GuildOnboardingPromptOption struct {
 	ID          snowflake.ID   `json:"id"`
 	ChannelIDs  []snowflake.ID `json:"channel_ids"`
 	RoleIDs     []snowflake.ID `json:"role_ids"`
-	EmojiID     *snowflake.ID  `json:"emoji_id"`
-	EmojiName   *string        `json:"emoji_name"`
+	Emoji       PartialEmoji   `json:"emoji"`
 	Title       string         `json:"title"`
 	Description *string        `json:"description"`
 }

diff --git a/events/dm_message_reaction_events.go b/events/dm_message_reaction_events.go
@@ -12,7 +12,7 @@ type GenericDMMessageReaction struct {
 	UserID    snowflake.ID
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
-	Emoji     discord.ReactionEmoji
+	Emoji     discord.PartialEmoji
 }
 
 // DMMessageReactionAdd indicates that a discord.User added a discord.MessageReaction to a discord.Message in a Channel (requires the gateway.IntentDirectMessageReactions)
@@ -30,7 +30,7 @@ type DMMessageReactionRemoveEmoji struct {
 	*GenericEvent
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
-	Emoji     discord.ReactionEmoji
+	Emoji     discord.PartialEmoji
 }
 
 // DMMessageReactionRemoveAll indicates someone removed all discord.MessageReaction(s) from a discord.Message in a Channel (requires the gateway.IntentDirectMessageReactions)

diff --git a/events/guild_message_reaction_events.go b/events/guild_message_reaction_events.go
@@ -13,15 +13,15 @@ type GenericGuildMessageReaction struct {
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
 	GuildID   snowflake.ID
-	Emoji     discord.ReactionEmoji
+	Emoji     discord.PartialEmoji
 }
 
 // Member returns the Member that reacted to the discord.Message from the cache.
 func (e *GenericGuildMessageReaction) Member() (discord.Member, bool) {
 	return e.Client().Caches().Member(e.GuildID, e.UserID)
 }
 
-// GuildMessageReactionAdd indicates that a discord.Member added a discord.ReactionEmoji to a discord.Message in a discord.GuildMessageChannel(requires the gateway.IntentGuildMessageReactions)
+// GuildMessageReactionAdd indicates that a discord.Member added a discord.PartialEmoji to a discord.Message in a discord.GuildMessageChannel(requires the gateway.IntentGuildMessageReactions)
 type GuildMessageReactionAdd struct {
 	*GenericGuildMessageReaction
 	Member discord.Member
@@ -38,7 +38,7 @@ type GuildMessageReactionRemoveEmoji struct {
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
 	GuildID   snowflake.ID
-	Emoji     discord.ReactionEmoji
+	Emoji     discord.PartialEmoji
 }
 
 // GuildMessageReactionRemoveAll indicates someone removed all discord.MessageReaction(s) from a discord.Message in a Channel (requires the gateway.IntentGuildMessageReactions)

diff --git a/events/message_reaction_events.go b/events/message_reaction_events.go
@@ -13,7 +13,7 @@ type GenericReaction struct {
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
 	GuildID   *snowflake.ID
-	Emoji     discord.ReactionEmoji
+	Emoji     discord.PartialEmoji
 }
 
 // MessageReactionAdd indicates that a discord.User added a discord.MessageReaction to a discord.Message in a discord.Channel(this+++ requires the gateway.IntentGuildMessageReactions and/or gateway.IntentDirectMessageReactions)
@@ -33,7 +33,7 @@ type MessageReactionRemoveEmoji struct {
 	ChannelID snowflake.ID
 	MessageID snowflake.ID
 	GuildID   *snowflake.ID
-	Emoji     discord.ReactionEmoji
+	Emoji     discord.PartialEmoji
 }
 
 // MessageReactionRemoveAll indicates someone removed all discord.MessageReaction(s) from a discord.Message in a discord.Channel(requires the gateway.IntentGuildMessageReactions and/or gateway.IntentDirectMessageReactions)

diff --git a/gateway/gateway_events.go b/gateway/gateway_events.go
@@ -187,12 +187,12 @@ func (EventGuildAuditLogEntryCreate) messageData() {}
 func (EventGuildAuditLogEntryCreate) eventData()   {}
 
 type EventMessageReactionAdd struct {
-	UserID    snowflake.ID          `json:"user_id"`
-	ChannelID snowflake.ID          `json:"channel_id"`
-	MessageID snowflake.ID          `json:"message_id"`
-	GuildID   *snowflake.ID         `json:"guild_id"`
-	Member    *discord.Member       `json:"member"`
-	Emoji     discord.ReactionEmoji `json:"emoji"`
+	UserID    snowflake.ID         `json:"user_id"`
+	ChannelID snowflake.ID         `json:"channel_id"`
+	MessageID snowflake.ID         `json:"message_id"`
+	GuildID   *snowflake.ID        `json:"guild_id"`
+	Member    *discord.Member      `json:"member"`
+	Emoji     discord.PartialEmoji `json:"emoji"`
 }
 
 func (e *EventMessageReactionAdd) UnmarshalJSON(data []byte) error {
@@ -212,21 +212,21 @@ func (EventMessageReactionAdd) messageData() {}
 func (EventMessageReactionAdd) eventData()   {}
 
 type EventMessageReactionRemove struct {
-	UserID    snowflake.ID          `json:"user_id"`
-	ChannelID snowflake.ID          `json:"channel_id"`
-	MessageID snowflake.ID          `json:"message_id"`
-	GuildID   *snowflake.ID         `json:"guild_id"`
-	Emoji     discord.ReactionEmoji `json:"emoji"`
+	UserID    snowflake.ID         `json:"user_id"`
+	ChannelID snowflake.ID         `json:"channel_id"`
+	MessageID snowflake.ID         `json:"message_id"`
+	GuildID   *snowflake.ID        `json:"guild_id"`
+	Emoji     discord.PartialEmoji `json:"emoji"`
 }
 
 func (EventMessageReactionRemove) messageData() {}
 func (EventMessageReactionRemove) eventData()   {}
 
 type EventMessageReactionRemoveEmoji struct {
-	ChannelID snowflake.ID          `json:"channel_id"`
-	MessageID snowflake.ID          `json:"message_id"`
-	GuildID   *snowflake.ID         `json:"guild_id"`
-	Emoji     discord.ReactionEmoji `json:"emoji"`
+	ChannelID snowflake.ID         `json:"channel_id"`
+	MessageID snowflake.ID         `json:"message_id"`
+	GuildID   *snowflake.ID        `json:"guild_id"`
+	Emoji     discord.PartialEmoji `json:"emoji"`
 }
 
 func (EventMessageReactionRemoveEmoji) messageData() {}