From f70a01544f56a912f2528998ff449d22a708fd25 Mon Sep 17 00:00:00 2001
From: Joshua Packard <thegrandpackard@gmail.com>
Date: Wed, 3 Jan 2024 20:17:34 -0800
Subject: [PATCH] fix(buttons)!: omit empty emoji field (#1475)

---
 components.go               |  8 ++++----
 examples/components/main.go | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/components.go b/components.go
index 41c81697a..cec03a646 100644
--- 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
index b3feab32a..84ea68234 100644
--- a/examples/components/main.go
+++ b/examples/components/main.go
@@ -45,7 +45,7 @@ var (
 						discordgo.ActionsRow{
 							Components: []discordgo.MessageComponent{
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "📜",
 									},
 									Label: "Documentation",
@@ -53,7 +53,7 @@ var (
 									URL:   "https://discord.com/developers/docs/interactions/message-components#buttons",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🔧",
 									},
 									Label: "Discord developers",
@@ -61,7 +61,7 @@ var (
 									URL:   "https://discord.gg/discord-developers",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🦫",
 									},
 									Label: "Discord Gophers",
@@ -88,7 +88,7 @@ var (
 						discordgo.ActionsRow{
 							Components: []discordgo.MessageComponent{
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🔧",
 									},
 									Label: "Discord developers",
@@ -96,7 +96,7 @@ var (
 									URL:   "https://discord.gg/discord-developers",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🦫",
 									},
 									Label: "Discord Gophers",
@@ -182,7 +182,7 @@ var (
 						discordgo.ActionsRow{
 							Components: []discordgo.MessageComponent{
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "📜",
 									},
 									Label: "Documentation",
@@ -190,7 +190,7 @@ var (
 									URL:   "https://discord.com/developers/docs/interactions/message-components#select-menus",
 								},
 								discordgo.Button{
-									Emoji: discordgo.ComponentEmoji{
+									Emoji: &discordgo.ComponentEmoji{
 										Name: "🔧",
 									},
 									Label: "Discord developers",
@@ -198,7 +198,7 @@ var (
 									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: "🤷",
 									},
 								},