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: minimum 2 characters for custom emojis

Browse Source
This commit is contained in:
Jiralite
2026-01-02 11:24:42 +00:00
parent 311413e5f2
commit 5dacf1a688
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/builders/__tests__/components/button.test.ts
View File

@@ -26,7 +26,17 @@ describe('Button Components', () => {
.setCustomId('custom')
.setLabel('test')
.setDisabled(true)
.setEmoji({ name: 'test' });
.setEmoji({ name: '🩵' });
button.toJSON();
}).not.toThrowError();
expect(() => {
const button = new PrimaryButtonBuilder()
.setCustomId('custom')
.setLabel('test')
.setDisabled(true)
.setEmoji({ id: '1234567890123456', name: 'test', animated: true });
button.toJSON();
}).not.toThrowError();
@@ -37,7 +47,7 @@ describe('Button Components', () => {
}).not.toThrowError();
expect(() => {
const button = new DangerButtonBuilder().setCustomId('custom').setEmoji({ name: 'ok' });
const button = new DangerButtonBuilder().setCustomId('custom').setEmoji({ name: '👌' });
button.toJSON();
}).not.toThrowError();
@@ -47,7 +57,7 @@ describe('Button Components', () => {
}).not.toThrowError();
expect(() => {
const button = new LinkButtonBuilder().setURL('https://discord.js.org').setEmoji({ name: 'ok' });
const button = new LinkButtonBuilder().setURL('https://discord.js.org').setEmoji({ name: '👌' });
button.toJSON();
}).not.toThrowError();
@@ -66,7 +76,17 @@ describe('Button Components', () => {
expect(() => {
// @ts-expect-error: Invalid emoji
const button = new PrimaryButtonBuilder().setEmoji('test');
const button = new PrimaryButtonBuilder().setEmoji('🩵');
button.toJSON();
}).toThrowError();
expect(() => {
const button = new PrimaryButtonBuilder()
.setCustomId('custom')
.setLabel('test')
.setDisabled(true)
.setEmoji({ id: '1234567890123456', name: '1' });
button.toJSON();
}).toThrowError();
@@ -86,7 +106,7 @@ describe('Button Components', () => {
// @ts-expect-error: Invalid parameter for disabled
expect(() => new PrimaryButtonBuilder().setCustomId('hi').setDisabled(0).toJSON()).toThrowError();
// @ts-expect-error: Invalid emoji
expect(() => new PrimaryButtonBuilder().setCustomId('hi').setEmoji('foo').toJSON()).toThrowError();
expect(() => new PrimaryButtonBuilder().setCustomId('hi').setEmoji('🩵').toJSON()).toThrowError();
expect(() =>
new LinkButtonBuilder()

2
packages/builders/__tests__/components/selectMenu.test.ts
View File

@@ -80,7 +80,7 @@ describe('Select Menu Components', () => {
.setLabel('test')
.setValue('test')
.setDefault(true)
.setEmoji({ name: 'test' })
.setEmoji({ name: '🩵' })
.setDescription('description');
expect(() => selectMenuWithId().addOptions(option).toJSON()).not.toThrowError();
expect(() => selectMenuWithId().setOptions(option).toJSON()).not.toThrowError();

19
packages/builders/src/components/Assertions.ts
View File

@@ -5,12 +5,25 @@ import { idPredicate, customIdPredicate, snowflakePredicate } from '../Assertion
export const emojiPredicate = z
.strictObject({
id: snowflakePredicate.optional(),
name: z.string().min(1).max(32).optional(),
name: z.string().max(32).optional(),
animated: z.boolean().optional(),
})
.refine((data) => data.id !== undefined || data.name !== undefined, {
error: "Either 'id' or 'name' must be provided",
});
error: "Either 'id' or 'name' must be provided.",
})
.refine(
(data) => {
if (data.id !== undefined && data.name !== undefined) {
return data.name.length >= 2;
}
return true;
},
{
error: 'Custom emoji names must be at least 2 characters.',
path: ['name'],
},
);
const buttonPredicateBase = z.strictObject({
type: z.literal(ComponentType.Button),