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(escapeX): emojis with underlines (#8945)

Browse Source 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Almeida
2022-12-25 20:04:26 +00:00
committed by GitHub
parent 36560c9955
commit 07b597df16
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/discord.js/src/util/Util.js
View File

@@ -185,7 +185,7 @@ function escapeItalic(text) {
return `\\*${match}`;
});
i = 0;
return text.replace(/(?<=^|[^_])_([^_]|__|$)/g, (_, match) => {
return text.replace(/(?<=^|[^_])(?<!<a?:.+)_(?!:\d+>)([^_]|__|$)/g, (_, match) => {
if (match === '__') return ++i % 2 ? `\\_${match}` : `${match}\\_`;
return `\\_${match}`;
});
@@ -211,7 +211,7 @@ function escapeBold(text) {
*/
function escapeUnderline(text) {
let i = 0;
return text.replace(/__(_)?/g, (_, match) => {
return text.replace(/(?<!<a?:.+)__(_)?(?!:\d+>)/g, (_, match) => {
if (match) return ++i % 2 ? `${match}\\_\\_` : `\\_\\_${match}`;
return '\\_\\_';
});

14
packages/discord.js/test/escapeMarkdown.test.js
View File

@@ -58,6 +58,13 @@ describe('escapeItalic', () => {
test('basic (*)', () => {
expect(Util.escapeItalic('*test*')).toEqual('\\*test\\*');
});
test('emoji', () => {
const testOne = 'This is a test with _emojis_ <:Frost_ed_Wreath:1053399941210443826> and **bold text**.';
expect(Util.escapeItalic(testOne)).toEqual(
'This is a test with \\_emojis\\_ <:Frost_ed_Wreath:1053399941210443826> and **bold text**.',
);
});
});
describe('escapeUnderline', () => {
@@ -70,6 +77,13 @@ describe('escapeUnderline', () => {
test('basic', () => {
expect(Util.escapeUnderline('__test__')).toEqual('\\_\\_test\\_\\_');
});
test('emoji', () => {
const testTwo = 'This is a test with __emojis__ <:Frost__ed__Wreath:1053399939654352978> and **bold text**.';
expect(Util.escapeUnderline(testTwo)).toBe(
'This is a test with \\_\\_emojis\\_\\_ <:Frost__ed__Wreath:1053399939654352978> and **bold text**.',
);
});
});
describe('escapeStrikethrough', () => {