From e555417e13f1c39e8113331f891c9e51a20b3b5c Mon Sep 17 00:00:00 2001 From: Taken Date: Thu, 13 Mar 2025 23:08:11 +0100 Subject: [PATCH] Updated events --- docker-compose.yml | 1 - src/utils/Events/autocomplete.ts | 5 +++-- src/utils/Events/button.ts | 5 +++-- src/utils/Events/command.ts | 5 +++-- src/utils/Events/contextmenu.ts | 5 +++-- src/utils/Events/loadevents.ts | 15 ++++++++------- src/utils/Events/modal.ts | 5 +++-- src/utils/Logger.ts | 2 +- 8 files changed, 24 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6675dd4..74dfefb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,6 @@ services: restart: unless-stopped environment: - TOKEN=${TOKEN} - - MONGOURI=${MONGOURI} - DEV=${DEV} - HYPIXELAPIKEY=${HYPIXELAPIKEY} - REDISURI=${REDISURI} diff --git a/src/utils/Events/autocomplete.ts b/src/utils/Events/autocomplete.ts index 066b201..6fce3a8 100644 --- a/src/utils/Events/autocomplete.ts +++ b/src/utils/Events/autocomplete.ts @@ -5,6 +5,7 @@ import { embedColor } from "~/config/options" import { IAutocomplete } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client" import logToChannel from "~/utils/Functions/logtochannel" +import { log } from "../Logger" type FileType = "js" | "ts" export default async function loadAutocompleteEvents(client: Client, ft: FileType) { @@ -23,7 +24,7 @@ export default async function loadAutocompleteEvents(client: Client, ft: FileTyp const autocomplete = client.autocomplete.get(interaction.commandName) if (!autocomplete) { - console.error(`No autocomplete matching ${interaction.commandName} was found.`) + log(`No autocomplete matching ${interaction.commandName} was found.`, "error") return } @@ -43,7 +44,7 @@ export default async function loadAutocompleteEvents(client: Client, ft: FileTyp }] }) } - console.error(error) + log(error, "error") } }) } diff --git a/src/utils/Events/button.ts b/src/utils/Events/button.ts index dc72d28..fd0a96a 100644 --- a/src/utils/Events/button.ts +++ b/src/utils/Events/button.ts @@ -5,6 +5,7 @@ import { embedColor } from "~/config/options" import { IButton } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client" import logToChannel from "~/utils/Functions/logtochannel" +import { log } from "../Logger" type FileType = "js" | "ts" export default async function loadButtonEvents(client: Client, ft: FileType) { @@ -30,7 +31,7 @@ export default async function loadButtonEvents(client: Client, ft: FileType) { content: "Button logic not implemented. This is most likely an old button", flags: MessageFlags.Ephemeral }) - console.error(`No event matching ${interaction.customId} was found.`) + log(`No event matching ${interaction.customId} was found.`, "error") return } @@ -51,7 +52,7 @@ export default async function loadButtonEvents(client: Client, ft: FileType) { }) } - console.error(error) + log(error, "error") if (!interaction.deferred) { await interaction.reply({ embeds: [{ diff --git a/src/utils/Events/command.ts b/src/utils/Events/command.ts index 4713943..49221f0 100644 --- a/src/utils/Events/command.ts +++ b/src/utils/Events/command.ts @@ -5,6 +5,7 @@ import { embedColor } from "~/config/options" import { ICommand } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client" import logToChannel from "~/utils/Functions/logtochannel" +import { log } from "../Logger" type FileType = "js" | "ts" export default async function loadSlashCommandsEvents(client: Client, ft: FileType) { @@ -28,7 +29,7 @@ export default async function loadSlashCommandsEvents(client: Client, ft: FileTy content: "Command logic not implemented. This is most likely an old command", flags: MessageFlags.Ephemeral }) - console.error(`No command matching ${interaction.commandName} was found.`) + log(`No command matching ${interaction.commandName} was found.`, "error") return } @@ -49,7 +50,7 @@ export default async function loadSlashCommandsEvents(client: Client, ft: FileTy }) } - console.error(error) + log(error, "error") if (!interaction.deferred) { await interaction.reply({ embeds: [{ diff --git a/src/utils/Events/contextmenu.ts b/src/utils/Events/contextmenu.ts index fa050eb..848ccfb 100644 --- a/src/utils/Events/contextmenu.ts +++ b/src/utils/Events/contextmenu.ts @@ -5,6 +5,7 @@ import { embedColor } from "~/config/options" import { IContextMenu } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client" import logToChannel from "~/utils/Functions/logtochannel" +import { log } from "../Logger" type FileType = "js" | "ts" export default async function loadContextMenuEvents(client: Client, ft: FileType) { @@ -28,7 +29,7 @@ export default async function loadContextMenuEvents(client: Client, ft: FileType content: "Command logic not implemented. This is most likely an old command", flags: MessageFlags.Ephemeral }) - console.error(`No command matching ${interaction.commandName} was found.`) + log(`No command matching ${interaction.commandName} was found.`, "error") return } @@ -49,7 +50,7 @@ export default async function loadContextMenuEvents(client: Client, ft: FileType }) } - console.error(error) + log(error, "error") if (!interaction.deferred) { await interaction.reply({ embeds: [{ diff --git a/src/utils/Events/loadevents.ts b/src/utils/Events/loadevents.ts index c9ac73f..5a987af 100644 --- a/src/utils/Events/loadevents.ts +++ b/src/utils/Events/loadevents.ts @@ -1,4 +1,5 @@ import { ExtendedClient as Client } from "../Client" +import { log } from "../Logger" import loadAutocompleteEvents from "./autocomplete" import loadButtonEvents from "./button" import loadSlashCommandsEvents from "./command" @@ -8,11 +9,11 @@ import loadEvents from "./events" import loadModalEvents from "./modal" export default async function loadAllEvents(client: Client, ft: "js" | "ts") { - await loadEvents(client, ft) - await loadButtonEvents(client, ft) - await loadSlashCommandsEvents(client, ft) - await loadContextMenuEvents(client, ft) - await loadModalEvents(client, ft) - await loadAutocompleteEvents(client, ft) - await loadCronEvents(ft) + await loadEvents(client, ft).then(() => log("Events loaded", "info")) + await loadButtonEvents(client, ft).then(() => log("Button events loaded", "info")) + await loadSlashCommandsEvents(client, ft).then(() => log("Slash commands loaded", "info")) + await loadContextMenuEvents(client, ft).then(() => log("Context menu events loaded", "info")) + await loadModalEvents(client, ft).then(() => log("Modal events loaded", "info")) + await loadAutocompleteEvents(client, ft).then(() => log("Autocomplete events loaded", "info")) + await loadCronEvents(ft).then(() => log("Cron events loaded", "info")) } diff --git a/src/utils/Events/modal.ts b/src/utils/Events/modal.ts index d693709..0be5f7c 100644 --- a/src/utils/Events/modal.ts +++ b/src/utils/Events/modal.ts @@ -5,6 +5,7 @@ import { embedColor } from "~/config/options" import { IModal } from "~/typings" import { ExtendedClient as Client } from "~/utils/Client" import logToChannel from "~/utils/Functions/logtochannel" +import { log } from "../Logger" type FileType = "js" | "ts" export default async function loadModalEvents(client: Client, ft: FileType) { @@ -27,7 +28,7 @@ export default async function loadModalEvents(client: Client, ft: FileType) { content: "Modal logic not implemented. This is most likely an old modal", flags: MessageFlags.Ephemeral }) - console.error(`No modal matching ${interaction.customId} was found.`) + log(`No modal matching ${interaction.customId} was found.`, "error") return } @@ -48,7 +49,7 @@ export default async function loadModalEvents(client: Client, ft: FileType) { }) } - console.error(error) + log(error, "error") if (!interaction.deferred) { await interaction.reply({ embeds: [{ diff --git a/src/utils/Logger.ts b/src/utils/Logger.ts index a3e768a..adcf59c 100644 --- a/src/utils/Logger.ts +++ b/src/utils/Logger.ts @@ -28,7 +28,7 @@ type CustomColorProps = { color: string } -export function log(m: string, t: LogType, c?: CustomColorProps): void { +export function log(m: any, t: LogType, c?: CustomColorProps): void { const date = new Date() const time = logTimeFormatter(date) const logType = AllLogs[t].m