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

refactor(formatters): Change :_: emoji name placeholder (#10567)

Browse Source 
* Change `:_:` emoji name placeholder

* Update tests

* Format
This commit is contained in:
cobalt
2024-11-10 18:42:04 -06:00
committed by Jiralite
parent bf0430f998
commit 169b05f319
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packages/formatters/__tests__/formatters.test.ts
View File

@@ -169,31 +169,37 @@ describe('Message formatters', () => {
}); });
describe('formatEmoji', () => { describe('formatEmoji', () => {
test('GIVEN static emojiId THEN returns "<:_:${emojiId}>"', () => { test('GIVEN static emojiId THEN returns "<:emoji:${emojiId}>"', () => {
expect<`<:_:851461487498493952>`>(formatEmoji('851461487498493952')).toEqual('<:_:851461487498493952>'); expect<`<:emoji:851461487498493952>`>(formatEmoji('851461487498493952')).toEqual('<:emoji:851461487498493952>');
}); });
test('GIVEN static emojiId WITH animated explicitly false THEN returns "<:_:[emojiId]>"', () => { test('GIVEN static emojiId WITH animated explicitly false THEN returns "<:emoji:[emojiId]>"', () => {
expect<`<:_:851461487498493952>`>(formatEmoji('851461487498493952', false)).toEqual('<:_:851461487498493952>'); expect<`<:emoji:851461487498493952>`>(formatEmoji('851461487498493952', false)).toEqual(
}); '<:emoji:851461487498493952>',
test('GIVEN animated emojiId THEN returns "<a:_:${emojiId}>"', () => {
expect<`<a:_:827220205352255549>`>(formatEmoji('827220205352255549', true)).toEqual('<a:_:827220205352255549>');
});
test('GIVEN static id in options object THEN returns "<:_:${id}>"', () => {
expect<`<:_:851461487498493952>`>(formatEmoji({ id: '851461487498493952' })).toEqual('<:_:851461487498493952>');
});
test('GIVEN static id in options object WITH animated explicitly false THEN returns "<:_:${id}>"', () => {
expect<`<:_:851461487498493952>`>(formatEmoji({ animated: false, id: '851461487498493952' })).toEqual(
'<:_:851461487498493952>',
); );
}); });
test('GIVEN animated id in options object THEN returns "<a:_:${id}>"', () => { test('GIVEN animated emojiId THEN returns "<a:emoji:${emojiId}>"', () => {
expect<`<a:_:827220205352255549>`>(formatEmoji({ animated: true, id: '827220205352255549' })).toEqual( expect<`<a:emoji:827220205352255549>`>(formatEmoji('827220205352255549', true)).toEqual(
'<a:_:827220205352255549>', '<a:emoji:827220205352255549>',
);
});
test('GIVEN static id in options object THEN returns "<:emoji:${id}>"', () => {
expect<`<:emoji:851461487498493952>`>(formatEmoji({ id: '851461487498493952' })).toEqual(
'<:emoji:851461487498493952>',
);
});
test('GIVEN static id in options object WITH animated explicitly false THEN returns "<:emoji:${id}>"', () => {
expect<`<:emoji:851461487498493952>`>(formatEmoji({ animated: false, id: '851461487498493952' })).toEqual(
'<:emoji:851461487498493952>',
);
});
test('GIVEN animated id in options object THEN returns "<a:emoji:${id}>"', () => {
expect<`<a:emoji:827220205352255549>`>(formatEmoji({ animated: true, id: '827220205352255549' })).toEqual(
'<a:emoji:827220205352255549>',
); );
}); });

8
packages/formatters/src/formatters.ts
View File

@@ -313,7 +313,7 @@ export function chatInputApplicationCommandMention<
* @typeParam EmojiId - This is inferred by the supplied emoji id * @typeParam EmojiId - This is inferred by the supplied emoji id
* @param emojiId - The emoji id to format * @param emojiId - The emoji id to format
*/ */
export function formatEmoji<EmojiId extends Snowflake>(emojiId: EmojiId, animated?: false): `<:_:${EmojiId}>`; export function formatEmoji<EmojiId extends Snowflake>(emojiId: EmojiId, animated?: false): `<:emoji:${EmojiId}>`;
/** /**
* Formats an animated emoji id into a fully qualified emoji identifier. * Formats an animated emoji id into a fully qualified emoji identifier.
@@ -322,7 +322,7 @@ export function formatEmoji<EmojiId extends Snowflake>(emojiId: EmojiId, animate
* @param emojiId - The emoji id to format * @param emojiId - The emoji id to format
* @param animated - Whether the emoji is animated * @param animated - Whether the emoji is animated
*/ */
export function formatEmoji<EmojiId extends Snowflake>(emojiId: EmojiId, animated?: true): `<a:_:${EmojiId}>`; export function formatEmoji<EmojiId extends Snowflake>(emojiId: EmojiId, animated?: true): `<a:emoji:${EmojiId}>`;
/** /**
* Formats an emoji id into a fully qualified emoji identifier. * Formats an emoji id into a fully qualified emoji identifier.
@@ -334,7 +334,7 @@ export function formatEmoji<EmojiId extends Snowflake>(emojiId: EmojiId, animate
export function formatEmoji<EmojiId extends Snowflake>( export function formatEmoji<EmojiId extends Snowflake>(
emojiId: EmojiId, emojiId: EmojiId,
animated?: boolean, animated?: boolean,
): `<:_:${EmojiId}>` | `<a:_:${EmojiId}>`; ): `<:emoji:${EmojiId}>` | `<a:emoji:${EmojiId}>`;
/** /**
* Formats a non-animated emoji id and name into a fully qualified emoji identifier. * Formats a non-animated emoji id and name into a fully qualified emoji identifier.
@@ -383,7 +383,7 @@ export function formatEmoji<EmojiId extends Snowflake, EmojiName extends string>
const { id, animated: isAnimated, name: emojiName } = options; const { id, animated: isAnimated, name: emojiName } = options;
return `<${isAnimated ? 'a' : ''}:${emojiName ?? '_'}:${id}>`; return `<${isAnimated ? 'a' : ''}:${emojiName ?? 'emoji'}:${id}>`;
} }
/** /**