From 7056a3d2e0617011930c56ebe2d62d6f38650451 Mon Sep 17 00:00:00 2001 From: PineappleFan Date: Thu, 30 Mar 2023 20:52:45 +0100 Subject: [PATCH 1/4] Default to file not being malware --- 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 6d3fc71..f64a520 100644 --- a/src/reflex/scanners.ts +++ b/src/reflex/scanners.ts @@ -67,7 +67,7 @@ export async function testMalware(link: string): Promise { try { malware = (await clamscanner.scanFile(fileName)).isInfected; } catch (e) { - return { malware: true }; + return { malware: false }; } await client.database.scanCache.write(hash, "malware", malware); return { malware }; From 4f9e97fb5256c8026ed96116b29debd039a6a546 Mon Sep 17 00:00:00 2001 From: TheCodedProf Date: Fri, 7 Apr 2023 14:15:58 -0400 Subject: [PATCH 2/4] added deepClones --- src/commands/settings/automod.ts | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts index 0d9188a..fdf806b 100644 --- a/src/commands/settings/automod.ts +++ b/src/commands/settings/automod.ts @@ -410,37 +410,37 @@ const wordMenu = async ( } case "allowedUsers": { await i.deferUpdate(); - current.allowed.users = await toSelectMenu( + current.allowed.users = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.users, "member", "Word Filter" - ); + )); unsavedChanges = true; break; } case "allowedRoles": { await i.deferUpdate(); - current.allowed.roles = await toSelectMenu( + current.allowed.roles = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.roles, "role", "Word Filter" - ); + )); unsavedChanges = true; break; } case "allowedChannels": { await i.deferUpdate(); - current.allowed.channels = await toSelectMenu( + current.allowed.channels = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.channels, "channel", "Word Filter" - ); + )); unsavedChanges = true; break; } @@ -556,35 +556,35 @@ const inviteMenu = async ( await i.deferUpdate(); switch (i.values[0]) { case "users": { - current.allowed.users = await toSelectMenu( + current.allowed.users = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.users, "member", "Invite Settings" - ); + )); unsavedChanges = true; break; } case "roles": { - current.allowed.roles = await toSelectMenu( + current.allowed.roles = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.roles, "role", "Invite Settings" - ); + )); unsavedChanges = true; break; } case "channels": { - current.allowed.channels = await toSelectMenu( + current.allowed.channels = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.channels, "channel", "Invite Settings" - ); + )); unsavedChanges = true; break; } @@ -803,13 +803,13 @@ const mentionMenu = async ( } case "roles": { await i.deferUpdate(); - current.allowed.rolesToMention = await toSelectMenu( + current.allowed.rolesToMention = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.rolesToMention, "role", "Mention Settings" - ); + )); unsavedChanges = true; break; } @@ -820,35 +820,35 @@ const mentionMenu = async ( await i.deferUpdate(); switch (i.values[0]) { case "users": { - current.allowed.users = await toSelectMenu( + current.allowed.users = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.users, "member", "Mention Settings" - ); + )); unsavedChanges = true; break; } case "roles": { - current.allowed.roles = await toSelectMenu( + current.allowed.roles = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.roles, "role", "Mention Settings" - ); + )); unsavedChanges = true; break; } case "channels": { - current.allowed.channels = await toSelectMenu( + current.allowed.channels = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.channels, "channel", "Mention Settings" - ); + )); unsavedChanges = true; break; } @@ -1004,24 +1004,24 @@ const cleanMenu = async ( case "allowed": { switch (i.values[0]) { case "users": { - current.allowed.users = await toSelectMenu( + current.allowed.users = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.users, "member", "Mention Settings" - ); + )); unsavedChanges = true; break; } case "roles": { - current.allowed.roles = await toSelectMenu( + current.allowed.roles = _.cloneDeep(await toSelectMenu( interaction, m, current.allowed.roles, "role", "Mention Settings" - ); + )); unsavedChanges = true; break; } From ca387af94743fa511c4c2d168c1ccfc789fcc2c6 Mon Sep 17 00:00:00 2001 From: TheCodedProf Date: Fri, 7 Apr 2023 14:42:41 -0400 Subject: [PATCH 3/4] added try catch to tesseract --- src/reflex/scanners.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/reflex/scanners.ts b/src/reflex/scanners.ts index f64a520..a6e94d6 100644 --- a/src/reflex/scanners.ts +++ b/src/reflex/scanners.ts @@ -198,12 +198,16 @@ export function TestString( } export async function TestImage(url: string): Promise { - const text = await Tesseract.recognize(url, { - lang: "eng", - oem: 1, - psm: 3 - }); - return text; + try { + const text = await Tesseract.recognize(url, { + lang: "eng", + oem: 1, + psm: 3 + }); + return text; + } catch { + return null; + } } export async function doMemberChecks(member: Discord.GuildMember): Promise { From 36d99b352f59eaa9c1f50f4cde0c35c50378e7f4 Mon Sep 17 00:00:00 2001 From: TheCodedProf Date: Fri, 7 Apr 2023 14:54:01 -0400 Subject: [PATCH 4/4] prettier --- src/commands/settings/automod.ts | 132 +++++++++++-------------------- 1 file changed, 48 insertions(+), 84 deletions(-) diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts index fdf806b..a854fc5 100644 --- a/src/commands/settings/automod.ts +++ b/src/commands/settings/automod.ts @@ -410,37 +410,25 @@ const wordMenu = async ( } case "allowedUsers": { await i.deferUpdate(); - current.allowed.users = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.users, - "member", - "Word Filter" - )); + current.allowed.users = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.users, "member", "Word Filter") + ); unsavedChanges = true; break; } case "allowedRoles": { await i.deferUpdate(); - current.allowed.roles = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.roles, - "role", - "Word Filter" - )); + current.allowed.roles = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.roles, "role", "Word Filter") + ); unsavedChanges = true; break; } case "allowedChannels": { await i.deferUpdate(); - current.allowed.channels = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.channels, - "channel", - "Word Filter" - )); + current.allowed.channels = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.channels, "channel", "Word Filter") + ); unsavedChanges = true; break; } @@ -556,35 +544,23 @@ const inviteMenu = async ( await i.deferUpdate(); switch (i.values[0]) { case "users": { - current.allowed.users = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.users, - "member", - "Invite Settings" - )); + current.allowed.users = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.users, "member", "Invite Settings") + ); unsavedChanges = true; break; } case "roles": { - current.allowed.roles = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.roles, - "role", - "Invite Settings" - )); + current.allowed.roles = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.roles, "role", "Invite Settings") + ); unsavedChanges = true; break; } case "channels": { - current.allowed.channels = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.channels, - "channel", - "Invite Settings" - )); + current.allowed.channels = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.channels, "channel", "Invite Settings") + ); unsavedChanges = true; break; } @@ -803,13 +779,15 @@ const mentionMenu = async ( } case "roles": { await i.deferUpdate(); - current.allowed.rolesToMention = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.rolesToMention, - "role", - "Mention Settings" - )); + current.allowed.rolesToMention = _.cloneDeep( + await toSelectMenu( + interaction, + m, + current.allowed.rolesToMention, + "role", + "Mention Settings" + ) + ); unsavedChanges = true; break; } @@ -820,35 +798,29 @@ const mentionMenu = async ( await i.deferUpdate(); switch (i.values[0]) { case "users": { - current.allowed.users = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.users, - "member", - "Mention Settings" - )); + current.allowed.users = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.users, "member", "Mention Settings") + ); unsavedChanges = true; break; } case "roles": { - current.allowed.roles = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.roles, - "role", - "Mention Settings" - )); + current.allowed.roles = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.roles, "role", "Mention Settings") + ); unsavedChanges = true; break; } case "channels": { - current.allowed.channels = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.channels, - "channel", - "Mention Settings" - )); + current.allowed.channels = _.cloneDeep( + await toSelectMenu( + interaction, + m, + current.allowed.channels, + "channel", + "Mention Settings" + ) + ); unsavedChanges = true; break; } @@ -1004,24 +976,16 @@ const cleanMenu = async ( case "allowed": { switch (i.values[0]) { case "users": { - current.allowed.users = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.users, - "member", - "Mention Settings" - )); + current.allowed.users = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.users, "member", "Mention Settings") + ); unsavedChanges = true; break; } case "roles": { - current.allowed.roles = _.cloneDeep(await toSelectMenu( - interaction, - m, - current.allowed.roles, - "role", - "Mention Settings" - )); + current.allowed.roles = _.cloneDeep( + await toSelectMenu(interaction, m, current.allowed.roles, "role", "Mention Settings") + ); unsavedChanges = true; break; }