Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!200

src/commands/guild/top.ts

@@ -2,8 +2,7 @@ import { getUUID, getPlayer, getGuild, getIGN } from "utils/Hypixel"
 import { color, devMessage } from "config/options.json"
 import { ChannelType, ChatInputCommandInteraction } from "discord.js"
 import { GuildData } from "interfaces"
-import Illegitimate from "utils/Illegitimate"
-const redis = Illegitimate.redis
+import { redis } from "utils/Illegitimate"
 
 export default async function guildTop(interaction: ChatInputCommandInteraction): Promise<void> {
     await interaction.deferReply()

src/events/cron/weeklyGexp.ts

@@ -2,9 +2,8 @@ import { hypixelGuildID, guildLogChannel, color, devMessage } from "config/optio
 import colorLog from "utils/functions/colors"
 import { getGuild, getIGN } from "utils/Hypixel"
 import { Cron, GuildData } from "interfaces"
-import Illegitimate from "utils/Illegitimate"
+import { client } from "utils/Illegitimate"
 import { TextChannel } from "discord.js"
-const client = Illegitimate.client
 
 async function guildWeekly() {
     const channel = client.channels.cache.get(guildLogChannel) as TextChannel

src/index.ts

@@ -1,4 +1,3 @@
-import Illegitimate from "utils/Illegitimate"
-const illegitimate = new Illegitimate.Bot()
+import { Bot as Illegitimate } from "utils/Illegitimate"
 
-illegitimate.start()
+new Illegitimate().start()

src/utils/Illegitimate.ts

@@ -49,4 +49,4 @@ class Bot {
     }
 }
 
-export default { Bot, client, redis }
+export { Bot, client, redis }

src/utils/functions/logtochannel.ts

@@ -8,7 +8,7 @@ import {
     devLogChannel
 } from "config/options.json"
 import { Guild, MessageCreateOptions, TextChannel } from "discord.js"
-import Illegitimate from "utils/Illegitimate"
+import { client } from "utils/Illegitimate"
 
 const channels = {
     online: onlineLogChannel,
@@ -22,7 +22,7 @@ const channels = {
 type Channel = keyof typeof channels
 
 export default async function logToChannel(channel: Channel, message: MessageCreateOptions): Promise<void | null> {
-    const guild = Illegitimate.client.guilds.cache.get(guildid) as Guild
+    const guild = client.guilds.cache.get(guildid) as Guild
     let logChannel: TextChannel
 
     if (process.env.NODE_ENV === "dev") {