chore: make requested changes

discordjs · Mar 11, 2022 · 2718ffa · 2718ffa
1 parent 8b87233
commit 2718ffa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/packages/discord.js/src/structures/ButtonComponent.js b/packages/discord.js/src/structures/ButtonComponent.js
@@ -14,7 +14,7 @@ class ButtonComponent extends BuildersButtonComponent {
 
   /**
    * Sets the emoji to display on this button
-   * @param {ComponentEmojiResolvable} emoji The emoji to display on this button
+   * @param {string|APIMessageComponentEmoji} emoji The emoji to display on this button
    * @returns {ButtonComponent}
    */
   setEmoji(emoji) {

diff --git a/packages/discord.js/src/structures/SelectMenuOption.js b/packages/discord.js/src/structures/SelectMenuOption.js
@@ -9,7 +9,7 @@ const Util = require('../util/Util');
 class SelectMenuOption extends BuildersSelectMenuOption {
   /**
    * Sets the emoji to display on this option
-   * @param {APIMessageComponentEmoji} emoji The emoji to display on this option
+   * @param {string|APIMessageComponentEmoji} emoji The emoji to display on this option
    * @returns {SelectMenuOption}
    */
   setEmoji(emoji) {

diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
@@ -503,11 +503,9 @@ export class ButtonInteraction<Cached extends CacheType = CacheType> extends Mes
   public inRawGuild(): this is ButtonInteraction<'raw'>;
 }
 
-export type ComponentEmojiResolvable = APIMessageComponentEmoji | `<${'a' | ''}:${string}:${bigint}>`;
-
 export class ButtonComponent extends BuilderButtonComponent {
   public constructor(data?: ButtonComponentData | (Omit<APIButtonComponent, 'type'> & { type?: ComponentType.Button }));
-  public override setEmoji(emoji: ComponentEmojiResolvable): this;
+  public override setEmoji(emoji: string | APIMessageComponentEmoji): this;
 }
 
 export class SelectMenuComponent extends BuilderSelectMenuComponent {
@@ -517,7 +515,7 @@ export class SelectMenuComponent extends BuilderSelectMenuComponent {
 }
 
 export class SelectMenuOption extends BuildersSelectMenuOption {
-  public setEmoji(emoji: ComponentEmojiResolvable): this;
+  public setEmoji(emoji: string | APIMessageComponentEmoji): this;
 }
 
 export class TextInputComponent extends BuilderTextInputComponent {

diff --git a/packages/discord.js/typings/index.test-d.ts b/packages/discord.js/typings/index.test-d.ts
@@ -1361,8 +1361,13 @@ new ButtonComponent({
 })
   .setEmoji('<a:foo:123>')
   .setEmoji('<:foo:123>')
-  // @ts-expect-error
-  .setEmoji(':foobar:123');
+  .setEmoji('foobar:123')
+  .setEmoji('normal')
+  .setEmoji({
+    name: 'test',
+    id: '123',
+    animated: false,
+  });
 
 // @ts-expect-error
 new Embed().setColor('abc');