From fc5f7fdc82725a31603b4d3cc2c2f3d80b03221c Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 10 Jun 2022 19:37:45 +0800 Subject: [PATCH] move filter up --- src/index.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/index.ts b/src/index.ts index e44a984..43da4e7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,8 +11,6 @@ import { commands } from './commands'; import { filterMessage } from './filters'; import { parseLog } from './logs'; -import { green, bold, blue, underline, yellow } from 'kleur/colors'; - import { parse as discordParse, type SuccessfulParsedMessage, @@ -21,7 +19,9 @@ import { import { readFile } from 'fs/promises'; import { join } from 'path'; +import { green, bold, blue, underline, yellow } from 'kleur/colors'; import 'dotenv/config'; + export interface Command { name: string; aliases?: string[]; @@ -93,6 +93,11 @@ client.once('ready', async () => { return; } + const messageIsOK = await filterMessage(e); + if (!messageIsOK) { + return; + } + const commanded = await parseMsg(e); if (commanded) return; @@ -101,11 +106,6 @@ client.once('ready', async () => { e.reply({ embeds: [log] }); return; } - - const filtered = await filterMessage(e); - if (!filtered) { - return; - } }); }); @@ -138,6 +138,7 @@ async function parseMsg(e: Message) { } return false; } + try { await cmd.exec(e, parsed); } catch (err: unknown) {