Fixed formatting

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

src/commands/ban.ts

@@ -1,9 +1,4 @@
-import {
+import { SlashCommandBuilder, PermissionFlagsBits, userMention, GuildMember, } from "discord.js"
-    SlashCommandBuilder,
-    PermissionFlagsBits,
-    userMention,
-    GuildMember,
-} from "discord.js"
 import { admin, helper } from "config/roles.json"
 import { color, devMessage } from "config/options.json"
 import { Command } from "interfaces"
@@ -22,10 +17,12 @@ export = {
             option
                 .setName("user")
                 .setDescription("User to ban")
-                .setRequired(true),
+                .setRequired(true)
         )
         .addStringOption(option =>
-            option.setName("reason").setDescription("Reason for ban"),
+            option
+                .setName("reason")
+                .setDescription("Reason for ban")
         )
         .addNumberOption(option =>
             option
@@ -39,7 +36,7 @@ export = {
                     { name: "5 days", value: 5 },
                     { name: "6 days", value: 6 },
                     { name: "7 days", value: 7 },
-                ),
+                )
         )
         .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
         .setDMPermission(false),
@@ -47,13 +44,9 @@ export = {
     async execute(interaction) {
         await interaction.deferReply()
 
-        const member = interaction.options.getMember(
+        const member = interaction.options.getMember("user") as GuildMember | null
-            "user",
+        const reason = interaction.options.getString("reason") ?? "No reason provided."
-        ) as GuildMember | null
+        const messageDeletionDays = interaction.options.getNumber("messagedeletiondays") ?? 0
-        const reason =
-            interaction.options.getString("reason") ?? "No reason provided."
-        const messageDeletionDays =
-            interaction.options.getNumber("messagedeletiondays") ?? 0
         const embedColor = Number(color.replace("#", "0x"))
 
         if (!member) {
@@ -67,15 +60,12 @@ export = {
 
         if (!modRoles.includes(admin)) {
             await interaction.editReply(
-                "You do not have permission to use this command.",
+                "You do not have permission to use this command."
             )
             return
         }
 
-        if (
+        if (interaction.guild!.members.me!.roles.highest.position <= member.roles.highest.position) {
-            interaction.guild!.members.me!.roles.highest.position <=
-            member.roles.highest.position
-        ) {
             await interaction.editReply("I cannot ban this member.")
             return
         }
@@ -105,17 +95,13 @@ export = {
             return
         }
 
-        await member.ban({
+        await member.ban({ reason: reason, deleteMessageDays: messageDeletionDays })
-            reason: reason,
-            deleteMessageDays: messageDeletionDays,
-        })
 
         await logToChannel("mod", {
-            embeds: [
+            embeds: [{
-                {
                 author: {
                     name: mod.user.username,
-                        icon_url: mod.user.avatarURL() || undefined,
+                    icon_url: mod.user.avatarURL() || undefined
                 },
                 title: "Member Banned",
                 description: `
@@ -126,41 +112,31 @@ export = {
                 `,
                 color: embedColor,
                 thumbnail: {
-                        url: mod.user.avatarURL() || "",
+                    url: mod.user.avatarURL() || ""
                 },
                 footer: {
                     text: "ID: " + member.user.id,
-                        icon_url: member.user.avatarURL() || undefined,
+                    icon_url: member.user.avatarURL() || undefined
                 },
-                    timestamp: new Date().toISOString(),
+                timestamp: new Date().toISOString()
-                },
+            }]
-            ],
         })
 
         await interaction.editReply({
-            embeds: [
+            embeds: [{
-                {
                 title: "Member Banned",
-                    description:
+                description: "**User:** " + userMention(member.user.id) + "\n" +
-                        "**User:** " +
+                    "**Reason:** " + reason + "\n" +
-                        userMention(member.user.id) +
+                    "**Messages Deleted:** " + messageDeletionDays + " days",
-                        "\n" +
-                        "**Reason:** " +
-                        reason +
-                        "\n" +
-                        "**Messages Deleted:** " +
-                        messageDeletionDays +
-                        " days",
                 color: embedColor,
                 thumbnail: {
-                        url: member.user.avatarURL() || "",
+                    url: member.user.avatarURL() || ""
                 },
                 footer: {
                     icon_url: interaction.guild!.iconURL() || undefined,
-                        text: interaction.guild!.name + " | " + devMessage,
+                    text: interaction.guild!.name + " | " + devMessage
-                    },
+                }
-                },
+            }]
-            ],
         })
     },
 } as Command

src/commands/check.ts

@@ -1,23 +1,7 @@
 import { SlashCommandBuilder } from "discord.js"
-import {
+import { bwfkdr, bwstars, bwwins, swstars, swkdr, duelswins, duelswlr } from "config/reqs.json"
-    bwfkdr,
-    bwstars,
-    bwwins,
-    swstars,
-    swkdr,
-    duelswins,
-    duelswlr,
-} from "config/reqs.json"
 import { color, devMessage } from "config/options.json"
-import {
+import { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel"
-    hypixelLevel,
-    bedwarsLevel,
-    skywarsLevel,
-    getUUID,
-    getPlayer,
-    getGuild,
-    getHeadURL,
-} from "utils/Hypixel"
 import { Command } from "interfaces"
 
 export = {
@@ -33,7 +17,7 @@ export = {
             option
                 .setName("ign")
                 .setDescription("The player's IGN.")
-                .setRequired(true),
+                .setRequired(true)
         )
         .setDMPermission(false),
 
@@ -44,47 +28,38 @@ export = {
         const embedColor = Number(color.replace("#", "0x"))
 
         await interaction.editReply({
-            embeds: [
+            embeds: [{
-                {
                 description: "Fetching your uuid...",
-                    color: embedColor,
+                color: embedColor
-                },
+            }]
-            ],
         })
 
         const uuid = await getUUID(ign)
         if (!uuid) {
             interaction.editReply({
-                embeds: [
+                embeds: [{
-                    {
                     description: "That player doesn't exist.",
-                        color: embedColor,
+                    color: embedColor
-                    },
+                }]
-                ],
             })
             return
         }
 
         await interaction.editReply({
-            embeds: [
+            embeds: [{
-                {
                 description: "Fetching your player data...",
-                    color: embedColor,
+                color: embedColor
-                },
+            }]
-            ],
         })
 
         const head = await getHeadURL(ign)
         const player = await getPlayer(uuid)
         if (!player) {
             interaction.editReply({
-                embeds: [
+                embeds: [{
-                    {
+                    description: "That player hasn't played Hypixel before.",
-                        description:
+                    color: embedColor
-                            "That player hasn't played Hypixel before.",
+                }]
-                        color: embedColor,
-                    },
-                ],
             })
             return
         }
@@ -106,12 +81,10 @@ export = {
         }
 
         await interaction.editReply({
-            embeds: [
+            embeds: [{
-                {
                 description: "Fetching your guild data...",
-                    color: embedColor,
+                color: embedColor
-                },
+            }]
-            ],
         })
 
         const guild = await getGuild(uuid)
@@ -143,135 +116,97 @@ export = {
         if (!player.stats) {
             statsFields.push({
                 name: "<a:_warning:1178350183457751100> This player never played any games.",
-                value: "**➺ Stats:** `None`",
+                value: "**➺ Stats:** `None`"
             })
         } else {
             if (player.stats.Bedwars) {
-                const hsbwexp = player.stats.Bedwars.Experience || 0
+                const hsbwexp = player.stats?.Bedwars?.Experience || 0
-                const hsbwstars = bedwarsLevel(hsbwexp)
                 const hsbwfk = player.stats?.Bedwars?.final_kills_bedwars || 0
                 const hsbwfd = player.stats?.Bedwars?.final_deaths_bedwars || 0
+                const hsbwwins = player.stats?.Bedwars?.wins_bedwars || 0
+                const hsbwstars = bedwarsLevel(hsbwexp)
                 const hsbwfkdr = hsbwfk / hsbwfd || 0
-                const hsbwwins = player.stats.Bedwars.wins_bedwars || 0
 
                 let bwtitle = ""
-                if (
+                if (hsbwstars < bwstars || hsbwfkdr < bwfkdr || hsbwwins < bwwins) {
-                    hsbwstars < bwstars ||
+                    bwtitle = "<a:cross_a:1087808606897983539> This player does not meet the BedWars requirements."
-                    hsbwfkdr < bwfkdr ||
-                    hsbwwins < bwwins
-                ) {
-                    bwtitle =
-                        "<a:cross_a:1087808606897983539> This player does not meet the BedWars requirements."
                 } else {
-                    bwtitle =
+                    bwtitle = "<a:check_a:1087808632172847134> This player meets the BedWars requirements."
-                        "<a:check_a:1087808632172847134> This player meets the BedWars requirements."
                 }
 
                 statsFields.push({
                     name: bwtitle,
-                    value:
+                    value: "**➺ Stars:** `" + hsbwstars.toFixed(2).toString() +
-                        "**➺ Stars:** `" +
+                        " / " + bwstars.toString() + "`\n" +
-                        hsbwstars.toFixed(2).toString() +
+                        "**➺ FKDR:** `" + hsbwfkdr.toFixed(2).toString() +
-                        " / " +
+                        " / " + bwfkdr.toString() + "`\n" +
-                        bwstars.toString() +
+                        "**➺ Wins:** `" + hsbwwins.toString() +
-                        "`\n" +
+                        " / " + bwwins.toString() + "`"
-                        "**➺ FKDR:** `" +
-                        hsbwfkdr.toFixed(2).toString() +
-                        " / " +
-                        bwfkdr.toString() +
-                        "`\n" +
-                        "**➺ Wins:** `" +
-                        hsbwwins.toString() +
-                        " / " +
-                        bwwins.toString() +
-                        "`",
                 })
             } else {
                 statsFields.push({
                     name: "<a:_warning:1178350183457751100> This player never played BedWars.",
-                    value: "**➺ Stats:** `None`",
+                    value: "**➺ Stats:** `None`"
                 })
             }
 
             if (player.stats.SkyWars) {
                 const hsswexp = player.stats?.SkyWars?.skywars_experience || 0
-                const hsswstars = skywarsLevel(hsswexp)
                 const hsswkills = player.stats?.SkyWars?.kills || 0
                 const hsswdeaths = player.stats?.SkyWars?.deaths || 0
-                const hsswkd = hsswkills / hsswdeaths || 0
                 const hsswwins = player.stats?.SkyWars?.wins || 0
+                const hsswstars = skywarsLevel(hsswexp)
+                const hsswkd = hsswkills / hsswdeaths || 0
 
                 let swtitle = ""
                 if (hsswstars < swstars || hsswkd < swkdr) {
-                    swtitle =
+                    swtitle = "<a:cross_a:1087808606897983539> This player does not meet the SkyWars requirements."
-                        "<a:cross_a:1087808606897983539> This player does not meet the SkyWars requirements."
                 } else {
-                    swtitle =
+                    swtitle = "<a:check_a:1087808632172847134> This player meets the SkyWars requirements."
-                        "<a:check_a:1087808632172847134> This player meets the SkyWars requirements."
                 }
 
                 statsFields.push({
                     name: swtitle,
-                    value:
+                    value: "**➺ Stars:** `" + hsswstars.toFixed(2).toString() +
-                        "**➺ Stars:** `" +
+                        " / " + swstars.toString() + "`\n" +
-                        hsswstars.toFixed(2).toString() +
+                        "**➺ KDR:** `" + hsswkd.toFixed(2).toString() +
-                        " / " +
+                        " / " + swkdr.toString() + "`\n" +
-                        swstars.toString() +
+                        "**➺ Wins:** `" + hsswwins.toString() + "`"
-                        "`\n" +
-                        "**➺ KDR:** `" +
-                        hsswkd.toFixed(2).toString() +
-                        " / " +
-                        swkdr.toString() +
-                        "`\n" +
-                        "**➺ Wins:** `" +
-                        hsswwins.toString() +
-                        "`",
                 })
             } else {
                 statsFields.push({
                     name: "<a:_warning:1178350183457751100> This player never played SkyWars.",
-                    value: "**➺ Stats:** `None`",
+                    value: "**➺ Stats:** `None`"
                 })
             }
 
             if (player.stats.Duels) {
                 const hsduelskills = player.stats?.Duels?.kills || 0
                 const hsduelsdeaths = player.stats?.Duels?.deaths || 0
-                const hsduelskd = hsduelskills / hsduelsdeaths || 0
                 const hsduelswins = player.stats?.Duels?.wins || 0
                 const hsduelslosses = player.stats?.Duels?.losses || 0
+                const hsduelskd = hsduelskills / hsduelsdeaths || 0
                 const hsduelswlr = hsduelswins / hsduelslosses || 0
 
                 let duelstitle = ""
                 if (hsduelswins < duelswins || hsduelswlr < duelswlr) {
-                    duelstitle =
+                    duelstitle = "<a:cross_a:1087808606897983539> This player does not meet the Duels requirements."
-                        "<a:cross_a:1087808606897983539> This player does not meet the Duels requirements."
                 } else {
-                    duelstitle =
+                    duelstitle = "<a:check_a:1087808632172847134> This player meets the Duels requirements."
-                        "<a:check_a:1087808632172847134> This player meets the Duels requirements."
                 }
 
                 statsFields.push({
                     name: duelstitle,
-                    value:
+                    value: "**➺ Wins:** `" + hsduelswins.toString() +
-                        "**➺ Wins:** `" +
+                        " / " + duelswins.toString() + "`\n" +
-                        hsduelswins.toString() +
+                        "**➺ WLR:** `" + hsduelswlr.toFixed(2).toString() +
-                        " / " +
+                        " / " + duelswlr.toString() + "`\n" +
-                        duelswins.toString() +
+                        "**➺ KDR:** `" + hsduelskd.toFixed(2).toString() + "`",
-                        "`\n" +
-                        "**➺ WLR:** `" +
-                        hsduelswlr.toFixed(2).toString() +
-                        " / " +
-                        duelswlr.toString() +
-                        "`\n" +
-                        "**➺ KDR:** `" +
-                        hsduelskd.toFixed(2).toString() +
-                        "`\n",
                 })
             } else {
                 statsFields.push({
                     name: "<a:_warning:1178350183457751100> This player never played Duels.",
-                    value: "**➺ Stats:** `None`",
+                    value: "**➺ Stats:** `None`"
                 })
             }
         }
@@ -281,30 +216,21 @@ export = {
         const level = hypixelLevel(hypixelExp)
 
         await interaction.editReply({
-            embeds: [
+            embeds: [{
-                {
                 title: rank + player.displayname + guildTag,
-                    description:
+                description: "**Network Level:** `" + level.toFixed(2).toString() + "`\n" +
-                        "**Network Level:** `" +
+                    "**Current Guild:** `" + guildName + "`\n" +
-                        level.toFixed(2).toString() +
+                    "**Guild Rank:** `" + guildRank + "`",
-                        "`\n" +
-                        "**Current Guild:** `" +
-                        guildName +
-                        "`\n" +
-                        "**Guild Rank:** `" +
-                        guildRank +
-                        "`",
                 color: embedColor,
                 thumbnail: {
-                        url: head!,
+                    url: head!
                 },
                 footer: {
                     text: interaction.guild!.name + " | " + devMessage,
-                        icon_url: interaction.guild!.iconURL() || undefined,
+                    icon_url: interaction.guild!.iconURL() || undefined
                 },
-                    fields: statsFields,
+                fields: statsFields
-                },
+            }]
-            ],
         })
-    },
+    }
 } as Command