From 258f537938c32af1bb9038ac6bf08bf35ec690ca Mon Sep 17 00:00:00 2001 From: TheCodedProf Date: Sat, 22 Apr 2023 20:22:10 -0400 Subject: [PATCH 1/2] fixed string testing --- src/events/messageCreate.ts | 2 +- src/reflex/scanners.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts index cc69bf0..6c26d2a 100644 --- a/src/events/messageCreate.ts +++ b/src/events/messageCreate.ts @@ -268,7 +268,7 @@ export async function callback(_client: NucleusClient, message: Message) { const check = TestString( content, config.filters.wordFilter.words.loose, - config.filters.wordFilter.words.strict + config.filters.wordFilter.words.strict, ); if (check !== null) { messageException(message.guild.id, message.channel.id, message.id); diff --git a/src/reflex/scanners.ts b/src/reflex/scanners.ts index 0ae285a..d6ecba9 100644 --- a/src/reflex/scanners.ts +++ b/src/reflex/scanners.ts @@ -179,7 +179,7 @@ export function TestString( string: string, soft: string[], strict: string[], - enabled?: boolean + enabled: boolean = true ): { word: string; type: string } | null { if (!enabled) return null; for (const word of strict) { From 3a64870c96c3da85e7d4b68eeed8a9854d85fb86 Mon Sep 17 00:00:00 2001 From: TheCodedProf Date: Sat, 22 Apr 2023 20:23:15 -0400 Subject: [PATCH 2/2] removed unnecesary nullish-coallesing --- src/reflex/scanners.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reflex/scanners.ts b/src/reflex/scanners.ts index d6ecba9..963aebb 100644 --- a/src/reflex/scanners.ts +++ b/src/reflex/scanners.ts @@ -220,7 +220,7 @@ export async function doMemberChecks(member: Discord.GuildMember): Promise // Does the nickname contain filtered words let nameCheck; if (member.nickname) { - nameCheck = TestString(member.nickname ?? "", loose, strict, guildData.filters.wordFilter.enabled); + nameCheck = TestString(member.nickname, loose, strict, guildData.filters.wordFilter.enabled); } else { nameCheck = TestString(member.user.username, loose, strict, guildData.filters.wordFilter.enabled); }