From c6c0a3ed6bc6fb6723c47fd013534bf1146dc856 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Fri, 30 Jul 2021 20:49:01 -0400 Subject: remove debug stuff and remove message.deleteable because its broken --- src/commands/dev/say.ts | 4 +--- src/lib/badwords.json | 3 +-- src/listeners/message/automodCreate.ts | 10 ++++------ 3 files changed, 6 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/commands/dev/say.ts b/src/commands/dev/say.ts index 5042be4..0776f1b 100644 --- a/src/commands/dev/say.ts +++ b/src/commands/dev/say.ts @@ -30,9 +30,7 @@ export default class SayCommand extends BushCommand { if (!message.author.isOwner()) return await message.util.reply(`${util.emojis.error} Only my developers can run this command.`); - if (message.deletable) { - await message.delete(); - } + await message.delete().catch(() => {}); await message.util.send({ content: say, allowedMentions: AllowedMentions.none() }); } diff --git a/src/lib/badwords.json b/src/lib/badwords.json index 6ea3618..94c854f 100644 --- a/src/lib/badwords.json +++ b/src/lib/badwords.json @@ -11,6 +11,5 @@ "hi, bro h am leaving cs:go and giving away my skin": 3, "hi friend, today i am leaving this fucking game": 3, "hi guys, i'm leaving this fucking game, take my": 3, - "you can choose any skin for yourself": 3, - "ironmoon": 1 + "you can choose any skin for yourself": 3 } diff --git a/src/listeners/message/automodCreate.ts b/src/listeners/message/automodCreate.ts index 990632b..c2db29a 100644 --- a/src/listeners/message/automodCreate.ts +++ b/src/listeners/message/automodCreate.ts @@ -41,15 +41,13 @@ export default class AutomodMessageCreateListener extends BushListener { const highestOffence = Object.values(offences).sort((a, b) => b - a)[0]; - client.console.debug(message.deletable); - switch (highestOffence) { case 0: { - if (message.deletable) void message.delete(); + void message.delete().catch(() => {}); break; } case 1: { - if (message.deletable) void message.delete(); + void message.delete().catch(() => {}); void message.member.warn({ moderator: message.guild.me, reason: 'Saying a blacklisted word.' @@ -57,7 +55,7 @@ export default class AutomodMessageCreateListener extends BushListener { break; } case 2: { - if (message.deletable) void message.delete(); + void message.delete().catch(() => {}); void message.member.mute({ moderator: message.guild.me, reason: 'Saying a blacklisted word.', @@ -66,7 +64,7 @@ export default class AutomodMessageCreateListener extends BushListener { break; } case 3: { - if (message.deletable) void message.delete(); + void message.delete().catch(() => {}); void message.member.mute({ moderator: message.guild.me, reason: 'Saying a blacklisted word.', -- cgit