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

* 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

View File

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

View File

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

View File

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