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

fix(Components): support emoji id strings (#8310)

Browse Source
This commit is contained in:
advaith
2022-07-19 05:56:21 -07:00
committed by GitHub
parent 70dd757ec3
commit 660e212e83
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/discord.js/src/structures/ButtonBuilder.js
View File

@@ -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);
}

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

@@ -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,
};
}

6
packages/discord.js/src/structures/SelectMenuOptionBuilder.js
View File

@@ -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);
}