Merge branch 'dev' into 'main'

Updated interfacecs See merge request illegitimate/illegitimate-bot!181
2024-01-18 14:37:48 +00:00
parent 5f9400bd01 2180e20384
commit 862dd4b35c
72 changed files with 51 additions and 117 deletions
--- a/src/commands-contextmenu/congratsmessage.ts
+++ b/src/commands-contextmenu/congratsmessage.ts
@@ -9,7 +9,6 @@ import { ContextMenu } from "interfaces"
 export = {
    name: "congratsmessage",
    description: "Congratulate a user.",
-    type: "contextmenu",
    dev: false,

    data: new ContextMenuCommandBuilder()
--- a/src/commands-contextmenu/resetnick.ts
+++ b/src/commands-contextmenu/resetnick.ts
@@ -8,7 +8,6 @@ import { ContextMenu } from "interfaces"
 export = {
    name: "resetnick",
    description: "Reset your nickname.",
-    type: "contextmenu",
    dev: false,

    data: new ContextMenuCommandBuilder()
--- a/src/commands-contextmenu/updateuser.ts
+++ b/src/commands-contextmenu/updateuser.ts
@@ -13,7 +13,6 @@ import roleManage from "utils/functions/rolesmanage"
 export = {
    name: "Update User",
    description: "Updates a user's roles",
-    type: "contextmenu",
    dev: false,

    data: new ContextMenuCommandBuilder()
--- a/src/commands/ban.ts
+++ b/src/commands/ban.ts
@@ -12,7 +12,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "ban",
    description: "Ban a user",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/check.ts
+++ b/src/commands/check.ts
@@ -23,7 +23,6 @@ import { Command } from "interfaces"
 export = {
    name: "check",
    description: "Check a player's stats.",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/clear.ts
+++ b/src/commands/clear.ts
@@ -12,7 +12,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "clear",
    description: "Clears messages",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/config.ts
+++ b/src/commands/config.ts
@@ -7,7 +7,6 @@ import { Command } from "interfaces"
 export = {
    name: "config",
    description: "Configure the bot",
-    type: "slash",
    dev: true,
    public: false,

--- a/src/commands/counting.ts
+++ b/src/commands/counting.ts
@@ -12,7 +12,6 @@ import unban from "./counting/unban"
 export = {
    name: "counting",
    description: "counting subcommands",
-    type: "slash",
    dev: false,
    public: true,
    subcommands: true,
--- a/src/commands/dev-info.ts
+++ b/src/commands/dev-info.ts
@@ -8,7 +8,6 @@ import { Command } from "interfaces"
 export = {
    name: "dev-info",
    description: "Test command for the bot.",
-    type: "slash",
    dev: true,
    public: false,

--- a/src/commands/devel.ts
+++ b/src/commands/devel.ts
@@ -4,7 +4,6 @@ import { Command } from "interfaces"
 export = {
    name: "devel",
    description: "Admin command.",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/forceunverify.ts
+++ b/src/commands/forceunverify.ts
@@ -14,7 +14,6 @@ import { getIGN } from "utils/Hypixel"
 export = {
    name: "forceunverify",
    description: "Force unverify a user",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/forceupdate.ts
+++ b/src/commands/forceupdate.ts
@@ -13,7 +13,6 @@ import roleManage from "utils/functions/rolesmanage"
 export = {
    name: "forceupdate",
    description: "Force update the user",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/forceverify.ts
+++ b/src/commands/forceverify.ts
@@ -15,7 +15,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "forceverify",
    description: "Force verify a user.",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/guild.ts
+++ b/src/commands/guild.ts
@@ -8,7 +8,6 @@ import guildTop from "./guild/top"
 export = {
    name: "guild",
    description: "Subcommands for guilds",
-    type: "slash",
    dev: false,
    public: true,
    subcommands: true,
--- a/src/commands/help.ts
+++ b/src/commands/help.ts
@@ -5,7 +5,6 @@ import { Command } from "interfaces"
 export = {
    name: "help",
    description: "Help command",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/instructions.ts
+++ b/src/commands/instructions.ts
@@ -5,7 +5,6 @@ import { Command } from "interfaces"
 export = {
    name: "instructions",
    description: "Instructions for verification",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/kick.ts
+++ b/src/commands/kick.ts
@@ -12,7 +12,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "kick",
    description: "Kick a member from the server.",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/ping.ts
+++ b/src/commands/ping.ts
@@ -5,7 +5,6 @@ import { Command } from "interfaces"
 export = {
    name: "ping",
    description: "Get the bot's ping.",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/pp.ts
+++ b/src/commands/pp.ts
@@ -6,24 +6,23 @@ import env from "utils/Env"
 export = {
    name: "pp",
    description: "Shows pp size",
-    type: "slash",
    public: true,
    dev: true,

    data: new SlashCommandBuilder()
        .setName("pp")
        .setDescription("Shows pp size")
-        .addUserOption(
-            option =>
-                option
-                    .setName("user")
-                    .setDescription("User to show pp size")
-                    .setRequired(false)
+        .addUserOption(option =>
+            option
+                .setName("user")
+                .setDescription("User to show pp size")
+                .setRequired(false),
        )
        .setDMPermission(false),

    async execute(interaction) {
-        const user = (interaction.options.getUser("user") || interaction.user) as User
+        const user = (interaction.options.getUser("user") ||
+            interaction.user) as User
        const embedColor = Number(color.replace("#", "0x"))
        let size: number

@@ -34,11 +33,13 @@ export = {
        }

        await interaction.reply({
-            embeds: [{
-                title: `${user.username}'s pp size`,
-                description: `8${"=".repeat(size)}D`,
-                color: embedColor
-            }]
+            embeds: [
+                {
+                    title: `${user.username}'s pp size`,
+                    description: `8${"=".repeat(size)}D`,
+                    color: embedColor,
+                },
+            ],
        })
-    }
-} as Command
+    },
+} as Command
--- a/src/commands/remove.ts
+++ b/src/commands/remove.ts
@@ -11,7 +11,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "remove",
    description: "Remove a person on the waiting list.",
-    type: "slash",
    false: true,
    public: false,

--- a/src/commands/reqs.ts
+++ b/src/commands/reqs.ts
@@ -14,7 +14,6 @@ import { Command } from "interfaces"
 export = {
    name: "reqs",
    description: "Displays the requirements for the guild.",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/send.ts
+++ b/src/commands/send.ts
@@ -10,7 +10,6 @@ import { Command } from "interfaces"
 export = {
    name: "send",
    description: "Send a message to a channel.",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/setnick.ts
+++ b/src/commands/setnick.ts
@@ -11,7 +11,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "setnick",
    description: "Set your nickname",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/setup.ts
+++ b/src/commands/setup.ts
@@ -13,7 +13,6 @@ import { Command } from "interfaces"
 export = {
    name: "setup",
    description: "Used for setup of the bot.",
-    type: "slash",
    dev: true,
    public: false,
    subcommands: true,
@@ -156,10 +155,8 @@ export = {

        if (subcommand === "sendwaitinglistmessage") {
            title = "Waiting List"
-            ;(description =
-                "The people below were accepted into the guild\n" +
-                "Try to invite them in order."),
-                (customId = "waitinglistupdate")
+            description = "The people on the waiting list"
+            customId = "waitinglistupdate"
            label = "Update"
            emoji = "🔄"
        }
--- a/src/commands/slowmode.ts
+++ b/src/commands/slowmode.ts
@@ -13,7 +13,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "slowmode",
    description: "Set the slowmode of a channel.",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/snipe.ts
+++ b/src/commands/snipe.ts
@@ -7,7 +7,6 @@ import { SnipeCache } from "typings"
 export = {
    name: "snipe",
    description: "Snipes the last deleted message of a user",
-    type: "slash",
    public: true,
    dev: true,

--- a/src/commands/staff.ts
+++ b/src/commands/staff.ts
@@ -8,7 +8,6 @@ import updateDiscordRoles from "./staff/updatediscordroles"
 export = {
    name: "staff",
    description: "Subcommands for staff",
-    type: "slash",
    dev: false,
    public: false,
    subcommands: true,
--- a/src/commands/timeout.ts
+++ b/src/commands/timeout.ts
@@ -13,7 +13,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "timeout",
    description: "Times out a memeber",
-    type: "slash",
    dev: false,
    public: false,

@@ -129,7 +128,7 @@ export = {
                    userMention(target.id) +
                    " for " +
                    reason),
-                    (timeouttime = null)
+                (timeouttime = null)
            } else {
                title = "Timeout Updated"
                ;(description =
@@ -139,7 +138,7 @@ export = {
                    prettyTime +
                    " for " +
                    reason),
-                    (timeouttime = time)
+                (timeouttime = time)
            }
        } else {
            title = "Member Timed Out"
@@ -150,7 +149,7 @@ export = {
                prettyTime +
                " for " +
                reason),
-                (timeouttime = time)
+            (timeouttime = time)
        }

        await target.timeout(timeouttime, reason)
--- a/src/commands/unban.ts
+++ b/src/commands/unban.ts
@@ -11,7 +11,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "unban",
    description: "Unban a user from the server",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/commands/update.ts
+++ b/src/commands/update.ts
@@ -8,7 +8,6 @@ import { Command } from "interfaces"
 export = {
    name: "update",
    description: "Update your guild rank.",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/uuid.ts
+++ b/src/commands/uuid.ts
@@ -6,7 +6,6 @@ import { Command } from "interfaces"
 export = {
    name: "uuid",
    description: "Get a player's UUID",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/verify.ts
+++ b/src/commands/verify.ts
@@ -11,7 +11,6 @@ import { GuildData } from "interfaces"
 export = {
    name: "verify",
    description: "Verify yourself as a member of the server.",
-    type: "slash",
    dev: false,
    public: true,

--- a/src/commands/whoami.ts
+++ b/src/commands/whoami.ts
@@ -7,7 +7,6 @@ import { getIGN, getHeadURL } from "utils/Hypixel"
 export = {
    name: "whoami",
    description: "Get your user info",
-    type: "slash",
    public: true,
    dev: false,

--- a/src/commands/whois.ts
+++ b/src/commands/whois.ts
@@ -11,7 +11,6 @@ import { Command } from "interfaces"
 export = {
    name: "whois",
    description: "Get's the ign of a user.",
-    type: "slash",
    dev: false,
    public: false,

--- a/src/components/autocomplete/unban.ts
+++ b/src/components/autocomplete/unban.ts
@@ -3,13 +3,10 @@ import { Autocomplete } from "interfaces"
 export = {
    name: "unban",
    description: "Unban a user from the server",
-    type: "autocomplete",

    async execute(interaction) {
        const focusedOption = interaction.options.getFocused(true)
-        if (focusedOption.name !== "user") {
-            return
-        }
+        if (focusedOption.name !== "user") return

        if (focusedOption.value === "") {
            await interaction.respond([
--- a/src/components/buttons/checkstats.ts
+++ b/src/components/buttons/checkstats.ts
@@ -22,7 +22,6 @@ import { Button } from "interfaces"
 export = {
    name: "checkstats",
    description: "Check your stats.",
-    type: "button",

    async execute(interaction) {
        await interaction.deferReply()
--- a/src/components/buttons/guildapplicationaccept.ts
+++ b/src/components/buttons/guildapplicationaccept.ts
@@ -21,7 +21,6 @@ import { getGuild } from "utils/Hypixel"
 export = {
    name: "guildapplicationaccept",
    description: "Accept a guild application.",
-    type: "button",

    async execute(interaction) {
        await interaction.deferReply()
--- a/src/components/buttons/guildapplicationdeny.ts
+++ b/src/components/buttons/guildapplicationdeny.ts
@@ -9,7 +9,6 @@ import { Button } from "interfaces"
 export = {
    name: "guildapplicationdeny",
    description: "Deny a guild application.",
-    type: "button",

    async execute(interaction) {
        const modal = new ModalBuilder()
--- a/src/components/buttons/guildapply.ts
+++ b/src/components/buttons/guildapply.ts
@@ -19,7 +19,6 @@ import { Button } from "interfaces"
 export = {
    name: "guildapply",
    description: "Guild application button.",
-    type: "button",

    async execute(interaction) {
        const user = interaction.member as GuildMember
--- a/src/components/buttons/guildinactivitylog.ts
+++ b/src/components/buttons/guildinactivitylog.ts
@@ -32,7 +32,6 @@ const guildRoles = [
 module.exports = {
    name: "guildinactivitylog",
    description: "Configure the bot.",
-    type: "button",

    async execute(interaction) {
        const guild = interaction.guild!
--- a/src/components/buttons/inactiveapplicationaccept.ts
+++ b/src/components/buttons/inactiveapplicationaccept.ts
@@ -3,7 +3,6 @@ import { Button } from "interfaces"
 export = {
    name: "inactiveapplicationaccept",
    description: "Accept an inactivity application.",
-    type: "button",

    async execute(interaction) {
        await interaction.reply({
--- a/src/components/buttons/inactiveapplicationdeny.ts
+++ b/src/components/buttons/inactiveapplicationdeny.ts
@@ -3,7 +3,6 @@ import { Button } from "interfaces"
 export = {
    name: "inactiveapplicationdeny",
    description: "Denies an inactivity application.",
-    type: "button",

    async execute(interaction) {
        await interaction.reply({
--- a/src/components/buttons/staffapplicationaccept.ts
+++ b/src/components/buttons/staffapplicationaccept.ts
@@ -6,7 +6,6 @@ import { Button } from "interfaces"
 export = {
    name: "staffapplicationaccept",
    description: "Accept a staff application.",
-    type: "button",

    async execute(interaction) {
        await interaction.deferReply()
--- a/src/components/buttons/staffapplicationdeny.ts
+++ b/src/components/buttons/staffapplicationdeny.ts
@@ -9,7 +9,6 @@ import { Button } from "interfaces"
 export = {
    name: "staffapplicationdeny",
    description: "Deny a guild application.",
-    type: "button",

    async execute(interaction) {
        const modal = new ModalBuilder()
--- a/src/components/buttons/staffapply.ts
+++ b/src/components/buttons/staffapply.ts
@@ -20,7 +20,6 @@ import env from "utils/Env"
 export = {
    name: "staffapply",
    description: "Apply for the staff team.",
-    type: "button",

    async execute(interaction) {
        const user = interaction.member as GuildMember
--- a/src/components/buttons/verify.ts
+++ b/src/components/buttons/verify.ts
@@ -9,7 +9,6 @@ import { Button } from "interfaces"
 export = {
    name: "verify",
    description: "Configure the bot.",
-    type: "button",

    async execute(interaction) {
        const modal = new ModalBuilder()
--- a/src/components/buttons/waitingListUpdate.ts
+++ b/src/components/buttons/waitingListUpdate.ts
@@ -6,7 +6,6 @@ import { Button } from "interfaces"
 export = {
    name: "waitinglistupdate",
    description: "Update the waiting list.",
-    type: "button",

    async execute(interaction) {
        await interaction.deferReply({ ephemeral: true })
--- a/src/components/modals/denyreasonbox.ts
+++ b/src/components/modals/denyreasonbox.ts
@@ -13,7 +13,6 @@ import { Modal } from "interfaces"
 export = {
    name: "denyreasonbox",
    description: "Deny reason box.",
-    type: "modal",

    async execute(interaction) {
        await interaction.deferReply()
--- a/src/components/modals/staffdenyreasonbox.ts
+++ b/src/components/modals/staffdenyreasonbox.ts
@@ -11,7 +11,6 @@ import { Modal } from "interfaces"
 export = {
    name: "staffdenyreasonbox",
    description: "Deny reason box.",
-    type: "modal",

    async execute(interaction) {
        await interaction.deferReply()
--- a/src/components/modals/verifyModal.ts
+++ b/src/components/modals/verifyModal.ts
@@ -19,7 +19,6 @@ import { GuildMember } from "discord.js"
 export = {
    name: "verifybox",
    description: "Verify box.",
-    type: "modal",

    async execute(interaction) {
        await interaction.deferReply({ ephemeral: true })
--- a/src/events/server/guildMemberAdd/logNewJoins.ts
+++ b/src/events/server/guildMemberAdd/logNewJoins.ts
@@ -6,7 +6,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "logNewJoins",
    description: "Logs new joins",
-    type: "event",
    event: "guildMemberAdd",

    execute(member: GuildMember) {
--- a/src/events/server/interactions/logBtnsCmds.ts
+++ b/src/events/server/interactions/logBtnsCmds.ts
@@ -5,7 +5,6 @@ import { Event } from "interfaces"
 export = {
    name: "logBtnsCmds",
    description: "Logs all button and command interactions",
-    type: "event",
    event: "interactionCreate",

    execute(interaction: ChatInputCommandInteraction | ButtonInteraction) {
--- a/src/events/server/messages/eval.ts
+++ b/src/events/server/messages/eval.ts
@@ -5,7 +5,6 @@ import env from "utils/Env"
 export = {
    name: "eval",
    description: "Evaluate a JavaScript expression",
-    type: "event",
    event: "messageCreate",
    disabled: true,

@@ -20,16 +19,20 @@ export = {
            const output = eval(code)
            const outputString = String(output)
            await message.channel.send({
-                embeds: [{
-                    description: `\`\`\`js\n${outputString}\`\`\``
-                }]
+                embeds: [
+                    {
+                        description: `\`\`\`js\n${outputString}\`\`\``,
+                    },
+                ],
            })
        } catch (error) {
            await message.channel.send({
-                embeds: [{
-                    description: `\`\`\`js\n${error}\`\`\``
-                }]
+                embeds: [
+                    {
+                        description: `\`\`\`js\n${error}\`\`\``,
+                    },
+                ],
            })
        }
-    }
-} as Event
+    },
+} as Event
--- a/src/events/server/messages/react.ts
+++ b/src/events/server/messages/react.ts
@@ -4,7 +4,6 @@ import { Message } from "discord.js"
 export = {
    name: "ur mom",
    description: "ur moms someone",
-    type: "event",
    event: "messageCreate",

    async execute(message: Message) {
--- a/src/events/server/messages/snipecache.ts
+++ b/src/events/server/messages/snipecache.ts
@@ -7,7 +7,6 @@ import { SnipeCache } from "typings"
 export = {
    name: "snipecache",
    description: "Logs messages for the snipe command",
-    type: "event",
    event: "messageDelete",
    disabled: true,

--- a/src/events/server/ready/consolelog.ts
+++ b/src/events/server/ready/consolelog.ts
@@ -5,7 +5,6 @@ import color from "utils/functions/colors"
 export = {
    name: "conolelog",
    description: "console log",
-    type: "event",
    event: "ready",

    execute(client: Client) {
--- a/src/events/server/ready/sendOnlineMessage.ts
+++ b/src/events/server/ready/sendOnlineMessage.ts
@@ -5,7 +5,6 @@ import { color } from "config/options.json"
 export = {
    name: "sendonlinemessage",
    description: "send an online message",
-    type: "event",
    event: "ready",

    execute() {
--- a/src/events/server/ready/status.ts
+++ b/src/events/server/ready/status.ts
@@ -5,7 +5,6 @@ import { ExtendedClient as Client } from "utils/Client"
 export = {
    name: "status",
    description: "Sets the status of the bot",
-    type: "event",
    event: "ready",

    execute(client: Client) {
--- a/src/events/server/voiceStateUpdate/vcJoinLeave.ts
+++ b/src/events/server/voiceStateUpdate/vcJoinLeave.ts
@@ -6,7 +6,6 @@ import logToChannel from "utils/functions/logtochannel"
 export = {
    name: "vcJoinLeave",
    description: "Logs when a user joins or leaves a voice channel.",
-    type: "event",
    event: "voiceStateUpdate",

    execute(oldState: VoiceState, newState: VoiceState) {
--- a/src/interfaces/Autocomplete.ts
+++ b/src/interfaces/Autocomplete.ts
@@ -4,6 +4,5 @@ import { AutocompleteInteraction } from "discord.js"
 export default interface Autocomplete {
    name: string
    description: string
-    type: "autocomplete"
    execute: (interacion: AutocompleteInteraction) => Promise<void>
 }
--- a/src/interfaces/Button.ts
+++ b/src/interfaces/Button.ts
@@ -4,6 +4,5 @@ import { ButtonInteraction } from "discord.js"
 export default interface Button {
    name: string
    description: string
-    type: "button"
    execute: (interaction: ButtonInteraction) => Promise<void>
 }
--- a/src/interfaces/Command.ts
+++ b/src/interfaces/Command.ts
@@ -5,11 +5,11 @@ import { ExtendedClient as Client } from "utils/Client"
 export default interface Command {
    name: string
    description: string
-    type: "slash"
    dev?: boolean
    public: boolean
-    data: SlashCommandBuilder
+    disabled?: boolean
    subcommands?: boolean
+    data: SlashCommandBuilder
    execute: (
        interaction: ChatInputCommandInteraction,
        client: Client,
--- a/src/interfaces/ContextMenu.ts
+++ b/src/interfaces/ContextMenu.ts
@@ -7,7 +7,6 @@ import {
 export default interface ContextMenu {
    name: string
    description: string
-    type: "contextmenu"
    dev?: boolean
    data: ContextMenuCommandBuilder
    execute: (interaction: ContextMenuCommandInteraction) => Promise<void>
--- a/src/interfaces/Event.ts
+++ b/src/interfaces/Event.ts
@@ -4,7 +4,6 @@ import { ClientEvents } from "discord.js"
 export default interface Event {
    name: string
    description: string
-    type: "event"
    event: keyof ClientEvents
    disabled?: boolean
    execute(...args: any[]): void
--- a/src/interfaces/Modal.ts
+++ b/src/interfaces/Modal.ts
@@ -4,6 +4,5 @@ import { ModalSubmitInteraction } from "discord.js"
 export default interface Modal {
    name: string
    description: string
-    type: "modal"
    execute: (interaction: ModalSubmitInteraction) => Promise<void>
 }
--- a/src/utils/Events/autocomplete.ts
+++ b/src/utils/Events/autocomplete.ts
@@ -25,11 +25,7 @@ export default function loadAutocompleteEvents(client: Client, ft: FileType) {
        const filePath = path.join(autocompletePath, file)
        const autocomplete: Autocomplete = require(filePath)

-        if (
-            "name" in autocomplete &&
-            "execute" in autocomplete &&
-            autocomplete.type === "autocomplete"
-        ) {
+        if ("name" in autocomplete && "execute" in autocomplete) {
            client.autocomplete.set(autocomplete.name, autocomplete)
        } else {
            console.log(
--- a/src/utils/Events/button.ts
+++ b/src/utils/Events/button.ts
@@ -17,7 +17,7 @@ export default function loadButtonEvents(client: Client, ft: FileType) {
        const filePath = path.join(btnPath, file)
        const btn: Button = require(filePath)

-        if ("name" in btn && "execute" in btn && btn.type === "button") {
+        if ("name" in btn && "execute" in btn) {
            client.buttons.set(btn.name, btn)
        } else {
            console.log(
--- a/src/utils/Events/command.ts
+++ b/src/utils/Events/command.ts
@@ -17,7 +17,7 @@ export default function loadSlashCommandsEvents(client: Client, ft: FileType) {
        const filePath = path.join(cmdPath, file)
        const cmd: Command = require(filePath)

-        if ("data" in cmd && "execute" in cmd && cmd.type === "slash") {
+        if ("data" in cmd && "execute" in cmd) {
            client.commands.set(cmd.data.name, cmd)
        } else {
            console.log(
--- a/src/utils/Events/contextmenu.ts
+++ b/src/utils/Events/contextmenu.ts
@@ -24,7 +24,7 @@ export default function loadContextMenuEvents(client: Client, ft: FileType) {
        const filePath = path.join(contextMenuPath, file)
        const cmd: ContextMenu = require(filePath)

-        if ("data" in cmd && "execute" in cmd && cmd.type === "contextmenu") {
+        if ("data" in cmd && "execute" in cmd) {
            client.contextmenus.set(cmd.data.name, cmd)
        } else {
            console.log(
--- a/src/utils/Events/modal.ts
+++ b/src/utils/Events/modal.ts
@@ -19,7 +19,7 @@ export default function loadModalEvents(client: Client, ft: FileType) {
        const filePath = path.join(modalPath, file)
        const modal: Modal = require(filePath)

-        if ("name" in modal && "execute" in modal && modal.type === "modal") {
+        if ("name" in modal && "execute" in modal) {
            client.modals.set(modal.name, modal)
        } else {
            console.log(
--- a/src/utils/Hypixel/bedwars.ts
+++ b/src/utils/Hypixel/bedwars.ts
@@ -10,14 +10,14 @@ function getExpForLevel(level: number): number {
    }

    switch (respectedLevel) {
-        case 1:
-            return 500
-        case 2:
-            return 1000
-        case 3:
-            return 2000
-        case 4:
-            return 3500
+    case 1:
+        return 500
+    case 2:
+        return 1000
+    case 3:
+        return 2000
+    case 4:
+        return 3500
    }
    return 5000
 }
--- a/src/utils/Hypixel/hypixel.ts
+++ b/src/utils/Hypixel/hypixel.ts
@@ -12,10 +12,10 @@ function getLevel(exp: number): number {
    return exp <= 1
        ? 1
        : Math.floor(
-              1 +
+            1 +
                  REVERSE_PQ_PREFIX +
                  Math.sqrt(REVERSE_CONST + GROWTH_DIVIDES_2 * exp),
-          )
+        )
 }

 function hypixelLevel(exp: number): number {