From ef9d53e6b1a9009eab5ce9ff9f8b5542d1d7cf7f Mon Sep 17 00:00:00 2001 From: jacoobes Date: Mon, 21 Feb 2022 01:58:25 -0600 Subject: [PATCH] feat(sern.ts): beginning to add new basic logger system --- src/handler/logger.ts | 7 ++++--- src/handler/sern.ts | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/handler/logger.ts b/src/handler/logger.ts index cf4328d..36a1f60 100644 --- a/src/handler/logger.ts +++ b/src/handler/logger.ts @@ -2,9 +2,10 @@ import dayJS from 'dayjs'; import Timezone from 'dayjs/plugin/timezone'; import UTC from 'dayjs/plugin/timezone'; -enum sEvent { +export enum sEvent { GLOBAL_SLASH, LOCAL_SLASH, + MISUSE_CMD, DM, CRASH, TEXT_CMD, @@ -15,13 +16,13 @@ export default class Logger { console.clear(); } - public log(e: T, message: string) { + public log(e: T, guildId: string, message: string) { dayJS.extend(UTC); dayJS.extend(Timezone); dayJS.tz.guess(); // add colored logging? const tz = dayJS().format(); - console.log(`[${tz}][${sEvent[e]}] :: ${message}`); + console.log(`[${tz}][${sEvent[e]}] @ ${guildId} :: ${message}`); } /** diff --git a/src/handler/sern.ts b/src/handler/sern.ts index 77ee6b8..6dd905f 100644 --- a/src/handler/sern.ts +++ b/src/handler/sern.ts @@ -17,7 +17,7 @@ import type { } from 'discord.js'; import { Ok, None, Some } from 'ts-results'; import { isNotFromBot, hasPrefix, fmt } from './utilities/messageHelpers'; -import Logger from './logger'; +import Logger, { sEvent } from './logger'; import { AllTrue } from './utilities/higherOrders'; /** @@ -26,7 +26,7 @@ import { AllTrue } from './utilities/higherOrders'; export class Handler { private wrapper: Wrapper; - + private defaultLogger : Logger = new Logger(); /** * * @constructor @@ -46,7 +46,7 @@ export class Handler { Files.buildData(this) .then(data => this.registerModules(data)); wrapper.init?.(this); - new Logger().tableRam(); + this.defaultLogger.tableRam(); }) .on('messageCreate', async (message: Message) => { @@ -117,11 +117,14 @@ export class Handler { if (module.mod.visibility === 'private') { const checkIsTestServer = this.privateServers.find(({ id }) => id === message.guildId!)?.test; if (checkIsTestServer === undefined) - return 'This command has the private modifier but is not registered under Handler#privateServers'; + this.defaultLogger.log( + sEvent.MISUSE_CMD, + message.guildId!, + `${module} has private modifier but is not registered in private server config` + ) + if (checkIsTestServer !== module.mod.test) { - const msg = `This command is only available on test servers.`; // TODO: Customizable private message - - return msg; + return `This command is only available on test servers.`; // TODO: Customizable private message } } const context = {