Merge branch 'dev' into 'main'

Updated dir structure

See merge request illegitimate/illegitimate-bot!177

src/commands/snipe.ts

@@ -2,7 +2,7 @@ import { GuildMember, SlashCommandBuilder } from "discord.js"
 import snipeCacheSchema from "schemas/snipeCacheSchema"
 import { Command } from "interfaces"
 import { color } from "config/options.json"
-import { SnipeCache } from "utils/Types"
+import { SnipeCache } from "typings"
 
 export = {
     name: "snipe",

src/events/server/messages/snipecache.ts

@@ -2,7 +2,7 @@ import { ChannelType, Message } from "discord.js"
 import { Event } from "interfaces"
 import snipeCacheSchema from "schemas/snipeCacheSchema"
 import mongoose from "mongoose"
-import { SnipeCache } from "utils/Types"
+import { SnipeCache } from "typings"
 
 export = {
     name: "snipecache",

src/typings/Types.ts

@@ -1,4 +1,4 @@
-export type SnipeCache = {
+type SnipeCache = {
     author: string
     content: string
     channel: string
@@ -6,3 +6,5 @@ export type SnipeCache = {
     deletedAt: number
     attachments: string[]
 }
+
+export default SnipeCache

src/typings/index.ts

@@ -0,0 +1,3 @@
+import SnipeCache from "./Types"
+
+export { SnipeCache }

src/utils/Client.ts

@@ -1,10 +1,6 @@
 import { Client, Collection, GatewayIntentBits, Partials } from "discord.js"
 import color from "./functions/colors"
-import { Command } from "interfaces"
-import { ContextMenu } from "interfaces"
-import { Button } from "interfaces"
-import { Modal } from "interfaces"
-import { Autocomplete } from "interfaces"
+import { Command, ContextMenu, Button, Modal, Autocomplete } from "interfaces"
 import env from "./Env"
 import autoDeployCommands from "./Autodeploy"
 import { loadAllEvents } from "./Events"

src/utils/Events.ts

@@ -1,17 +0,0 @@
-import { ExtendedClient as Client } from "./Client"
-import { loadButtonEvents } from "./eventHandlers"
-import { loadSlashCommandsEvents } from "./eventHandlers"
-import { loadContextMenuEvents } from "./eventHandlers"
-import { loadModalEvents } from "./eventHandlers"
-import { loadEvents } from "./eventHandlers"
-import { loadAutocompleteEvents } from "./eventHandlers"
-type FileType = "js" | "ts"
-
-export function loadAllEvents(client: Client, ft: FileType) {
-    loadEvents(client)
-    loadButtonEvents(client, ft)
-    loadSlashCommandsEvents(client, ft)
-    loadContextMenuEvents(client, ft)
-    loadModalEvents(client, ft)
-    loadAutocompleteEvents(client, ft)
-}

src/utils/Events/index.ts

@@ -0,0 +1,19 @@
+import { ExtendedClient as Client } from "../Client"
+import loadAutocompleteEvents from "./autocomplete"
+import loadButtonEvents from "./button"
+import loadSlashCommandsEvents from "./command"
+import loadContextMenuEvents from "./contextmenu"
+import loadCronEvents from "./cron"
+import loadEvents from "./events"
+import loadModalEvents from "./modal"
+type FileType = "js" | "ts"
+
+export function loadAllEvents(client: Client, ft: FileType) {
+    loadEvents(client)
+    loadButtonEvents(client, ft)
+    loadSlashCommandsEvents(client, ft)
+    loadContextMenuEvents(client, ft)
+    loadModalEvents(client, ft)
+    loadAutocompleteEvents(client, ft)
+    loadCronEvents()
+}

src/utils/Hypixel.ts

@@ -1,12 +0,0 @@
-export { skywarsLevel } from "./functions/skywars"
-export { bedwarsLevel } from "./functions/bedwars"
-export { hypixelLevel } from "./functions/hypixel"
-export { formatUuid } from "./functions/uuid"
-export { guildLevel, scaledGEXP } from "./functions/guild"
-export {
-    getUUID,
-    getIGN,
-    getPlayer,
-    getGuild,
-    getHeadURL,
-} from "./functions/account"

src/utils/Hypixel/index.ts

@@ -0,0 +1,12 @@
+export { skywarsLevel } from "./skywars"
+export { bedwarsLevel } from "./bedwars"
+export { hypixelLevel } from "./hypixel"
+export { formatUuid } from "./uuid"
+export { guildLevel, scaledGEXP } from "./guild"
+export {
+    getUUID,
+    getIGN,
+    getPlayer,
+    getGuild,
+    getHeadURL,
+} from "./account"

src/utils/Illegitimate.ts

@@ -3,16 +3,13 @@ import color from "utils/functions/colors"
 import { Redis } from "ioredis"
 import env from "utils/Env"
 import { connect } from "mongoose"
-import init from "utils/Init"
-import { loadCronEvents } from "utils/eventHandlers"
 const client = new Client()
 const redis = new Redis(env.prod.redisURI!)
 
 class Bot {
     async start() {
-        init()
+        this.init()
         client.start()
-        loadCronEvents()
         redis.on("ready", () => {
             console.log(color("Connected to Redis", "green"))
         })
@@ -20,6 +17,24 @@ class Bot {
             console.log(color("Connected to MongoDB", "green"))
         })
     }
+
+    private async init() {
+        const prodValues = env.prod
+        const devValues = env.dev
+
+        if (process.env.NODE_ENV === "dev") {
+            for (const [key, value] of Object.entries(devValues)) {
+                if (!value) throw new Error(`No ${key} specified`)
+            }
+            for (const [key, value] of Object.entries(prodValues)) {
+                if (!value) throw new Error(`No ${key} specified`)
+            }
+        } else {
+            for (const [key, value] of Object.entries(prodValues)) {
+                if (!value) throw new Error(`No ${key} specified`)
+            }
+        }
+    }
 }
 
 export default { Bot, client, redis }

src/utils/Init.ts

@@ -1,20 +0,0 @@
-import env from "utils/Env"
-
-const prodValues = env.prod
-const devValues = env.dev
-
-export default function init() {
-    if (process.env.NODE_ENV === "dev") {
-        for (const [key, value] of Object.entries(devValues)) {
-            if (!value) throw new Error(`No ${key} specified`)
-        }
-
-        for (const [key, value] of Object.entries(prodValues)) {
-            if (!value) throw new Error(`No ${key} specified`)
-        }
-    } else {
-        for (const [key, value] of Object.entries(prodValues)) {
-            if (!value) throw new Error(`No ${key} specified`)
-        }
-    }
-}

src/utils/eventHandlers/index.ts

@@ -1,17 +0,0 @@
-import loadAutocompleteEvents from "./autocomplete"
-import loadButtonEvents from "./button"
-import loadSlashCommandsEvents from "./command"
-import loadContextMenuEvents from "./contextmenu"
-import loadCronEvents from "./cron"
-import loadEvents from "./events"
-import loadModalEvents from "./modal"
-
-export {
-    loadAutocompleteEvents,
-    loadButtonEvents,
-    loadSlashCommandsEvents,
-    loadContextMenuEvents,
-    loadCronEvents,
-    loadEvents,
-    loadModalEvents,
-}

tsconfig.json

@@ -15,9 +15,10 @@
         "baseUrl": ".",
         "paths": {
             "utils/*": ["src/utils/*"],
-            "interfaces": ["src/interfaces/index"],
             "schemas/*": ["src/schemas/*"],
             "config/*": ["src/config/*"],
+            "interfaces": ["src/interfaces/index"],
+            "typings": ["src/typings/index"],
         }
     },
     "include": ["src"],