Merge branch 'dev' into 'main'

Updated events

See merge request illegitimate/illegitimate-bot!336
This commit is contained in:
2025-03-13 23:10:55 +01:00
8 changed files with 24 additions and 19 deletions

View File

@@ -6,7 +6,6 @@ services:
restart: unless-stopped
environment:
- TOKEN=${TOKEN}
- MONGOURI=${MONGOURI}
- DEV=${DEV}
- HYPIXELAPIKEY=${HYPIXELAPIKEY}
- REDISURI=${REDISURI}

View File

@@ -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")
}
})
}

View File

@@ -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: [{

View File

@@ -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: [{

View File

@@ -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: [{

View File

@@ -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"))
}

View File

@@ -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: [{

View File

@@ -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