Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!146

scripts/delete-commands.ts

@@ -1,13 +1,13 @@
 import { REST, Routes } from "discord.js"
-import config from "../src/utils/Config"
+import env from "../src/utils/Env"
 
-const rest = new REST({ version: "10" }).setToken(config.dev.devtoken)
+const rest = new REST({ version: "10" }).setToken(env.dev.devtoken!)
 
 async function deleteCommands() {
     try {
         console.log("Started deleting application (/) commands.")
         await rest.put(
-            Routes.applicationGuildCommands(config.dev.devid, config.dev.guildid),
+            Routes.applicationGuildCommands(env.dev.devid!, env.dev.guildid!),
             { body: [] },
         )
         console.log("Successfully deleted application (/) commands.")

scripts/deploy-commands.ts

@@ -1,8 +1,8 @@
 import { REST, RESTGetAPIApplicationGuildCommandResult, RESTPutAPIApplicationCommandsJSONBody, Routes } from "discord.js"
 import fs from "node:fs"
 import { Command } from "../src/interfaces"
-import config from "../src/utils/Config"
+import env from "../src/utils/Env"
-const rest = new REST({ version: "10" }).setToken(config.prod.token)
+const rest = new REST({ version: "10" }).setToken(env.prod.token!)
 
 const commands: RESTPutAPIApplicationCommandsJSONBody = []
 const commandFiles = fs.readdirSync("./dist/src/commands").filter(file => file.endsWith(".js"))
@@ -22,7 +22,7 @@ for (const file of contentMenuCommands) {
         console.log(`Started refreshing ${commands.length} application (/) commands.`)
 
         const data = await rest.put(
-            Routes.applicationCommands(config.dev.clientid),
+            Routes.applicationCommands(env.dev.clientid!),
             { body: commands },
         ) as RESTGetAPIApplicationGuildCommandResult[]
 

scripts/dev-deploy.ts

@@ -1,8 +1,8 @@
 import { REST, RESTGetAPIApplicationGuildCommandResult, RESTPutAPIApplicationCommandsJSONBody, Routes } from "discord.js"
 import fs from "fs"
-import config from "../src/utils/Config"
+import env from "../src/utils/Env"
 import { Command } from "../src/interfaces"
-const rest = new REST({ version: "10" }).setToken(config.dev.devtoken)
+const rest = new REST({ version: "10" }).setToken(env.dev.devtoken!)
 
 const commands: RESTPutAPIApplicationCommandsJSONBody = []
 const commandFiles = fs.readdirSync("./dist/src/commands/").filter(file => file.endsWith(".js"))
@@ -26,7 +26,7 @@ for (const file of contentMenuCommands) {
         console.log(`Started refreshing ${commands.length} application (/) commands.`)
 
         const data = await rest.put(
-            Routes.applicationGuildCommands(config.dev.devid, config.dev.guildid),
+            Routes.applicationGuildCommands(env.dev.devid!, env.dev.guildid!),
             { body: commands },
         ) as RESTGetAPIApplicationGuildCommandResult[]
 

src/events/buttons/staffapply.ts

@@ -52,7 +52,9 @@ export = {
             }
 
             if (!userRoles.has(guildRole)) {
-                await interaction.editReply("You must be a member of the guild to apply for staff.")
+                await interaction.editReply(
+                    "You must be a member of the guild to apply for staff.",
+                )
                 return
             }
 

src/events/cron/weeklyGexp.ts

@@ -2,7 +2,7 @@ import {
     hypixelGuildID,
     guildLogChannel,
     color,
-    devMessage
+    devMessage,
 } from "../../../config/options.json"
 import { getGuild, getIGN } from "../../utils/Hypixel"
 import { Cron, GuildData } from "../../interfaces"
@@ -23,10 +23,12 @@ async function guildWeekly() {
     const embedColor = Number(color.replace("#", "0x"))
 
     const message = await channel.send({
-        embeds: [{
+        embeds: [
+            {
                 description: "Starting to fetch guild data...",
-            color: embedColor
+                color: embedColor,
-        }]
+            },
+        ],
     })
 
     const guild = (await getGuild(hypixelGuildID, "id")) as GuildData

src/utils/Autodeploy.ts

@@ -16,11 +16,19 @@ async function autoDeployCommands(fileType: FileType) {
     let contentMenuCommands: string[] = []
 
     if (fileType === "js") {
-        commandFiles = fs.readdirSync("./dist/src/commands/").filter(file => file.endsWith(fileType))
+        commandFiles = fs
-        contentMenuCommands = fs.readdirSync("./dist/src/commands-contextmenu/").filter(file => file.endsWith(fileType))
+            .readdirSync("./dist/src/commands/")
+            .filter(file => file.endsWith(fileType))
+        contentMenuCommands = fs
+            .readdirSync("./dist/src/commands-contextmenu/")
+            .filter(file => file.endsWith(fileType))
     } else if (fileType === "ts") {
-        commandFiles = fs.readdirSync("./src/commands/").filter(file => file.endsWith(fileType))
+        commandFiles = fs
-        contentMenuCommands = fs.readdirSync("./src/commands-contextmenu/").filter(file => file.endsWith(fileType))
+            .readdirSync("./src/commands/")
+            .filter(file => file.endsWith(fileType))
+        contentMenuCommands = fs
+            .readdirSync("./src/commands-contextmenu/")
+            .filter(file => file.endsWith(fileType))
     }
 
     for (const file of commandFiles) {
@@ -86,10 +94,7 @@ async function autoDeployCommands(fileType: FileType) {
 
     try {
         console.log(
-            color.colorize(
+            color.colorize("Commands are different, starting deploy.", "red"),
-                "Commands are different, starting deploy.",
-                "red",
-            ),
         )
         console.log(color.colorize(currentCmds, "red"))
         console.log(
@@ -97,10 +102,7 @@ async function autoDeployCommands(fileType: FileType) {
         )
 
         const data = (await rest.put(
-            Routes.applicationGuildCommands(
+            Routes.applicationGuildCommands(env.dev.devid!, env.dev.guildid!),
-                env.dev.devid!,
-                env.dev.guildid!,
-            ),
             { body: commands },
         )) as RESTPutAPIApplicationGuildCommandsJSONBody[]
 

src/utils/Client.ts

@@ -35,7 +35,6 @@ export class ExtendedClient extends Client {
     }
 
     async start() {
-
         let token: string
         if (process.env.NODE_ENV === "dev" && process.env.TYPESCRIPT) {
             console.log("Running in development mode. [ts-node]")

src/utils/Init.ts

@@ -17,5 +17,4 @@ export default function init() {
             if (!value) throw new Error(`No ${key} specified`)
         }
     }
-
 }

src/utils/eventHandlers/button.ts

@@ -7,9 +7,7 @@ import { FileType } from "../../typings"
 
 export default function loadButtonEvents(client: Client, ft: FileType) {
     const btnPath = path.join(__dirname, "..", "..", "events", "buttons")
-    const btnFiles = fs
+    const btnFiles = fs.readdirSync(btnPath).filter(file => file.endsWith(ft))
-        .readdirSync(btnPath)
-        .filter(file => file.endsWith(ft))
 
     for (const file of btnFiles) {
         const filePath = path.join(btnPath, file)

src/utils/eventHandlers/cron.ts

@@ -5,14 +5,33 @@ import { Cron } from "../../interfaces"
 
 export default function loadCronEvents() {
     const cronPath = path.join(__dirname, "..", "..", "events", "cron")
-    const cronFiles = fs.readdirSync(cronPath).filter(file => file.endsWith(".js"))
+    const cronFiles = fs
+        .readdirSync(cronPath)
+        .filter(file => file.endsWith(".js"))
 
     for (const file of cronFiles) {
         const filePath = path.join(cronPath, file)
         const cron: Cron = require(filePath)
 
-        const time = cron.time.seconds + " " + cron.time.minutes + " " + cron.time.hours + " " + cron.time.dayOfMonth + " " + cron.time.month + " " + cron.time.dayOfWeek
+        const time =
+            cron.time.seconds +
+            " " +
+            cron.time.minutes +
+            " " +
+            cron.time.hours +
+            " " +
+            cron.time.dayOfMonth +
+            " " +
+            cron.time.month +
+            " " +
+            cron.time.dayOfWeek
 
-        new CronJob(time, cron.execute, cron.onComplete, cron.start, cron.timeZone).start()
+        new CronJob(
+            time,
+            cron.execute,
+            cron.onComplete,
+            cron.start,
+            cron.timeZone,
+        ).start()
     }
 }

src/utils/eventHandlers/index.ts

@@ -13,5 +13,5 @@ export {
     loadContextMenuEvents,
     loadCronEvents,
     loadEvents,
-    loadModalEvents
+    loadModalEvents,
 }