Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-11 17:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(SelectMenuBuilder): properly accept SelectMenuOptionBuilders (#8174)

Browse Source
This commit is contained in:
Suneet Tipirneni
2022-07-03 12:04:08 -04:00
committed by GitHub
parent cdd9214212
commit 31d5930464
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/discord.js/src/structures/SelectMenuBuilder.js
View File

@@ -21,18 +21,31 @@ class SelectMenuBuilder extends BuildersSelectMenu {
);
}
/**
* Normalizes a select menu option emoji
* @param {SelectMenuOptionData|JSONEncodable<APISelectMenuOption>} selectMenuOption The option to normalize
* @returns {Array<SelectMenuOptionBuilder|APISelectMenuOption>}
* @private
*/
static normalizeEmoji(selectMenuOption) {
if (isJSONEncodable(selectMenuOption)) {
return selectMenuOption;
}
const { emoji, ...option } = selectMenuOption;
return {
...option,
emoji: typeof emoji === 'string' ? parseEmoji(emoji) : emoji,
};
}
/**
* Adds options to this select menu
* @param {RestOrArray<APISelectMenuOption>} options The options to add to this select menu
* @returns {SelectMenuBuilder}
*/
addOptions(...options) {
return super.addOptions(
normalizeArray(options).map(({ emoji, ...option }) => ({
...option,
emoji: emoji && typeof emoji === 'string' ? parseEmoji(emoji) : emoji,
})),
);
return super.addOptions(normalizeArray(options).map(option => SelectMenuBuilder.normalizeEmoji(option)));
}
/**
@@ -41,12 +54,7 @@ class SelectMenuBuilder extends BuildersSelectMenu {
* @returns {SelectMenuBuilder}
*/
setOptions(...options) {
return super.setOptions(
normalizeArray(options).map(({ emoji, ...option }) => ({
...option,
emoji: emoji && typeof emoji === 'string' ? parseEmoji(emoji) : emoji,
})),
);
return super.setOptions(normalizeArray(options).map(option => SelectMenuBuilder.normalizeEmoji(option)));
}
/**

3
packages/discord.js/typings/index.d.ts vendored
View File

@@ -616,6 +616,9 @@ export class ButtonBuilder extends BuilderButtonComponent {
export class SelectMenuBuilder extends BuilderSelectMenuComponent {
public constructor(data?: Partial<SelectMenuComponentData | APISelectMenuComponent>);
private static normalizeEmoji(
selectMenuOption: JSONEncodable<APISelectMenuOption> | SelectMenuComponentOptionData,
): (APISelectMenuOption | SelectMenuOptionBuilder)[];
public override addOptions(
...options: RestOrArray<BuildersSelectMenuOption | SelectMenuComponentOptionData | APISelectMenuOption>
): this;