Remove custom unmarshaller for EventMessageUpdate

the timestamp is now properly sent on edits: discord/discord-api-docs#7017
disgoorg · Jul 20, 2024 · e13fad5 · e13fad5
1 parent e70ebbc
commit e13fad5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/discord/message.go b/discord/message.go
@@ -80,14 +80,13 @@ func MessageURL(guildID snowflake.ID, channelID snowflake.ID, messageID snowflak
 
 // Message is a struct for messages sent in discord text-based channels
 type Message struct {
-	ID          snowflake.ID         `json:"id"`
-	GuildID     *snowflake.ID        `json:"guild_id"`
-	Reactions   []MessageReaction    `json:"reactions"`
-	Attachments []Attachment         `json:"attachments"`
-	TTS         bool                 `json:"tts"`
-	Embeds      []Embed              `json:"embeds,omitempty"`
-	Components  []ContainerComponent `json:"components,omitempty"`
-	// Note: for message update events, this field is populated by the creation of the ID during unmarshalling
+	ID                   snowflake.ID          `json:"id"`
+	GuildID              *snowflake.ID         `json:"guild_id"`
+	Reactions            []MessageReaction     `json:"reactions"`
+	Attachments          []Attachment          `json:"attachments"`
+	TTS                  bool                  `json:"tts"`
+	Embeds               []Embed               `json:"embeds,omitempty"`
+	Components           []ContainerComponent  `json:"components,omitempty"`
 	CreatedAt            time.Time             `json:"timestamp"`
 	Mentions             []User                `json:"mentions"`
 	MentionEveryone      bool                  `json:"mention_everyone"`

diff --git a/gateway/gateway_events.go b/gateway/gateway_events.go
@@ -488,17 +488,6 @@ type EventMessageUpdate struct {
 	discord.Message
 }
 
-func (e *EventMessageUpdate) UnmarshalJSON(data []byte) error {
-	type eventMessageUpdate EventMessageUpdate
-	var v eventMessageUpdate
-	if err := json.Unmarshal(data, &v); err != nil {
-		return err
-	}
-	*e = EventMessageUpdate(v)
-	e.CreatedAt = e.ID.Time()
-	return nil
-}
-
 func (EventMessageUpdate) messageData() {}
 func (EventMessageUpdate) eventData()   {}