fix(buttons)!: omit empty emoji field (#1475)

bwmarrin · Jan 4, 2024 · f70a015 · f70a015
1 parent 1ffd696
commit f70a015
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/components.go b/components.go
@@ -132,10 +132,10 @@ type ComponentEmoji struct {
 
 // Button represents button component.
 type Button struct {
-	Label    string         `json:"label"`
-	Style    ButtonStyle    `json:"style"`
-	Disabled bool           `json:"disabled"`
-	Emoji    ComponentEmoji `json:"emoji"`
+	Label    string          `json:"label"`
+	Style    ButtonStyle     `json:"style"`
+	Disabled bool            `json:"disabled"`
+	Emoji    *ComponentEmoji `json:"emoji,omitempty"`
 
 	// NOTE: Only button with LinkButton style can have link. Also, URL is mutually exclusive with CustomID.
 	URL      string `json:"url,omitempty"`

diff --git a/examples/components/main.go b/examples/components/main.go
@@ -45,23 +45,23 @@ var (
 						discordgo.ActionsRow{
 							Components: []discordgo.MessageComponent{
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "📜",
 									},
 									Label: "Documentation",
 									Style: discordgo.LinkButton,
 									URL:   "https://discord.com/developers/docs/interactions/message-components#buttons",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🔧",
 									},
 									Label: "Discord developers",
 									Style: discordgo.LinkButton,
 									URL:   "https://discord.gg/discord-developers",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🦫",
 									},
 									Label: "Discord Gophers",
@@ -88,15 +88,15 @@ var (
 						discordgo.ActionsRow{
 							Components: []discordgo.MessageComponent{
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🔧",
 									},
 									Label: "Discord developers",
 									Style: discordgo.LinkButton,
 									URL:   "https://discord.gg/discord-developers",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🦫",
 									},
 									Label: "Discord Gophers",
@@ -182,23 +182,23 @@ var (
 						discordgo.ActionsRow{
 							Components: []discordgo.MessageComponent{
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "📜",
 									},
 									Label: "Documentation",
 									Style: discordgo.LinkButton,
 									URL:   "https://discord.com/developers/docs/interactions/message-components#select-menus",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🔧",
 									},
 									Label: "Discord developers",
 									Style: discordgo.LinkButton,
 									URL:   "https://discord.gg/discord-developers",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🦫",
 									},
 									Label: "Discord Gophers",
@@ -251,7 +251,7 @@ var (
 									Disabled: false,
 									// Link buttons don't require CustomID and do not trigger the gateway/HTTP event
 									URL: "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🤷",
 									},
 								},