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

feat: allow emoji strings to be passed through constructors (#7718)

Browse Source 
* feat: allow strings to be passed through constructors

* fix: don't overwrite emoji with raw data
This commit is contained in:
Rodry
2022-04-12 11:19:27 -04:00
committed by GitHub
parent 9ff54254d8
commit 0faac04b69
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,10 @@ const Transformers = require('../util/Transformers');
const Util = require('../util/Util'); const Util = require('../util/Util');
class ButtonBuilder extends BuildersButtonComponent { class ButtonBuilder extends BuildersButtonComponent {
constructor(data) { constructor({ emoji, ...data }) {
super(Transformers.toSnakeCase(data)); super(
Transformers.toSnakeCase({ ...data, emoji: emoji && typeof emoji === 'string' ? Util.parseEmoji(emoji) : emoji }),
);
} }
/** /**

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

@@ -2,10 +2,19 @@
const { SelectMenuBuilder: BuildersSelectMenuComponent, isJSONEncodable } = require('@discordjs/builders'); const { SelectMenuBuilder: BuildersSelectMenuComponent, isJSONEncodable } = require('@discordjs/builders');
const Transformers = require('../util/Transformers'); const Transformers = require('../util/Transformers');
const Util = require('../util/Util');
class SelectMenuBuilder extends BuildersSelectMenuComponent { class SelectMenuBuilder extends BuildersSelectMenuComponent {
constructor(data) { constructor({ options, ...data }) {
super(Transformers.toSnakeCase(data)); super(
Transformers.toSnakeCase({
options: options.map(({ emoji, ...option }) => ({
...option,
emoji: emoji && typeof emoji === 'string' ? Util.parseEmoji(emoji) : emoji,
})),
...data,
}),
);
} }
/** /**

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

@@ -4685,7 +4685,7 @@ export interface MessageActivity {
export interface BaseButtonComponentData extends BaseComponentData { export interface BaseButtonComponentData extends BaseComponentData {
disabled?: boolean; disabled?: boolean;
emoji?: APIMessageComponentEmoji; emoji?: ComponentEmojiResolvable;
label?: string; label?: string;
} }
@@ -4819,7 +4819,7 @@ export interface MessageSelectOption {
export interface SelectMenuComponentOptionData { export interface SelectMenuComponentOptionData {
default?: boolean; default?: boolean;
description?: string; description?: string;
emoji?: APIMessageComponentEmoji; emoji?: ComponentEmojiResolvable;
label: string; label: string;
value: string; value: string;
} }