From 660e212e83df026c684ee2cda7fb4e98870f342e Mon Sep 17 00:00:00 2001
From: advaith <advaithj1@gmail.com>
Date: Tue, 19 Jul 2022 05:56:21 -0700
Subject: [PATCH] fix(Components): support emoji id strings (#8310)

---
 packages/discord.js/src/structures/ButtonBuilder.js         | 6 +++---
 packages/discord.js/src/structures/SelectMenuBuilder.js     | 6 +++---
 .../discord.js/src/structures/SelectMenuOptionBuilder.js    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/discord.js/src/structures/ButtonBuilder.js b/packages/discord.js/src/structures/ButtonBuilder.js
index 671a77a8f574..a32bf0015347 100644
--- a/packages/discord.js/src/structures/ButtonBuilder.js
+++ b/packages/discord.js/src/structures/ButtonBuilder.js
@@ -2,7 +2,7 @@
 
 const { ButtonBuilder: BuildersButton, isJSONEncodable } = require('@discordjs/builders');
 const { toSnakeCase } = require('../util/Transformers');
-const { parseEmoji } = require('../util/Util');
+const { resolvePartialEmoji } = require('../util/Util');
 
 /**
  * Represents a button builder.
@@ -10,7 +10,7 @@ const { parseEmoji } = require('../util/Util');
  */
 class ButtonBuilder extends BuildersButton {
   constructor({ emoji, ...data } = {}) {
-    super(toSnakeCase({ ...data, emoji: emoji && typeof emoji === 'string' ? parseEmoji(emoji) : emoji }));
+    super(toSnakeCase({ ...data, emoji: emoji && typeof emoji === 'string' ? resolvePartialEmoji(emoji) : emoji }));
   }
 
   /**
@@ -20,7 +20,7 @@ class ButtonBuilder extends BuildersButton {
    */
   setEmoji(emoji) {
     if (typeof emoji === 'string') {
-      return super.setEmoji(parseEmoji(emoji));
+      return super.setEmoji(resolvePartialEmoji(emoji));
     }
     return super.setEmoji(emoji);
   }
diff --git a/packages/discord.js/src/structures/SelectMenuBuilder.js b/packages/discord.js/src/structures/SelectMenuBuilder.js
index be4468c2d229..738a18fe2950 100644
--- a/packages/discord.js/src/structures/SelectMenuBuilder.js
+++ b/packages/discord.js/src/structures/SelectMenuBuilder.js
@@ -2,7 +2,7 @@
 
 const { SelectMenuBuilder: BuildersSelectMenu, isJSONEncodable, normalizeArray } = require('@discordjs/builders');
 const { toSnakeCase } = require('../util/Transformers');
-const { parseEmoji } = require('../util/Util');
+const { resolvePartialEmoji } = require('../util/Util');
 
 /**
  * Class used to build select menu components to be sent through the API
@@ -15,7 +15,7 @@ class SelectMenuBuilder extends BuildersSelectMenu {
         ...data,
         options: options?.map(({ emoji, ...option }) => ({
           ...option,
-          emoji: emoji && typeof emoji === 'string' ? parseEmoji(emoji) : emoji,
+          emoji: emoji && typeof emoji === 'string' ? resolvePartialEmoji(emoji) : emoji,
         })),
       }),
     );
@@ -35,7 +35,7 @@ class SelectMenuBuilder extends BuildersSelectMenu {
     const { emoji, ...option } = selectMenuOption;
     return {
       ...option,
-      emoji: typeof emoji === 'string' ? parseEmoji(emoji) : emoji,
+      emoji: typeof emoji === 'string' ? resolvePartialEmoji(emoji) : emoji,
     };
   }
 
diff --git a/packages/discord.js/src/structures/SelectMenuOptionBuilder.js b/packages/discord.js/src/structures/SelectMenuOptionBuilder.js
index c5f0bd136b60..8c9d87a22779 100644
--- a/packages/discord.js/src/structures/SelectMenuOptionBuilder.js
+++ b/packages/discord.js/src/structures/SelectMenuOptionBuilder.js
@@ -2,7 +2,7 @@
 
 const { SelectMenuOptionBuilder: BuildersSelectMenuOption, isJSONEncodable } = require('@discordjs/builders');
 const { toSnakeCase } = require('../util/Transformers');
-const { parseEmoji } = require('../util/Util');
+const { resolvePartialEmoji } = require('../util/Util');
 
 /**
  * Represents a select menu option builder.
@@ -13,7 +13,7 @@ class SelectMenuOptionBuilder extends BuildersSelectMenuOption {
     super(
       toSnakeCase({
         ...data,
-        emoji: emoji && typeof emoji === 'string' ? parseEmoji(emoji) : emoji,
+        emoji: emoji && typeof emoji === 'string' ? resolvePartialEmoji(emoji) : emoji,
       }),
     );
   }
@@ -24,7 +24,7 @@ class SelectMenuOptionBuilder extends BuildersSelectMenuOption {
    */
   setEmoji(emoji) {
     if (typeof emoji === 'string') {
-      return super.setEmoji(parseEmoji(emoji));
+      return super.setEmoji(resolvePartialEmoji(emoji));
     }
     return super.setEmoji(emoji);
   }