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

fix: Remove deprecation warning on Message#cleanContent (#7143)

Browse Source
This commit is contained in:
Jiralite
2021-12-26 14:46:28 +00:00
committed by GitHub
parent f1d35e32ee
commit 7e5f16b6b3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/Util.js
View File

@@ -538,6 +538,10 @@ class Util extends null {
deprecationEmittedForRemoveMentions = true; deprecationEmittedForRemoveMentions = true;
} }
return Util._removeMentions(str);
}
static _removeMentions(str) {
return str.replaceAll('@', '@\u200b'); return str.replaceAll('@', '@\u200b');
} }
@@ -555,15 +559,15 @@ class Util extends null {
const id = input.replace(/<|!|>|@/g, ''); const id = input.replace(/<|!|>|@/g, '');
if (channel.type === 'DM') { if (channel.type === 'DM') {
const user = channel.client.users.cache.get(id); const user = channel.client.users.cache.get(id);
return user ? Util.removeMentions(`@${user.username}`) : input; return user ? Util._removeMentions(`@${user.username}`) : input;
} }
const member = channel.guild.members.cache.get(id); const member = channel.guild.members.cache.get(id);
if (member) { if (member) {
return Util.removeMentions(`@${member.displayName}`); return Util._removeMentions(`@${member.displayName}`);
} else { } else {
const user = channel.client.users.cache.get(id); const user = channel.client.users.cache.get(id);
return user ? Util.removeMentions(`@${user.username}`) : input; return user ? Util._removeMentions(`@${user.username}`) : input;
} }
}) })
.replace(/<#[0-9]+>/g, input => { .replace(/<#[0-9]+>/g, input => {

1
typings/index.d.ts vendored
View File

@@ -2416,6 +2416,7 @@ export class Util extends null {
public static cleanContent(str: string, channel: TextBasedChannel): string; public static cleanContent(str: string, channel: TextBasedChannel): string;
/** @deprecated Use {@link MessageOptions.allowedMentions} to control mentions in a message instead. */ /** @deprecated Use {@link MessageOptions.allowedMentions} to control mentions in a message instead. */
public static removeMentions(str: string): string; public static removeMentions(str: string): string;
private static _removeMentions(str: string): string;
public static cloneObject(obj: unknown): unknown; public static cloneObject(obj: unknown): unknown;
public static discordSort<K, V extends { rawPosition: number; id: Snowflake }>( public static discordSort<K, V extends { rawPosition: number; id: Snowflake }>(
collection: Collection<K, V>, collection: Collection<K, V>,