updated name check

pull/76/head
Samuel Shuert 3 years ago committed by GitHub
parent 5ad98d3cff
commit eb13a1bdde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -217,9 +217,13 @@ export async function doMemberChecks(member: Discord.GuildMember): Promise<void>
if (!guildData.logging.staff.channel) return; if (!guildData.logging.staff.channel) return;
const [loose, strict] = [guildData.filters.wordFilter.words.loose, guildData.filters.wordFilter.words.strict]; const [loose, strict] = [guildData.filters.wordFilter.words.loose, guildData.filters.wordFilter.words.strict];
// Does the username contain filtered words // Does the username contain filtered words
const usernameCheck = TestString(member.user.username, loose, strict, guildData.filters.wordFilter.enabled);
// Does the nickname contain filtered words // Does the nickname contain filtered words
const nicknameCheck = TestString(member.nickname ?? "", loose, strict, guildData.filters.wordFilter.enabled); let nameCheck;
if(member.nickname) {
nameCheck = TestString(member.nickname ?? "", loose, strict, guildData.filters.wordFilter.enabled);
} else {
nameCheck = TestString(member.user.username, loose, strict, guildData.filters.wordFilter.enabled);
}
// Does the profile picture contain filtered words // Does the profile picture contain filtered words
const avatarTextCheck = TestString( const avatarTextCheck = TestString(
(await TestImage(member.displayAvatarURL({ forceStatic: true }))) ?? "", (await TestImage(member.displayAvatarURL({ forceStatic: true }))) ?? "",
@ -236,8 +240,7 @@ export async function doMemberChecks(member: Discord.GuildMember): Promise<void>
const nicknameInviteCheck = const nicknameInviteCheck =
guildData.filters.invite.enabled && /discord\.gg\/[a-zA-Z0-9]+/gi.test(member.nickname ?? ""); guildData.filters.invite.enabled && /discord\.gg\/[a-zA-Z0-9]+/gi.test(member.nickname ?? "");
if ( if (
usernameCheck !== null || nameCheck !== null ||
nicknameCheck !== null ||
avatarCheck || avatarCheck ||
inviteCheck || inviteCheck ||
nicknameInviteCheck || nicknameInviteCheck ||

Loading…
Cancel
Save