Add super reactions (#291)

disgoorg · Aug 24, 2023 · cdef17e · cdef17e
1 parent 16c4e0a
commit cdef17e
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 24 deletions.
diff --git a/discord/message.go b/discord/message.go
@@ -345,11 +345,19 @@ type MessageSticker struct {
 	FormatType StickerFormatType `json:"format_type"`
 }
 
-// MessageReaction contains information about the reactions of a message_events
+// MessageReaction contains information about the reactions of a message
 type MessageReaction struct {
-	Count int   `json:"count"`
-	Me    bool  `json:"me"`
-	Emoji Emoji `json:"emoji"`
+	Count        int                  `json:"count"`
+	CountDetails ReactionCountDetails `json:"count_details"`
+	Me           bool                 `json:"me"`
+	MeBurst      bool                 `json:"me_burst"`
+	Emoji        Emoji                `json:"emoji"`
+	BurstColors  []string             `json:"burst_colors"`
+}
+
+type ReactionCountDetails struct {
+	Burst  int `json:"burst"`
+	Normal int `json:"normal"`
 }
 
 // MessageActivityType is the type of MessageActivity https://com/developers/docs/resources/channel#message-object-message-activity-types
@@ -387,7 +395,7 @@ type MessageReference struct {
 	FailIfNotExists bool          `json:"fail_if_not_exists,omitempty"`
 }
 
-// MessageInteraction is sent on the Message object when the message_events is a response to an interaction
+// MessageInteraction is sent on the Message object when the message is a response to an interaction
 type MessageInteraction struct {
 	ID   snowflake.ID    `json:"id"`
 	Type InteractionType `json:"type"`

diff --git a/events/dm_message_reaction_events.go b/events/dm_message_reaction_events.go
@@ -9,10 +9,12 @@ import (
 // GenericDMMessageReaction is called upon receiving DMMessageReactionAdd or DMMessageReactionRemove (requires the gateway.IntentDirectMessageReactions)
 type GenericDMMessageReaction struct {
 	*GenericEvent
-	UserID    snowflake.ID
-	ChannelID snowflake.ID
-	MessageID snowflake.ID
-	Emoji     discord.PartialEmoji
+	UserID      snowflake.ID
+	ChannelID   snowflake.ID
+	MessageID   snowflake.ID
+	Emoji       discord.PartialEmoji
+	BurstColors []string
+	Burst       bool
 }
 
 // DMMessageReactionAdd indicates that a discord.User added a discord.MessageReaction to 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
@@ -9,11 +9,13 @@ import (
 // GenericGuildMessageReaction is called upon receiving GuildMessageReactionAdd or GuildMessageReactionRemove
 type GenericGuildMessageReaction struct {
 	*GenericEvent
-	UserID    snowflake.ID
-	ChannelID snowflake.ID
-	MessageID snowflake.ID
-	GuildID   snowflake.ID
-	Emoji     discord.PartialEmoji
+	UserID      snowflake.ID
+	ChannelID   snowflake.ID
+	MessageID   snowflake.ID
+	GuildID     snowflake.ID
+	Emoji       discord.PartialEmoji
+	BurstColors []string
+	Burst       bool
 }
 
 // Member returns the Member that reacted to the discord.Message from the cache.

diff --git a/events/message_reaction_events.go b/events/message_reaction_events.go
@@ -9,11 +9,13 @@ import (
 // GenericReaction is called upon receiving MessageReactionAdd or MessageReactionRemove
 type GenericReaction struct {
 	*GenericEvent
-	UserID    snowflake.ID
-	ChannelID snowflake.ID
-	MessageID snowflake.ID
-	GuildID   *snowflake.ID
-	Emoji     discord.PartialEmoji
+	UserID      snowflake.ID
+	ChannelID   snowflake.ID
+	MessageID   snowflake.ID
+	GuildID     *snowflake.ID
+	Emoji       discord.PartialEmoji
+	BurstColors []string
+	Burst       bool
 }
 
 // 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)

diff --git a/gateway/gateway_events.go b/gateway/gateway_events.go
@@ -194,6 +194,8 @@ type EventMessageReactionAdd struct {
 	Member          *discord.Member      `json:"member"`
 	Emoji           discord.PartialEmoji `json:"emoji"`
 	MessageAuthorID *snowflake.ID        `json:"message_author_id"`
+	BurstColors     []string             `json:"burst_colors"`
+	Burst           bool                 `json:"burst"`
 }
 
 func (e *EventMessageReactionAdd) UnmarshalJSON(data []byte) error {
@@ -213,11 +215,13 @@ 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.PartialEmoji `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"`
+	BurstColors []string             `json:"burst_colors"`
+	Burst       bool                 `json:"burst"`
 }
 
 func (EventMessageReactionRemove) messageData() {}

diff --git a/handlers/message_reaction_handler.go b/handlers/message_reaction_handler.go
@@ -17,6 +17,8 @@ func gatewayHandlerMessageReactionAdd(client bot.Client, sequenceNumber int, sha
 			GuildID:      event.GuildID,
 			UserID:       event.UserID,
 			Emoji:        event.Emoji,
+			BurstColors:  event.BurstColors,
+			Burst:        event.Burst,
 		},
 		Member: event.Member,
 	})
@@ -29,6 +31,8 @@ func gatewayHandlerMessageReactionAdd(client bot.Client, sequenceNumber int, sha
 				ChannelID:    event.ChannelID,
 				UserID:       event.UserID,
 				Emoji:        event.Emoji,
+				BurstColors:  event.BurstColors,
+				Burst:        event.Burst,
 			},
 			MessageAuthorID: event.MessageAuthorID,
 		})
@@ -41,6 +45,8 @@ func gatewayHandlerMessageReactionAdd(client bot.Client, sequenceNumber int, sha
 				GuildID:      *event.GuildID,
 				UserID:       event.UserID,
 				Emoji:        event.Emoji,
+				BurstColors:  event.BurstColors,
+				Burst:        event.Burst,
 			},
 			Member:          *event.Member,
 			MessageAuthorID: event.MessageAuthorID,
@@ -59,6 +65,8 @@ func gatewayHandlerMessageReactionRemove(client bot.Client, sequenceNumber int,
 			GuildID:      event.GuildID,
 			UserID:       event.UserID,
 			Emoji:        event.Emoji,
+			BurstColors:  event.BurstColors,
+			Burst:        event.Burst,
 		},
 	})
 
@@ -70,6 +78,8 @@ func gatewayHandlerMessageReactionRemove(client bot.Client, sequenceNumber int,
 				ChannelID:    event.ChannelID,
 				UserID:       event.UserID,
 				Emoji:        event.Emoji,
+				BurstColors:  event.BurstColors,
+				Burst:        event.Burst,
 			},
 		})
 	} else {
@@ -81,6 +91,8 @@ func gatewayHandlerMessageReactionRemove(client bot.Client, sequenceNumber int,
 				GuildID:      *event.GuildID,
 				UserID:       event.UserID,
 				Emoji:        event.Emoji,
+				BurstColors:  event.BurstColors,
+				Burst:        event.Burst,
 			},
 		})
 	}