Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!324

src/commands/counting/ban.ts

@@ -1,8 +1,9 @@
-import { ChatInputCommandInteraction, GuildMember, userMention } from "discord.js"
+import { GuildMember, userMention } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { countingBanned } from "~/config/roles.js"
+import { SubCommand } from "~/typings"
 
-export default async function ban(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     const member = interaction.options.getMember("user")! as GuildMember
 
     if (member.roles.cache.has(countingBanned)) {
@@ -31,3 +32,5 @@ export default async function ban(interaction: ChatInputCommandInteraction): Pro
         })
     }
 }
+
+export default cmd

src/commands/counting/unban.ts

@@ -1,8 +1,9 @@
-import { ChatInputCommandInteraction, GuildMember, userMention } from "discord.js"
+import { GuildMember, userMention } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { countingBanned } from "~/config/roles.js"
+import { SubCommand } from "~/typings"
 
-export default async function ban(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     const member = interaction.options.getMember("user")! as GuildMember
 
     if (!member.roles.cache.has(countingBanned)) {
@@ -31,3 +32,5 @@ export default async function ban(interaction: ChatInputCommandInteraction): Pro
         })
     }
 }
+
+export default cmd

src/commands/guild/info.ts

@@ -1,10 +1,9 @@
-import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
-import { IGuildData } from "~/typings"
+import { IGuildData, SubCommand } from "~/typings"
 import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters.js"
 import { getGuild, getIGN, getPlayer, getUUID, guildLevel } from "~/utils/Hypixel.js"
 
-export default async function guildInfo(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const query = interaction.options.getString("query")!
@@ -160,3 +159,5 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction
         }]
     })
 }
+
+export default cmd

src/commands/guild/member.ts

@@ -1,9 +1,9 @@
-import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 import { dateTimeFormatter, numberFormatter } from "~/utils/Functions/intlFormaters.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js"
 
-export default async function guildMember(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const ign = interaction.options.getString("ign")!
@@ -145,3 +145,5 @@ export default async function guildMember(interaction: ChatInputCommandInteracti
         }]
     })
 }
+
+export default cmd

src/commands/guild/top.ts

@@ -1,11 +1,10 @@
-import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
-import { IGuildData } from "~/typings"
+import { IGuildData, SubCommand } from "~/typings"
 import { numberFormatter } from "~/utils/Functions/intlFormaters.js"
 import { getGuild, getIGN, getPlayer, getUUID } from "~/utils/Hypixel.js"
 import { redis } from "~/utils/Illegitimate.js"
 
-export default async function guildTop(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const query = interaction.options.getString("query")!
@@ -215,3 +214,5 @@ export default async function guildTop(interaction: ChatInputCommandInteraction)
         }]
     })
 }
+
+export default cmd

src/commands/music/leave.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function leave(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     const player = useMainPlayer()
     const queue = player.queues.get(interaction.guildId!)
     if (!queue) {
@@ -23,3 +23,5 @@ export default async function leave(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/music/nowplaying.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function nowplaying(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const player = useMainPlayer()
@@ -56,3 +56,5 @@ export default async function nowplaying(interaction: ChatInputCommandInteractio
         }]
     })
 }
+
+export default cmd

src/commands/music/pause.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function pause(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const player = useMainPlayer()
@@ -36,3 +36,5 @@ export default async function pause(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/music/play.ts

@@ -1,8 +1,9 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction, GuildMember } from "discord.js"
+import { GuildMember } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function play(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
     const query = interaction.options.getString("query")!
     const channel = (interaction.member as GuildMember).voice.channel
@@ -41,3 +42,5 @@ export default async function play(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/music/queue.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function queue(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
     const player = useMainPlayer()
     const queue = player.queues.get(interaction.guildId!)
@@ -37,3 +37,5 @@ export default async function queue(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/music/skip.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function skip(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const amount = interaction.options.getNumber("amount") ?? 1
@@ -42,3 +42,5 @@ export default async function skip(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/music/unpause.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function pause(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const player = useMainPlayer()
@@ -36,3 +36,5 @@ export default async function pause(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/music/volume.ts

@@ -1,8 +1,8 @@
 import { useMainPlayer } from "discord-player"
-import { ChatInputCommandInteraction } from "discord.js"
 import { embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 
-export default async function volume(interaction: ChatInputCommandInteraction) {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const volume = interaction.options.getNumber("volume")!
@@ -27,3 +27,5 @@ export default async function volume(interaction: ChatInputCommandInteraction) {
         }]
     })
 }
+
+export default cmd

src/commands/staff/beast.ts

@@ -1,9 +1,9 @@
-import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { beastbwfkdr, beastbwstars, beastduelswins, beastswkdr, beastswstars, bwwins, duelswlr } from "~/config/reqs.js"
+import { SubCommand } from "~/typings"
 import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js"
 
-export default async function beast(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const ign = interaction.options.getString("ign")!
@@ -206,3 +206,5 @@ export default async function beast(interaction: ChatInputCommandInteraction): P
         }]
     })
 }
+
+export default cmd

src/commands/staff/help.ts

@@ -1,8 +1,8 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction, ComponentType } from "discord.js"
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
-import { ExtendedClient as Client } from "~/utils/Client.js"
+import { SubCommmndClient } from "~/typings"
 
-export default async function help(interaction: ChatInputCommandInteraction, client: Client): Promise<void> {
+const cmd: SubCommmndClient = async (interaction, client) => {
     await interaction.deferReply()
 
     type CommandList = {
@@ -183,3 +183,5 @@ export default async function help(interaction: ChatInputCommandInteraction, cli
         })
     })
 }
+
+export default cmd

src/commands/staff/prune.ts

@@ -1,8 +1,9 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, ChatInputCommandInteraction, ComponentType } from "discord.js"
+import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, ComponentType } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
+import { SubCommand } from "~/typings"
 import env from "~/utils/Env.js"
 
-export default async function prune(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     if (interaction.user.id !== env.prod.dev) {
@@ -118,3 +119,5 @@ export default async function prune(interaction: ChatInputCommandInteraction): P
         })
     })
 }
+
+export default cmd

src/commands/staff/removeguildroles.ts

@@ -1,12 +1,12 @@
-import { ChatInputCommandInteraction, GuildMember } from "discord.js"
+import { GuildMember } from "discord.js"
 import { getVerifies } from "src/drizzle/functions.js"
 import { embedColor, hypixelGuildID } from "~/config/options.js"
-import { IGuildData } from "~/typings"
+import { IGuildData, SubCommand } from "~/typings"
 import env from "~/utils/Env.js"
 import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild } from "~/utils/Hypixel.js"
 
-export default async function removeGuildRoles(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const discordMember = interaction.member as GuildMember
@@ -52,3 +52,5 @@ export default async function removeGuildRoles(interaction: ChatInputCommandInte
         }
     }
 }
+
+export default cmd

src/commands/staff/updateall.ts

@@ -1,14 +1,14 @@
-import { ChannelType, ChatInputCommandInteraction, GuildMember } from "discord.js"
+import { ChannelType, GuildMember } from "discord.js"
 import { getVerifies } from "src/drizzle/functions.js"
 import { embedColor, hypixelGuildID } from "~/config/options.js"
-import { IGuildData } from "~/typings"
+import { IGuildData, SubCommand } from "~/typings"
 import env from "~/utils/Env.js"
 import getGuildRank from "~/utils/Functions/guildrank.js"
 import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getIGN } from "~/utils/Hypixel.js"
 import { log } from "~/utils/Logger.js"
 
-export default async function updateAll(interaction: ChatInputCommandInteraction): Promise<void> {
+const cmd: SubCommand = async (interaction) => {
     await interaction.deferReply()
 
     const discordMember = interaction.member as GuildMember
@@ -116,3 +116,5 @@ export default async function updateAll(interaction: ChatInputCommandInteraction
         }]
     })
 }
+
+export default cmd

src/typings/SubCommand.ts

@@ -1,4 +1,5 @@
 import { ChatInputCommandInteraction } from "discord.js"
+import { ExtendedClient } from "~/utils/Client"
 
 export type SubCommand = (interaction: ChatInputCommandInteraction) => Promise<void>
-
+export type SubCommmndClient = (interaction: ChatInputCommandInteraction, client: ExtendedClient) => Promise<void>

src/utils/Logger.ts

@@ -11,10 +11,11 @@ const colors = {
 type Colors = keyof typeof colors
 
 const AllLogs = {
-    info: { m: "INFO", c: null },
+    info: { m: "INFO", c: "#a6e3a1" },
-    error: { m: "ERROR", c: "#ff6666" },
+    warn: { m: "WARN", c: "#fab387" },
-    warn: { m: "WARN", c: "#ffcc99" },
+    error: { m: "ERROR", c: "#f38ba8" },
-    debug: { m: "DEBUG", c: "#66ff66" }
+    critical: { m: "CRITICAL", c: "#ff3d3d" },
+    debug: { m: "DEBUG", c: "#f9e2af" }
 } as const
 
 type LogType = keyof typeof AllLogs
@@ -35,11 +36,7 @@ export function log(m: string, t: LogType, c?: CustomColorProps): void {
 
     const message = `${time} - [${logType}] | ${m}`
     if (!c) {
-        if (t === "info") {
+        console.log(cc(message, logColor))
-            console.log(message)
-            return
-        }
-        console.log(cc(message, logColor!))
         return
     }