fix(MessageEdit): additional changes based on review

bwmarrin · Jan 13, 2024 · 8fc1ad7 · 8fc1ad7
1 parent 34b5a49
commit 8fc1ad7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/message.go b/message.go
@@ -233,7 +233,7 @@ type MessageSend struct {
 	Content         string                  `json:"content,omitempty"`
 	Embeds          []*MessageEmbed         `json:"embeds"`
 	TTS             bool                    `json:"tts"`
-	Components      []*MessageComponent     `json:"components"`
+	Components      []MessageComponent      `json:"components"`
 	Files           []*File                 `json:"-"`
 	AllowedMentions *MessageAllowedMentions `json:"allowed_mentions,omitempty"`
 	Reference       *MessageReference       `json:"message_reference,omitempty"`
@@ -252,7 +252,7 @@ type MessageSend struct {
 type MessageEdit struct {
 	Content         *string                 `json:"content,omitempty"`
 	Components      *[]MessageComponent     `json:"components,omitempty"`
-	Embeds          *[]*MessageEmbed         `json:"embeds,omitempty"`
+	Embeds          *[]*MessageEmbed        `json:"embeds,omitempty"`
 	AllowedMentions *MessageAllowedMentions `json:"allowed_mentions,omitempty"`
 	Flags           MessageFlags            `json:"flags,omitempty"`
 	// Files to append to the message
@@ -286,14 +286,14 @@ func (m *MessageEdit) SetContent(str string) *MessageEdit {
 // SetEmbed is a convenience function for setting the embed,
 // so you can chain commands.
 func (m *MessageEdit) SetEmbed(embed *MessageEmbed) *MessageEdit {
-	m.Embeds = []*MessageEmbed{embed}
+	m.Embeds = &[]*MessageEmbed{embed}
 	return m
 }
 
 // SetEmbeds is a convenience function for setting the embeds,
 // so you can chain commands.
 func (m *MessageEdit) SetEmbeds(embeds []*MessageEmbed) *MessageEdit {
-	m.Embeds = embeds
+	m.Embeds = &embeds
 	return m
 }
 

diff --git a/restapi.go b/restapi.go
@@ -1797,14 +1797,14 @@ func (s *Session) ChannelMessageEditComplex(m *MessageEdit, options ...RequestOp
 	// TODO: Remove this when compatibility is not required.
 	if m.Embed != nil {
 		if m.Embeds == nil {
-			m.Embeds = []*MessageEmbed{m.Embed}
+			m.Embeds = &[]*MessageEmbed{m.Embed}
 		} else {
 			err = fmt.Errorf("cannot specify both Embed and Embeds")
 			return
 		}
 	}
 
-	for _, embed := range m.Embeds {
+	for _, embed := range *m.Embeds {
 		if embed.Type == "" {
 			embed.Type = "rich"
 		}