Default to file not being malware (#74)

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

@ -410,36 +410,24 @@ const wordMenu = async (
} }
case "allowedUsers": { case "allowedUsers": {
await i.deferUpdate(); await i.deferUpdate();
current.allowed.users = await toSelectMenu( current.allowed.users = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.users, "member", "Word Filter")
m,
current.allowed.users,
"member",
"Word Filter"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "allowedRoles": { case "allowedRoles": {
await i.deferUpdate(); await i.deferUpdate();
current.allowed.roles = await toSelectMenu( current.allowed.roles = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.roles, "role", "Word Filter")
m,
current.allowed.roles,
"role",
"Word Filter"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "allowedChannels": { case "allowedChannels": {
await i.deferUpdate(); await i.deferUpdate();
current.allowed.channels = await toSelectMenu( current.allowed.channels = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.channels, "channel", "Word Filter")
m,
current.allowed.channels,
"channel",
"Word Filter"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
@ -556,34 +544,22 @@ const inviteMenu = async (
await i.deferUpdate(); await i.deferUpdate();
switch (i.values[0]) { switch (i.values[0]) {
case "users": { case "users": {
current.allowed.users = await toSelectMenu( current.allowed.users = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.users, "member", "Invite Settings")
m,
current.allowed.users,
"member",
"Invite Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "roles": { case "roles": {
current.allowed.roles = await toSelectMenu( current.allowed.roles = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.roles, "role", "Invite Settings")
m,
current.allowed.roles,
"role",
"Invite Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "channels": { case "channels": {
current.allowed.channels = await toSelectMenu( current.allowed.channels = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.channels, "channel", "Invite Settings")
m,
current.allowed.channels,
"channel",
"Invite Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
@ -803,12 +779,14 @@ const mentionMenu = async (
} }
case "roles": { case "roles": {
await i.deferUpdate(); await i.deferUpdate();
current.allowed.rolesToMention = await toSelectMenu( current.allowed.rolesToMention = _.cloneDeep(
interaction, await toSelectMenu(
m, interaction,
current.allowed.rolesToMention, m,
"role", current.allowed.rolesToMention,
"Mention Settings" "role",
"Mention Settings"
)
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
@ -820,34 +798,28 @@ const mentionMenu = async (
await i.deferUpdate(); await i.deferUpdate();
switch (i.values[0]) { switch (i.values[0]) {
case "users": { case "users": {
current.allowed.users = await toSelectMenu( current.allowed.users = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.users, "member", "Mention Settings")
m,
current.allowed.users,
"member",
"Mention Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "roles": { case "roles": {
current.allowed.roles = await toSelectMenu( current.allowed.roles = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.roles, "role", "Mention Settings")
m,
current.allowed.roles,
"role",
"Mention Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "channels": { case "channels": {
current.allowed.channels = await toSelectMenu( current.allowed.channels = _.cloneDeep(
interaction, await toSelectMenu(
m, interaction,
current.allowed.channels, m,
"channel", current.allowed.channels,
"Mention Settings" "channel",
"Mention Settings"
)
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
@ -1004,23 +976,15 @@ const cleanMenu = async (
case "allowed": { case "allowed": {
switch (i.values[0]) { switch (i.values[0]) {
case "users": { case "users": {
current.allowed.users = await toSelectMenu( current.allowed.users = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.users, "member", "Mention Settings")
m,
current.allowed.users,
"member",
"Mention Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;
} }
case "roles": { case "roles": {
current.allowed.roles = await toSelectMenu( current.allowed.roles = _.cloneDeep(
interaction, await toSelectMenu(interaction, m, current.allowed.roles, "role", "Mention Settings")
m,
current.allowed.roles,
"role",
"Mention Settings"
); );
unsavedChanges = true; unsavedChanges = true;
break; break;

@ -67,7 +67,7 @@ export async function testMalware(link: string): Promise<MalwareSchema> {
try { try {
malware = (await clamscanner.scanFile(fileName)).isInfected; malware = (await clamscanner.scanFile(fileName)).isInfected;
} catch (e) { } catch (e) {
return { malware: true }; return { malware: false };
} }
await client.database.scanCache.write(hash, "malware", malware); await client.database.scanCache.write(hash, "malware", malware);
return { malware }; return { malware };
@ -198,12 +198,16 @@ export function TestString(
} }
export async function TestImage(url: string): Promise<string | null> { export async function TestImage(url: string): Promise<string | null> {
const text = await Tesseract.recognize(url, { try {
lang: "eng", const text = await Tesseract.recognize(url, {
oem: 1, lang: "eng",
psm: 3 oem: 1,
}); psm: 3
return text; });
return text;
} catch {
return null;
}
} }
export async function doMemberChecks(member: Discord.GuildMember): Promise<void> { export async function doMemberChecks(member: Discord.GuildMember): Promise<void> {

Loading…
Cancel
Save