Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!268

eslint.config.mjs

@@ -16,9 +16,12 @@ const compat = new FlatCompat({
     allConfig: js.configs.all
 })
 
-export default [{
+export default [
-    ignores: ["**/node_modules", "**/dist"],
+    {
-}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
+        ignores: ["**/node_modules", "**/dist"]
+    },
+    ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
+    {
         plugins: {
             "@typescript-eslint": typescriptEslint,
         },
@@ -79,6 +82,12 @@ export default [{
             }],
             "@typescript-eslint/no-empty-object-type": "off",
             "@typescript-eslint/no-require-imports": "off",
+            "@typescript-eslint/ban-ts-comment": ["error", {
+                "ts-expect-error": "allow-with-description",
+                "ts-ignore": "allow-with-description",
+                "ts-nocheck": "allow-with-description",
+                "ts-check": "allow-with-description",
+            }],
         },
     }, {
         languageOptions: {
@@ -89,4 +98,5 @@ export default [{
             ecmaVersion: 5,
             sourceType: "commonjs",
         },
-}]
+    }
+]

nodemon-js.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json.schemastore.org/nodemon.json",
     "restartable": "rs",
     "ignore": [
         ".git",

nodemon-swc.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json.schemastore.org/nodemon.json",
     "ignore": [
         ".git",
         "node_modules",

nodemon.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json.schemastore.org/nodemon.json",
     "restartable": "rs",
     "ignore": [
         ".git",

package.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json.schemastore.org/package.json",
     "name": "illegitimate-bot",
     "displayName": "Illegitimate Bot",
     "version": "1.0.0",

src/utils/Events/autocomplete.ts

@@ -15,8 +15,7 @@ export default async function loadAutocompleteEvents(client: Client, ft: FileTyp
 
     for (const file of autocompleteFiles) {
         const filePath = path.join(autocompletePath, file)
-        const { default: autocompleteImport } = await import("file://" + filePath)
+        const { default: autocomplete } = await import("file://" + filePath) as { default: IAutocomplete }
-        const autocomplete: IAutocomplete = autocompleteImport
 
         if ("name" in autocomplete && "execute" in autocomplete) {
             client.autocomplete.set(autocomplete.name, autocomplete)

src/utils/Events/button.ts

@@ -15,8 +15,7 @@ export default async function loadButtonEvents(client: Client, ft: FileType) {
 
     for (const file of btnFiles) {
         const filePath = path.join(btnPath, file)
-        const { default: btnImport } = await import("file://" + filePath)
+        const { default: btn } = await import("file://" + filePath) as { default: IButton }
-        const btn: IButton = btnImport
 
         if ("name" in btn && "execute" in btn) {
             client.buttons.set(btn.name, btn)

src/utils/Events/command.ts

@@ -15,8 +15,7 @@ export default async function loadSlashCommandsEvents(client: Client, ft: FileTy
 
     for (const file of cmdFiles) {
         const filePath = path.join(cmdPath, file)
-        const { default: cmdImport } = await import("file://" + filePath)
+        const { default: cmd } = await import("file://" + filePath) as { default: ICommand }
-        const cmd: ICommand = cmdImport
 
         if ("data" in cmd && "execute" in cmd) {
             client.commands.set(cmd.data.name, cmd)

src/utils/Events/contextmenu.ts

@@ -15,8 +15,7 @@ export default async function loadContextMenuEvents(client: Client, ft: FileType
 
     for (const file of contextMenuFiles) {
         const filePath = path.join(contextMenuPath, file)
-        const { default: cmdImport } = await import("file://" + filePath)
+        const { default: cmd } = await import("file://" + filePath) as { default: IContextMenu }
-        const cmd: IContextMenu = cmdImport
 
         if ("data" in cmd && "execute" in cmd) {
             client.contextmenus.set(cmd.data.name, cmd)

src/utils/Events/cron.ts

@@ -10,8 +10,7 @@ export default async function loadCronEvents() {
 
     for (const file of cronFiles) {
         const filePath = path.join(cronPath, file)
-        const { default: cronImport } = await import("file://" + filePath)
+        const { default: cron } = await import("file://" + filePath) as { default: ICron }
-        const cron: ICron = cronImport
 
         const time =
             cron.time.seconds + " " +

src/utils/Events/events.ts

@@ -11,8 +11,7 @@ export default async function loadEvents(client: Client) {
         const eventFiles = fs.readdirSync(path.join(serverDir, eventDir))
         for (const eventFile of eventFiles) {
             const eventPath = path.join(serverDir, eventDir, eventFile)
-            const { default: eventImport } = await import("file://" + eventPath)
+            const { default: event } = await import("file://" + eventPath) as { default: IEvent }
-            const event: IEvent = eventImport
             if (!event.disabled) {
                 client.on(event.event, event.execute)
             }

src/utils/Events/modal.ts

@@ -15,8 +15,7 @@ export default async function loadModalEvents(client: Client, ft: FileType) {
 
     for (const file of modalFiles) {
         const filePath = path.join(modalPath, file)
-        const { default: modalImport } = await import("file://" + filePath)
+        const { default: modal } = await import("file://" + filePath) as { default: IModal }
-        const modal: IModal = modalImport
 
         if ("name" in modal && "execute" in modal) {
             client.modals.set(modal.name, modal)

src/utils/Illegitimate.ts

@@ -44,11 +44,11 @@ class Illegitimate {
         redis.on("ready", () => {
             console.log(color("Connected to Redis", "green"))
         })
-        // if (process.env.NODE_ENV === "dev") {
+        if (process.env.NODE_ENV === "dev") {
-        //     sequelize.sync().then(() => {
+            sequelize.sync().then(() => {
-        //         console.log(color("Synced the db [dev]", "green"))
+                console.log(color("Synced the db [dev]", "green"))
-        //     })
+            })
-        // }
+        }
         // connect(env.prod.mongoURI!, {}).then(() => {
         //     console.log(color("Connected to MongoDB", "green"))
         // })

tsconfig.json

@@ -1,4 +1,5 @@
 {
+    "$schema": "https://json.schemastore.org/tsconfig",
     "compilerOptions": {
         "target": "ES2022",
         "module": "ES2022",