dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-07-07 12:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(Util): Fix cleanContent mention exploit (#4663)

Browse source
This commit is contained in:
모메MoMe 2020-07-29 19:47:20 +09:00 committed by GitHub
parent 0e61fca974
commit fb1dd6b53a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util/Util.js
View file

@ -560,15 +560,15 @@ class Util {
const id = input.replace(/<|!|>|@/g, ''); const id = input.replace(/<|!|>|@/g, '');
if (message.channel.type === 'dm') { if (message.channel.type === 'dm') {
const user = message.client.users.cache.get(id); const user = message.client.users.cache.get(id);
return user ? `@${user.username}` : input; return user ? Util.removeMentions(`@${user.username}`) : input;
} }
const member = message.channel.guild.members.cache.get(id); const member = message.channel.guild.members.cache.get(id);
if (member) { if (member) {
return `@${member.displayName}`; return Util.removeMentions(`@${member.displayName}`);
} else { } else {
const user = message.client.users.cache.get(id); const user = message.client.users.cache.get(id);
return user ? `@${user.username}` : input; return user ? Util.removeMentions(`@${user.username}`) : input;
} }
}) })
.replace(/<#[0-9]+>/g, input => { .replace(/<#[0-9]+>/g, input => {