chore: make requested changes

discordjs · Mar 14, 2022 · fd8cc10 · fd8cc10
1 parent b9251de
commit fd8cc10
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 24 deletions.
diff --git a/packages/discord.js/src/index.js b/packages/discord.js/src/index.js
@@ -142,7 +142,7 @@ exports.Role = require('./structures/Role').Role;
 exports.SelectMenuBuilder = require('./structures/SelectMenuBuilder');
 exports.SelectMenuComponent = require('./structures/SelectMenuComponent');
 exports.SelectMenuInteraction = require('./structures/SelectMenuInteraction');
-exports.SelectMenuOption = require('./structures/SelectMenuOption');
+exports.SelectMenuOptionBuilder = require('./structures/SelectMenuOptionBuilder');
 exports.StageChannel = require('./structures/StageChannel');
 exports.StageInstance = require('./structures/StageInstance').StageInstance;
 exports.Sticker = require('./structures/Sticker').Sticker;

diff --git a/packages/discord.js/src/structures/ButtonBuilder.js b/packages/discord.js/src/structures/ButtonBuilder.js
@@ -2,12 +2,25 @@
 
 const { ButtonBuilder: BuildersButtonComponent, isJSONEncodable } = require('@discordjs/builders');
 const Transformers = require('../util/Transformers');
+const Util = require('../util/Util');
 
 class ButtonBuilder extends BuildersButtonComponent {
   constructor(data) {
     super(Transformers.toSnakeCase(data));
   }
 
+  /**
+   * Sets the emoji to display on this button
+   * @param {string|APIMessageComponentEmoji} emoji The emoji to display on this button
+   * @returns {ButtonComponent}
+   */
+  setEmoji(emoji) {
+    if (typeof emoji === 'string') {
+      return super.setEmoji(Util.parseEmoji(emoji));
+    }
+    return super.setEmoji(emoji);
+  }
+
   /**
    * Creates a new button builder from json data
    * @param {JSONEncodable<APIButtonComponent> | APIButtonComponent} other The other data

diff --git a/packages/discord.js/src/structures/ButtonComponent.js b/packages/discord.js/src/structures/ButtonComponent.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const Component = require('./Component');
-const Util = require('../util/Util');
 
 /**
  * Represents a button component
@@ -61,18 +60,6 @@ class ButtonComponent extends Component {
   get url() {
     return this.data.url ?? null;
   }
-
-  /**
-   * Sets the emoji to display on this button
-   * @param {ComponentEmojiResolvable} emoji The emoji to display on this button
-   * @returns {ButtonComponent}
-   */
-  setEmoji(emoji) {
-    if (typeof emoji === 'string') {
-      return super.setEmoji(Util.parseEmoji(emoji));
-    }
-    return super.setEmoji(emoji);
-  }
 }
 
 module.exports = ButtonComponent;
diff --git a/...ord.js/src/structures/SelectMenuOption.js → ...src/structures/SelectMenuOptionBuilder.js b/...ord.js/src/structures/SelectMenuOption.js → ...src/structures/SelectMenuOptionBuilder.js
@@ -1,16 +1,16 @@
 'use strict';
 
-const { SelectMenuOption: BuildersSelectMenuOption } = require('@discordjs/builders');
+const { SelectMenuOptionBuilder: BuildersSelectMenuOption } = require('@discordjs/builders');
 const Util = require('../util/Util');
 
 /**
  * Represents a select menu option
  */
-class SelectMenuOption extends BuildersSelectMenuOption {
+class SelectMenuOptionBuilder extends BuildersSelectMenuOption {
   /**
    * Sets the emoji to display on this option
-   * @param {APIMessageComponentEmoji} emoji The emoji to display on this option
-   * @returns {SelectMenuOption}
+   * @param {ComponentEmojiResolvable} emoji The emoji to display on this option
+   * @returns {SelectMenuOptionBuilder}
    */
   setEmoji(emoji) {
     if (typeof emoji === 'string') {
@@ -20,4 +20,4 @@ class SelectMenuOption extends BuildersSelectMenuOption {
   }
 }
 
-module.exports = SelectMenuOption;
+module.exports = SelectMenuOptionBuilder;
diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
@@ -544,7 +544,7 @@ export type ComponentEmojiResolvable = APIMessageComponentEmoji | string;
 export class ButtonBuilder extends BuilderButtonComponent {
   public constructor(data?: ButtonComponentData | (Omit<APIButtonComponent, 'type'> & { type?: ComponentType.Button }));
   public static from(other: JSONEncodable<APIButtonComponent> | APIButtonComponent): ButtonBuilder;
-  public override setEmoji(emoji: string | ComponentEmojiResolvable): this;
+  public override setEmoji(emoji: ComponentEmojiResolvable): this;
 }
 
 export class SelectMenuBuilder extends BuilderSelectMenuComponent {
@@ -554,7 +554,7 @@ export class SelectMenuBuilder extends BuilderSelectMenuComponent {
   public static from(other: JSONEncodable<APISelectMenuComponent> | APISelectMenuComponent): SelectMenuBuilder;
 }
 
-export class SelectMenuOption extends BuildersSelectMenuOption {
+export class SelectMenuOptionBuilder extends BuildersSelectMenuOption {
   public setEmoji(emoji: ComponentEmojiResolvable): this;
 }
 
@@ -5348,7 +5348,6 @@ export {
 export {
   UnsafeButtonBuilder,
   UnsafeSelectMenuBuilder,
-  SelectMenuOptionBuilder,
   UnsafeSelectMenuOptionBuilder,
   MessageActionRowComponentBuilder,
   ModalActionRowComponentBuilder,

diff --git a/packages/discord.js/typings/index.test-d.ts b/packages/discord.js/typings/index.test-d.ts
@@ -1370,8 +1370,13 @@ new ButtonBuilder({
 })
   .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 EmbedBuilder().setColor('abc');