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

feat(cleanContent): add slash commands and emojis (#9809)

Browse Source 
* feat(cleanContent): add missing commands and emojis

Co-authored-by: Vlad Frangu <kingdgrizzle@gmail.com>

* fix: check for every possible name

* fix: use non capturing group

---------

Co-authored-by: Vlad Frangu <kingdgrizzle@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Jaw0r3k
2023-11-05 19:36:16 +01:00
committed by GitHub
parent 31d914e44b
commit c2349d4be4
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,7 +365,14 @@ function basename(path, ext) {
* @returns {string} * @returns {string}
*/ */
function cleanContent(str, channel) { function cleanContent(str, channel) {
return str.replaceAll(/<(@[!&]?|#)(\d{17,19})>/g, (match, type, id) => { return str.replaceAll(
/* eslint-disable max-len */
/<(?:(?<type>@[!&]?|#)|(?:\/(?<commandName>[-_\p{L}\p{N}\p{sc=Deva}\p{sc=Thai} ]+):)|(?:a?:(?<emojiName>[\w]+):))(?<id>\d{17,19})>/gu,
(match, type, commandName, emojiName, id) => {
if (commandName) return `/${commandName}`;
if (emojiName) return `:${emojiName}:`;
switch (type) { switch (type) {
case '@': case '@':
case '@!': { case '@!': {
@@ -375,7 +382,7 @@ function cleanContent(str, channel) {
} }
const user = channel.client.users.cache.get(id); const user = channel.client.users.cache.get(id);
return user ? `@${user.username}` : match; return user ? `@${user.displayName}` : match;
} }
case '@&': { case '@&': {
if (channel.type === ChannelType.DM) return match; if (channel.type === ChannelType.DM) return match;
@@ -390,7 +397,8 @@ function cleanContent(str, channel) {
return match; return match;
} }
} }
}); },
);
} }
/** /**