Converted main codebase to typescript

Signed-off-by: Taken <taken@mairimashita.org>

src/commands/staff/beast.ts

@@ -1,13 +1,12 @@
-const { bwwins, beastbwfkdr, beastbwstars, beastswkdr, beastswstars, beastduelswins, duelswlr } = require("../../../config/reqs.json")
-const { color, devMessage } = require("../../../config/options.json")
-const { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.js")
+import { bwwins, beastbwfkdr, beastbwstars, beastswkdr, beastswstars, beastduelswins, duelswlr } from "../../../config/reqs.json"
+import { color, devMessage } from "../../../config/options.json"
+import { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } from "../../utils/Hypixel"
+import { ChatInputCommandInteraction } from "discord.js"
 
-/** @param { import('discord.js').ChatInputCommandInteraction } interaction */
-
-async function beast(interaction) {
+export async function beast(interaction: ChatInputCommandInteraction): Promise<void> {
     await interaction.deferReply()
 
-    const ign = interaction.options.getString("ign")
+    const ign = interaction.options.getString("ign")!
     const embedColor = Number(color.replace("#", "0x"))
 
     if (!ign) {
@@ -212,7 +211,7 @@ async function beast(interaction) {
     const level = hypixelLevel(hypixelExp)
 
     const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
-    const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
+    const footerIcon = interaction.guild ? interaction.guild.iconURL({ forceStatic: false }) : interaction.user.avatarURL({ forceStatic: false })
 
     await interaction.editReply({
         embeds: [{
@@ -222,15 +221,13 @@ async function beast(interaction) {
                 "**Current Guild:** `" + guildName + "`",
             color: embedColor,
             thumbnail: {
-                url: head
+                url: head!
             },
             footer: {
                 text: footerText + " | " + devMessage,
-                icon_url: footerIcon
+                icon_url: footerIcon!
             },
             fields: statsFields
         }]
     })
-}
-
-module.exports = { beast }
+}

src/commands/staff/help.js

@@ -1,59 +0,0 @@
-const { color, devMessage } = require("../../../config/options.json")
-const fs = require("fs")
-const path = require("path")
-
-/** @param { import("discord.js").ChatInputCommandInteraction } interaction */
-
-async function help(interaction) {
-    const commands = []
-    const commandFiles = fs.readdirSync(path.join(__dirname, "..")).filter(file => file.endsWith(".js"))
-    for (const file of commandFiles) {
-        const command = require(`../../commands/${file}`)
-        if (!command.public && !command.subcommands) {
-            commands.push(command)
-        } else if (!command.public && command.subcommands) {
-            const commandName = command.data.name
-
-            const subcommands = command.data.options.map((subcommand) => {
-                return {
-                    name: commandName + " " + subcommand.name,
-                    description: subcommand.description
-                }
-            })
-
-            for (const subcommand of subcommands) {
-                commands.push(subcommand)
-            }
-        }
-    }
-    const commandList = commands.map((command) => {
-        return {
-            name: "**/" + command.name + "**",
-            value: "`" + command.description + "`"
-        }
-    })
-
-    const embedColor = Number(color.replace("#", "0x"))
-    const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
-    const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
-
-    await interaction.reply({
-        embeds: [{
-            title: "Commands",
-            description: "List of commands",
-            fields: commandList,
-            color: embedColor,
-            thumbnail: {
-                url: interaction?.guild?.iconURL({ dynamic: true }) || null
-            },
-            footer: {
-                icon_url: footerIcon,
-                text: footerText + " | " + devMessage
-            }
-        }],
-        ephemeral: true
-    })
-
-}
-
-module.exports = { help }

src/commands/staff/help.ts

@@ -0,0 +1,65 @@
+import { ChatInputCommandInteraction } from "discord.js"
+import { color, devMessage } from "../../../config/options.json"
+import { ExtendedClient as Client } from "../../utils/Client"
+
+export async function help(interaction: ChatInputCommandInteraction, client: Client): Promise<void> {
+    await interaction.deferReply({ ephemeral: true })
+
+    type CommandList = {
+        name: string,
+        value: string
+    }
+    const commandList: CommandList[] = []
+    const commandRawList = client.commands.map((command) => {
+        return {
+            name: command.name,
+            command: command
+        }
+    })
+
+    for (const command of commandRawList) {
+        const commandName = command.name
+
+        if (!command.command.subcommands && !command.command.public) {
+            commandList.push({
+                name: "**/" + commandName + "**",
+                value: "`" + command.command.description + "`"
+            })
+        } else if (command.command.subcommands && !command.command.public) {
+
+            const subcommands = command.command.data.options.map((subcommand) => {
+                return {
+                    name: commandName + " " + subcommand.toJSON().name,
+                    description: subcommand.toJSON().description
+                }
+            })
+
+            for (const subcommand of subcommands) {
+                commandList.push({
+                    name: "**/" + subcommand.name + "**",
+                    value: "`" + subcommand.description + "`"
+                })
+            }
+        }
+    }
+
+    const embedColor = Number(color.replace("#", "0x"))
+    const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
+    const footerIcon = interaction.guild ? interaction.guild.iconURL({ forceStatic: false }) : interaction.user.avatarURL({ forceStatic: false })
+
+    await interaction.editReply({
+        embeds: [{
+            title: "Commands",
+            description: "List of commands",
+            fields: commandList,
+            color: embedColor,
+            thumbnail: {
+                url: interaction.guild!.iconURL({ forceStatic: false })!
+            },
+            footer: {
+                icon_url: footerIcon!,
+                text: footerText + " | " + devMessage
+            }
+        }],
+    })
+}

src/commands/staff/updatediscordroles.js

@@ -1,99 +0,0 @@
-const verify = require("../../schemas/verifySchema.js")
-const { color, hypixelGuildID } = require("../../../config/options.json")
-const { admin, gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } = require("../../../config/roles.json")
-const removeThese = [gm, manager, beast, elite, member, guildRole, guildStaff]
-const { getGuild } = require("../../utils/utils.js")
-
-/** @param { import("discord.js").ChatInputCommandInteraction } interaction */
-
-async function updateDiscordRoles(interaction) {
-
-    interaction.deferReply()
-    if (!interaction.member.roles.cache.has(admin)) {
-        interaction.editReply({
-            content: "You do not have permission to use this command.",
-            ephemeral: true
-        })
-    }
-
-    const embedColor = Number(color.replace("#", "0x"))
-    const guildMembers = await interaction.guild.members.fetch()
-
-    for (let i = 0; i < guildMembers.size; i++) {
-        const memberData = await verify.findOne({
-            userID: guildMembers[i].user.id
-        })
-
-        if (!memberData) {
-            for (const role of removeThese) {
-                guildMembers[i].roles.remove(role)
-            }
-        }
-
-        if (memberData) {
-            const igGuildMember = getGuild(memberData[i].uuid)
-
-            if (!igGuildMember) {
-                for (const role of removeThese) {
-                    guildMembers[i].roles.remove(role)
-                }
-            }
-
-            const guildId = igGuildMember._id
-            const guildRank = igGuildMember.members.find(member => member.uuid === memberData[i].uuid).rank
-
-            if (!guildId === hypixelGuildID) {
-                for (const role of removeThese) {
-                    guildMembers[i].roles.remove(role)
-                }
-            } else {
-                if (guildRank === "Guild Master") {
-                    guildMembers[i].add(guildRole, "All users updated forcefully by staff")
-                    guildMembers[i].add(guildStaff, "All users updated forcefully by staff")
-                    guildMembers[i].add(gm, "All users updated forcefully by staff")
-                    guildMembers[i].add(defaultMember, "All users updated forcefully by staff")
-                }
-                if (guildRank === "Manager") {
-                    guildMembers[i].add(guildRole, "All users updated forcefully by staff")
-                    guildMembers[i].add(guildStaff, "All users updated forcefully by staff")
-                    guildMembers[i].add(manager, "All users updated forcefully by staff")
-                    guildMembers[i].add(defaultMember, "All users updated forcefully by staff")
-                }
-                if (guildRank === "Moderator") {
-                    guildMembers[i].add(guildRole, "All users updated forcefully by staff")
-                    guildMembers[i].add(guildStaff, "All users updated forcefully by staff")
-                    guildMembers[i].add(moderator, "All users updated forcefully by staff")
-                    guildMembers[i].add(defaultMember, "All users updated forcefully by staff")
-                }
-                if (guildRank === "Beast") {
-                    guildMembers[i].add(guildRole, "All users updated forcefully by staff")
-                    guildMembers[i].add(beast, "All users updated forcefully by staff")
-                    guildMembers[i].add(defaultMember, "All users updated forcefully by staff")
-                }
-                if (guildRank === "Elite") {
-                    guildMembers[i].add(guildRole, "All users updated forcefully by staff")
-                    guildMembers[i].add(elite, "All users updated forcefully by staff")
-                    guildMembers[i].add(defaultMember, "All users updated forcefully by staff")
-                }
-                if (guildRank === "Member") {
-                    guildMembers[i].add(guildRole, "All users updated forcefully by staff")
-                    guildMembers[i].add(member, "All users updated forcefully by staff")
-                    guildMembers[i].add(defaultMember, "All users updated forcefully by staff")
-                }
-            }
-        }
-    }
-
-    interaction.editReply({
-        embeds: [{
-            color: embedColor,
-            description: "Successfully updated all users.",
-            footer: {
-                text: interaction.guild.name,
-                iconURL: interaction.guild.iconURL({ dynamic: true })
-            }
-        }]
-    })
-}
-
-module.exports = { updateDiscordRoles }

src/commands/staff/updatediscordroles.ts

@@ -0,0 +1,108 @@
+import verify = require("../../schemas/verifySchema")
+import { color, hypixelGuildID } from "../../../config/options.json"
+import { admin, gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } from "../../../config/roles.json"
+const removeThese = [gm, manager, beast, elite, member, guildRole, guildStaff]
+import { getGuild } from "../../utils/Hypixel"
+import { ChatInputCommandInteraction, GuildMember } from "discord.js"
+import { GuildData } from "../../interfaces/Guild"
+
+export async function updateDiscordRoles(interaction: ChatInputCommandInteraction): Promise<void> {
+
+    await interaction.deferReply()
+
+    const user = interaction.member as GuildMember
+
+    if (!user.roles.cache.has(admin)) {
+        await interaction.editReply("You do not have permission to use this command.")
+        return
+    }
+
+    const embedColor = Number(color.replace("#", "0x"))
+    const guildMembers = await interaction.guild!.members.fetch()
+    const memberList = guildMembers.map(member => {
+        return {
+            id: member.user.id,
+            member: member
+        }
+    })
+
+    for (const guildMember of memberList) {
+        const memberData = await verify.findOne({
+            userID: guildMember.id
+        })
+
+        if (!memberData) {
+            for (const role of removeThese) {
+                guildMember.member.roles.remove(role)
+            }
+            return
+        }
+
+        if (memberData) {
+            const isGuildMember = getGuild(memberData.uuid)
+
+            if (!isGuildMember) {
+                for (const role of removeThese) {
+                    guildMember.member.roles.remove(role)
+                }
+                return
+            }
+
+            const hypixelGuildMember = isGuildMember as unknown as GuildData
+
+            const guildId = hypixelGuildMember!._id
+            const guildRank = hypixelGuildMember!.members!.find(member => member.uuid === memberData.uuid)!.rank
+
+            if (guildId === hypixelGuildID) {
+                if (guildRank === "Guild Master") {
+                    guildMember.member.roles.add(guildRole, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(guildStaff, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(gm, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(defaultMember, "All users updated forcefully by staff")
+                }
+                if (guildRank === "Manager") {
+                    guildMember.member.roles.add(guildRole, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(guildStaff, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(manager, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(defaultMember, "All users updated forcefully by staff")
+                }
+                if (guildRank === "Moderator") {
+                    guildMember.member.roles.add(guildRole, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(guildStaff, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(moderator, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(defaultMember, "All users updated forcefully by staff")
+                }
+                if (guildRank === "Beast") {
+                    guildMember.member.roles.add(guildRole, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(beast, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(defaultMember, "All users updated forcefully by staff")
+                }
+                if (guildRank === "Elite") {
+                    guildMember.member.roles.add(guildRole, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(elite, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(defaultMember, "All users updated forcefully by staff")
+                }
+                if (guildRank === "Member") {
+                    guildMember.member.roles.add(guildRole, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(member, "All users updated forcefully by staff")
+                    guildMember.member.roles.add(defaultMember, "All users updated forcefully by staff")
+                }
+            } else {
+                for (const role of removeThese) {
+                    guildMember.member.roles.remove(role)
+                }
+            }
+        }
+    }
+
+    interaction.editReply({
+        embeds: [{
+            color: embedColor,
+            description: "Successfully updated all users.",
+            footer: {
+                text: interaction.guild!.name,
+                icon_url: interaction.guild!.iconURL({ forceStatic: false })!
+            }
+        }]
+    })
+}