Fixed formatting for event files

src/events/cron/weeklyGexp.ts

@@ -1,9 +1,4 @@
-import {
+import { hypixelGuildID, guildLogChannel, color, devMessage } from "config/options.json"
-    hypixelGuildID,
-    guildLogChannel,
-    color,
-    devMessage
-} from "config/options.json"
 import colorLog from "utils/functions/colors"
 import { getGuild, getIGN } from "utils/Hypixel"
 import { Cron, GuildData } from "interfaces"
@@ -22,18 +17,15 @@ async function guildWeekly() {
     const embedColor = Number(color.replace("#", "0x"))
 
     const message = await channel.send({
-        embeds: [
+        embeds: [{
-            {
             description: "Starting to fetch guild data...",
             color: embedColor
-            }
+        }]
-        ]
     })
 
     const guild = (await getGuild(hypixelGuildID, "id")) as GuildData
     const guildMembersList: string[] = []
-    const topWeeklyMembers: { name: string; value: string; inline: boolean }[] =
+    const topWeeklyMembers: { name: string; value: string; inline: boolean }[] = []
-        []
 
     const guildName = guild.name
     const guildMembers = guild.members
@@ -41,24 +33,18 @@ async function guildWeekly() {
     const sliceSize = guildMembers.length / 4
 
     // top weekly members
-    const allMembersGexpSorted = guildMembers
+    const allMembersGexpSorted = guildMembers.map(member => {
-        .map(member => {
         return {
             uuid: member.uuid,
             exp: Object.values(member.expHistory).reduce((a, b) => a + b, 0)
         }
-        })
+    }).sort((a, b) => b.exp - a.exp)
-        .sort((a, b) => b.exp - a.exp)
 
     for (let i = 0; i < allMembersGexpSorted.length; i++) {
         const ign = await getIGN(allMembersGexpSorted[i].uuid)
-        const gexp = new Intl.NumberFormat("en-US").format(
+        const gexp = new Intl.NumberFormat("en-US").format(allMembersGexpSorted[i].exp)
-            allMembersGexpSorted[i].exp
-        )
         const position = i + 1
-        guildMembersList.push(
+        guildMembersList.push("**#" + position + " " + ign + ":** `" + gexp + "`")
-            "**#" + position + " " + ign + ":** `" + gexp + "`"
-        )
     }
 
     const list = Array.from({ length: sliceSize }, (_, i) =>
@@ -76,37 +62,22 @@ async function guildWeekly() {
     })
 
     // combined weekly gexp
-    const allGuildMembersWeeklyXP = guildMembers.map(
+    const allGuildMembersWeeklyXP = guildMembers.map(member => member.expHistory)
-        member => member.expHistory
-    )
     const guildMembersWeeklyXP = allGuildMembersWeeklyXP.map(member => {
         return Object.values(member).reduce((a, b) => a + b, 0)
     })
-    const totalGuildMembersWeeklyXPUnformatted = guildMembersWeeklyXP.reduce(
+    const totalGuildMembersWeeklyXPUnformatted = guildMembersWeeklyXP.reduce((a, b) => a + b, 0)
-        (a, b) => a + b,
+    const averageGuildMembersDailyXPUnformatted = totalGuildMembersWeeklyXPUnformatted / 7
-        0
-    )
-    const averageGuildMembersDailyXPUnformatted =
-        totalGuildMembersWeeklyXPUnformatted / 7
 
     // final values
-    const totalGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(
+    const totalGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(totalGuildMembersWeeklyXPUnformatted)
-        totalGuildMembersWeeklyXPUnformatted
+    const averageGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(averageGuildMembersDailyXPUnformatted)
-    )
-    const averageGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(
-        averageGuildMembersDailyXPUnformatted
-    )
 
     await message.edit({
-        embeds: [
+        embeds: [{
-            {
             title: "**Weekly Guild XP for " + guildName + "**",
-                description:
+            description: "**Total weekly guild XP:** `" + totalGuildMembersWeeklyXP +
-                    "**Total weekly guild XP:** `" +
+                "`\n**Average daily guild XP:** `" + averageGuildMembersWeeklyXP + "`",
-                    totalGuildMembersWeeklyXP +
-                    "`\n**Average daily guild XP:** `" +
-                    averageGuildMembersWeeklyXP +
-                    "`",
             color: embedColor,
             fields: topWeeklyMembers,
             timestamp: new Date().toISOString(),
@@ -114,8 +85,7 @@ async function guildWeekly() {
                 text: channel.guild.name + " | " + devMessage,
                 icon_url: channel.guild.iconURL() || undefined
             }
-            }
+        }]
-        ]
     })
 }
 

src/events/server/guildMemberAdd/logNewJoins.ts

@@ -13,14 +13,10 @@ export = {
         const embedColor = Number(color.replace("#", "0x"))
 
         logToChannel("bot", {
-            embeds: [
+            embeds: [{
-                {
                 title: "New Member",
-                    description:
+                description: userMention(member.id) + " has joined the server.\n" +
-                        userMention(member.id) +
+                    "Account created: " + member.user.createdAt.toLocaleString(),
-                        " has joined the server.\n" +
-                        "Account created: " +
-                        member.user.createdAt.toLocaleString(),
                 color: embedColor,
                 thumbnail: {
                     url: member.user.avatarURL() || ""
@@ -30,8 +26,7 @@ export = {
                     icon_url: member.user.avatarURL() || undefined
                 },
                 timestamp: new Date().toISOString()
-                }
+            }]
-            ]
         })
     }
 } as Event

src/events/server/interactions/logBtnsCmds.ts

@@ -12,19 +12,15 @@ export = {
             try {
                 console.log(
                     color(
-                        interaction.user.username +
+                        interaction.user.username + " ran " +
-                            " ran " +
+                        interaction.commandName + " " +
-                            interaction.commandName +
+                        interaction.options.getSubcommand(), "pink"
-                            " " +
-                            interaction.options.getSubcommand(),
-                        "pink"
                     )
                 )
             } catch {
                 console.log(
                     color(
-                        interaction.user.username +
+                        interaction.user.username + " ran " +
-                            " ran " +
                         interaction.commandName,
                         "pink"
                     )
@@ -35,10 +31,8 @@ export = {
         if (interaction.isButton()) {
             console.log(
                 color(
-                    interaction.user.username +
+                    interaction.user.username + "#" +
-                        "#" +
+                    interaction.user.discriminator + " clicked " +
-                        interaction.user.discriminator +
-                        " clicked " +
                     interaction.customId,
                     "pink"
                 )

src/events/server/messages/eval.ts

@@ -19,19 +19,15 @@ export = {
             const output = eval(code)
             const outputString = String(output)
             await message.channel.send({
-                embeds: [
+                embeds: [{
-                    {
                     description: `\`\`\`js\n${outputString}\`\`\``
-                    }
+                }]
-                ]
             })
         } catch (error) {
             await message.channel.send({
-                embeds: [
+                embeds: [{
-                    {
                     description: `\`\`\`js\n${error}\`\`\``
-                    }
+                }]
-                ]
             })
         }
     }

src/events/server/messages/react.ts

@@ -7,10 +7,7 @@ export = {
     event: "messageCreate",
 
     async execute(message: Message) {
-        if (
+        if (message.content.toLowerCase().includes("ur mom") && message.author.username === "taken.lua") {
-            message.content.toLowerCase().includes("ur mom") &&
-            message.author.username === "taken.lua"
-        ) {
             message.react("Woot:734345936347725885")
         }
     }

src/events/server/ready/sendOnlineMessage.ts

@@ -13,12 +13,10 @@ export = {
         const embedColor = Number(color.replace("#", "0x"))
 
         logToChannel("online", {
-            embeds: [
+            embeds: [{
-                {
                 description: "Bot is online!",
                 color: embedColor
-                }
+            }]
-            ]
         })
     }
 } as Event

src/events/server/voiceStateUpdate/vcJoinLeave.ts

@@ -17,64 +17,45 @@ export = {
 
         if (oldChannel === null && newChannel !== null) {
             logToChannel("bot", {
-                embeds: [
+                embeds: [{
-                    {
                     title: "Voice Channel Join",
-                        description:
+                    description: userMention(newState.member!.id) + " joined " + channelMention(newChannel.id),
-                            userMention(newState.member!.id) +
-                            " joined " +
-                            channelMention(newChannel.id),
                     color: embedColor,
                     footer: {
                         text: "ID: " + newState.member!.id,
-                            icon_url:
+                        icon_url: newState.member!.user.avatarURL() || undefined
-                                newState.member!.user.avatarURL() || undefined
                     },
                     timestamp: new Date().toISOString()
-                    }
+                }]
-                ]
             })
         } else if (oldChannel !== null && newChannel === null) {
             logToChannel("bot", {
-                embeds: [
+                embeds: [{
-                    {
                     title: "Voice Channel Leave",
-                        description:
+                    description: userMention(oldState.member!.id) + " left " + channelMention(oldChannel.id),
-                            userMention(oldState.member!.id) +
-                            " left " +
-                            channelMention(oldChannel.id),
                     color: embedColor,
                     footer: {
                         text: "ID: " + oldState.member!.id,
-                            icon_url:
+                        icon_url: oldState.member!.user.avatarURL() || undefined
-                                oldState.member!.user.avatarURL() || undefined
                     },
                     timestamp: new Date().toISOString()
-                    }
+                }]
-                ]
             })
         } else if (oldChannel !== null && newChannel !== null) {
             if (oldChannel.id === newChannel.id) return
 
             logToChannel("bot", {
-                embeds: [
+                embeds: [{
-                    {
                     title: "Voice Channel Switch",
-                        description:
+                    description: userMention(oldState.member!.id) + " switched from " + channelMention(oldChannel.id) +
-                            userMention(oldState.member!.id) +
+                        " to " + channelMention(newChannel.id),
-                            " switched from " +
-                            channelMention(oldChannel.id) +
-                            " to " +
-                            channelMention(newChannel.id),
                     color: embedColor,
                     footer: {
                         text: "ID: " + oldState.member!.id,
-                            icon_url:
+                        icon_url: oldState.member!.user.avatarURL() || undefined
-                                oldState.member!.user.avatarURL() || undefined
                     },
                     timestamp: new Date().toISOString()
-                    }
+                }]
-                ]
             })
         }
     }