Merge branch 'dev' into 'main'

Updated function folder name

See merge request illegitimate/illegitimate-bot!306

src/commands-contextmenu/congratsmessage.ts

@@ -8,6 +8,7 @@ export default {
 
     data: new ContextMenuCommandBuilder()
         .setName("Congratulate")
+        // @ts-ignore: known issue
         .setType(ApplicationCommandType.Message)
         .setContexts(InteractionContextType.Guild)
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),

src/commands-contextmenu/resetnick.ts

@@ -8,6 +8,7 @@ export default {
 
     data: new ContextMenuCommandBuilder()
         .setName("Reset Nickname")
+        // @ts-ignore: known issue
         .setType(ApplicationCommandType.User)
         .setContexts(InteractionContextType.Guild)
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageNicknames),

src/commands-contextmenu/updateuser.ts

@@ -3,7 +3,7 @@ import db from "src/drizzle/db.js"
 import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js"
 import { waitingListRole } from "~/config/roles.js"
 import { IContextMenu } from "~/interfaces"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js"
 
 export default {
@@ -13,6 +13,7 @@ export default {
 
     data: new ContextMenuCommandBuilder()
         .setName("Update User")
+        // @ts-ignore: known issue
         .setType(ApplicationCommandType.User)
         .setContexts(InteractionContextType.Guild)
         .setDefaultMemberPermissions(PermissionFlagsBits.Administrator),

src/commands/ban.ts

@@ -2,7 +2,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandB
 import { devMessage, embedColor } from "~/config/options.js"
 import { admin, helper } from "~/config/roles.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "ban",

src/commands/clear.ts

@@ -1,7 +1,7 @@
 import { channelMention, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js"
 import { embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "clear",

src/commands/forceunverify.ts

@@ -4,8 +4,8 @@ import db from "src/drizzle/db.js"
 import { verifies } from "src/drizzle/schema.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getIGN } from "~/utils/Hypixel.js"
 
 export default {

src/commands/forceupdate.ts

@@ -3,7 +3,7 @@ import db from "src/drizzle/db.js"
 import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js"
 import { waitingListRole } from "~/config/roles.js"
 import { ICommand } from "~/interfaces"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js"
 
 export default {

src/commands/forceverify.ts

@@ -3,8 +3,8 @@ import db from "src/drizzle/db.js"
 import { verifies } from "src/drizzle/schema.js"
 import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js"
 
 export default {

src/commands/guild/info.ts

@@ -1,6 +1,7 @@
 import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { IGuildData } from "~/interfaces"
+import { 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> {
@@ -107,7 +108,7 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction
     const guildCreated = new Date(guildCreatedMS)
     const guildTag = guild!.tag
     const guildExpUnformatted = guild!.exp
-    const guildExp = new Intl.NumberFormat("en-US").format(guildExpUnformatted)
+    const guildExp = numberFormatter.format(guildExpUnformatted)
     const guildLvl = guildLevel(guildExpUnformatted)
     const guildMembers = guild!.members
     const guildCreatedTime = guildCreated.toLocaleString("hr-HR", {})
@@ -123,10 +124,10 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction
     })
 
     const totalGuildMembersWeeklyXPUnformatted = guildMembersWeeklyXP.reduce((a, b) => a + b, 0)
-    const totalGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(totalGuildMembersWeeklyXPUnformatted)
+    const totalGuildMembersWeeklyXP = numberFormatter.format(totalGuildMembersWeeklyXPUnformatted)
 
     const averageGuildMembersWeeklyXPUnformatted = Math.round(totalGuildMembersWeeklyXPUnformatted / 7)
-    const averageGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(averageGuildMembersWeeklyXPUnformatted)
+    const averageGuildMembersWeeklyXP = numberFormatter.format(averageGuildMembersWeeklyXPUnformatted)
 
     await interaction.editReply({
         embeds: [{

src/commands/guild/member.ts

@@ -1,5 +1,6 @@
 import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
+import { numberFormatter } from "~/utils/Functions/intlFormaters.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js"
 
 export default async function guildMember(interaction: ChatInputCommandInteraction): Promise<void> {
@@ -101,13 +102,13 @@ export default async function guildMember(interaction: ChatInputCommandInteracti
     const guildRank = guildMember!.rank
     const memberGexp = guildMember!.expHistory
     const allDaysGexp = Object.keys(memberGexp).map(key => {
-        return ("**➺ " + key + ":** " + "`" + new Intl.NumberFormat("en-US").format(memberGexp[key]) + "`" + "\n")
+        return ("**➺ " + key + ":** " + "`" + numberFormatter.format(memberGexp[key]) + "`" + "\n")
     })
     const expValue = allDaysGexp.join("")
     const totalWeeklyGexpUnformatted = Object.values(memberGexp).reduce((a, b) => a + b, 0)
-    const totalWeeklyGexp = new Intl.NumberFormat("en-US").format(totalWeeklyGexpUnformatted)
+    const totalWeeklyGexp = numberFormatter.format(totalWeeklyGexpUnformatted)
     const averageWeeklyGexpUnformatted = Math.round(totalWeeklyGexpUnformatted / 7)
-    const averageWeeklyGexp = new Intl.NumberFormat("en-US").format(averageWeeklyGexpUnformatted)
+    const averageWeeklyGexp = numberFormatter.format(averageWeeklyGexpUnformatted)
 
     const guildMemberJoinMS = guildMember!.joined
     const guildMemberJoinTime = new Date(guildMemberJoinMS)

src/commands/guild/top.ts

@@ -1,6 +1,7 @@
 import { ChatInputCommandInteraction } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { IGuildData } from "~/interfaces"
+import { numberFormatter } from "~/utils/Functions/intlFormaters.js"
 import { getGuild, getIGN, getPlayer, getUUID } from "~/utils/Hypixel.js"
 import { redis } from "~/utils/Illegitimate.js"
 
@@ -113,10 +114,10 @@ export default async function guildTop(interaction: ChatInputCommandInteraction)
     const gexpTodayUnformatted = guildMembers.map(member => {
         return member.expHistory[Object.keys(member.expHistory)[0]]
     }).reduce((a, b) => a + b, 0)
-    const gexpToday = new Intl.NumberFormat("en-US").format(gexpTodayUnformatted)
+    const gexpToday = numberFormatter.format(gexpTodayUnformatted)
 
     const averageGuildMemberGEXPUnformatted = Math.floor(gexpTodayUnformatted / guildMembers.length)
-    const averageGuildMemberGEXP = new Intl.NumberFormat("en-US").format(averageGuildMemberGEXPUnformatted)
+    const averageGuildMemberGEXP = numberFormatter.format(averageGuildMemberGEXPUnformatted)
 
     const allMembersDailyGEXP = guildMembers.map(member => {
         return {
@@ -177,7 +178,7 @@ export default async function guildTop(interaction: ChatInputCommandInteraction)
     const sliceSize = amount / 4
 
     for (let i = 0; i < amount; i++) {
-        const gexp = new Intl.NumberFormat("en-US").format(topMembers[i].gexp)
+        const gexp = numberFormatter.format(topMembers[i].gexp)
         const ign = guildData.find(member => member.uuid === topMembers[i].uuid)?.ign
 
         const position = i + 1

src/commands/kick.ts

@@ -2,7 +2,7 @@ import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandB
 import { devMessage, embedColor } from "~/config/options.js"
 import { admin, helper } from "~/config/roles.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "kick",

src/commands/remove.ts

@@ -5,7 +5,7 @@ import { waitingLists } from "src/drizzle/schema.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { waitingListRole } from "~/config/roles.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "remove",

src/commands/setnick.ts

@@ -1,7 +1,7 @@
 import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "setnick",

src/commands/slowmode.ts

@@ -1,7 +1,7 @@
 import { channelMention, ChannelType, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "slowmode",

src/commands/staff/removeguildroles.ts

@@ -3,7 +3,7 @@ import db from "src/drizzle/db.js"
 import { embedColor, hypixelGuildID } from "~/config/options.js"
 import { IGuildData } from "~/interfaces"
 import env from "~/utils/Env.js"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild } from "~/utils/Hypixel.js"
 
 export default async function removeGuildRoles(interaction: ChatInputCommandInteraction): Promise<void> {

src/commands/staff/updateall.ts

@@ -3,8 +3,8 @@ import db from "src/drizzle/db.js"
 import { embedColor, hypixelGuildID } from "~/config/options.js"
 import { IGuildData } from "~/interfaces"
 import env from "~/utils/Env.js"
-import { color } from "~/utils/functions/colors.js"
+import { color } from "~/utils/Functions/colors.js"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getIGN } from "~/utils/Hypixel.js"
 
 export default async function updateAll(interaction: ChatInputCommandInteraction): Promise<void> {

src/commands/timeout.ts

@@ -3,7 +3,7 @@ import ms from "ms"
 import prettyMs from "pretty-ms"
 import { devMessage, embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "timeout",

src/commands/unban.ts

@@ -1,7 +1,7 @@
 import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, User, userMention } from "discord.js"
 import { devMessage, embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     name: "unban",

src/commands/update.ts

@@ -3,7 +3,7 @@ import db from "src/drizzle/db.js"
 import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js"
 import { waitingListRole } from "~/config/roles.js"
 import { ICommand } from "~/interfaces"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js"
 
 export default {

src/commands/verify.ts

@@ -5,7 +5,7 @@ import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
 import { IPlayerData } from "~/interfaces"
 import { IGuildData } from "~/interfaces"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js"
 
 export default {

src/components/buttons/guildapplicationaccept.ts

@@ -5,7 +5,7 @@ import { guildApps, waitingLists } from "src/drizzle/schema.js"
 import { embedColor, hypixelGuildID, waitingListChannel, waitingListMessage } from "~/config/options.js"
 import { waitingListRole } from "~/config/roles.js"
 import { IButton } from "~/interfaces"
-import { color } from "~/utils/functions/colors.js"
+import { color } from "~/utils/Functions/colors.js"
 import { getGuild, getIGN } from "~/utils/Hypixel.js"
 
 export default {

src/components/buttons/guildapply.ts

@@ -6,7 +6,7 @@ import { applicationsChannel, embedColor } from "~/config/options.js"
 import { guild as guildQuestions } from "~/config/questions.js"
 import { guildRole } from "~/config/roles.js"
 import { IButton } from "~/interfaces"
-import applicationQuestions from "~/utils/functions/applicationquestions.js"
+import applicationQuestions from "~/utils/Functions/applicationquestions.js"
 
 export default {
     name: "guildapply",

src/components/buttons/guildinactivitylog.ts

@@ -4,7 +4,7 @@ import { embedColor, inactivityLogChannel } from "~/config/options.js"
 import { inactivity } from "~/config/questions.js"
 import { beast, gm, guildRole, guildStaff, manager, member, moderator } from "~/config/roles.js"
 import { IButton } from "~/interfaces"
-import applicationQuestions from "~/utils/functions/applicationquestions.js"
+import applicationQuestions from "~/utils/Functions/applicationquestions.js"
 const guildRoles = [gm, manager, moderator, beast, member, guildStaff, guildRole]
 
 export default {

src/components/buttons/staffapply.ts

@@ -7,7 +7,7 @@ import { staff as staffQuestions } from "~/config/questions.js"
 import { guildRole, guildStaff } from "~/config/roles.js"
 import { IButton } from "~/interfaces"
 import env from "~/utils/Env.js"
-import applicationQuestions from "~/utils/functions/applicationquestions.js"
+import applicationQuestions from "~/utils/Functions/applicationquestions.js"
 
 export default {
     name: "staffapply",

src/components/modals/verifyModal.ts

@@ -3,7 +3,7 @@ import db from "src/drizzle/db.js"
 import { verifies } from "src/drizzle/schema.js"
 import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js"
 import { IModal } from "~/interfaces"
-import roleManage from "~/utils/functions/rolesmanage.js"
+import roleManage from "~/utils/Functions/rolesmanage.js"
 import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js"
 
 export default {

src/events/cron/weeklyGexp.ts

@@ -1,7 +1,8 @@
 import { TextChannel } from "discord.js"
 import { devMessage, embedColor, guildLogChannel, hypixelGuildID } from "~/config/options.js"
 import { ICron, IGuildData } from "~/interfaces"
-import { color } from "~/utils/functions/colors.js"
+import { color } from "~/utils/Functions/colors.js"
+import { numberFormatter } from "~/utils/Functions/intlFormaters.js"
 import { getGuild, getIGN } from "~/utils/Hypixel.js"
 import { client } from "~/utils/Illegitimate.js"
 
@@ -39,7 +40,7 @@ async function guildWeekly() {
 
     for (let i = 0; i < allMembersGexpSorted.length; i++) {
         const ign = await getIGN(allMembersGexpSorted[i].uuid)
-        const gexp = new Intl.NumberFormat("en-US").format(allMembersGexpSorted[i].exp)
+        const gexp = numberFormatter.format(allMembersGexpSorted[i].exp)
         const position = i + 1
         guildMembersList.push("**#" + position + " " + ign + ":** `" + gexp + "`")
     }
@@ -65,8 +66,8 @@ async function guildWeekly() {
     const averageGuildMembersDailyXPUnformatted = totalGuildMembersWeeklyXPUnformatted / 7
 
     // final values
-    const totalGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(totalGuildMembersWeeklyXPUnformatted)
+    const totalGuildMembersWeeklyXP = numberFormatter.format(totalGuildMembersWeeklyXPUnformatted)
-    const averageGuildMembersWeeklyXP = new Intl.NumberFormat("en-US").format(averageGuildMembersDailyXPUnformatted)
+    const averageGuildMembersWeeklyXP = numberFormatter.format(averageGuildMembersDailyXPUnformatted)
 
     await message.edit({
         embeds: [{

src/events/server/guildMemberAdd/logNewJoins.ts

@@ -1,7 +1,7 @@
 import { GuildMember, userMention } from "discord.js"
 import { embedColor } from "~/config/options.js"
 import { IEvent } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     event: "guildMemberAdd",

src/events/server/interactions/logBtnsCmds.ts

@@ -1,5 +1,5 @@
 import { IEvent } from "~/interfaces"
-import { color } from "~/utils/functions/colors.js"
+import { color } from "~/utils/Functions/colors.js"
 
 export default {
     event: "interactionCreate",

src/events/server/ready/consolelog.ts

@@ -1,5 +1,5 @@
 import { IEvent } from "~/interfaces"
-import { color } from "~/utils/functions/colors.js"
+import { color } from "~/utils/Functions/colors.js"
 
 export default {
     event: "ready",

src/events/server/ready/sendOnlineMessage.ts

@@ -1,6 +1,6 @@
 import { embedColor } from "~/config/options.js"
 import { IEvent } from "~/interfaces"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 
 export default {
     event: "ready",

src/utils/Autodeploy.ts

@@ -3,7 +3,7 @@ import fs from "fs"
 import { ICommand, IContextMenu } from "~/interfaces"
 import { ExtendedClient } from "./Client.js"
 import env from "./Env.js"
-import { color } from "./functions/colors.js"
+import { color } from "./Functions/colors.js"
 type FileType = "js" | "ts"
 
 export default async function autoDeployCommands(fileType: FileType, client: ExtendedClient) {

src/utils/Client.ts

@@ -2,7 +2,7 @@ import { Client, Collection, GatewayIntentBits, Partials } from "discord.js"
 import { IAutocomplete, IButton, ICommand, IContextMenu, IModal } from "~/interfaces"
 import autoDeployCommands from "./Autodeploy.js"
 import env from "./Env.js"
-import { color } from "./functions/colors.js"
+import { color } from "./Functions/colors.js"
 
 export class ExtendedClient extends Client {
     commands: Collection<string, ICommand> = new Collection()

src/utils/Events/autocomplete.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { embedColor } from "~/config/options.js"
 import { IAutocomplete } from "~/interfaces"
 import { ExtendedClient as Client } from "~/utils/Client.js"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 type FileType = "js" | "ts"
 const __dirname = import.meta.dirname
 

src/utils/Events/button.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { embedColor } from "~/config/options.js"
 import { IButton } from "~/interfaces"
 import { ExtendedClient as Client } from "~/utils/Client.js"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 type FileType = "js" | "ts"
 const __dirname = import.meta.dirname
 

src/utils/Events/command.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { embedColor } from "~/config/options.js"
 import { ICommand } from "~/interfaces"
 import { ExtendedClient as Client } from "~/utils/Client.js"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 type FileType = "js" | "ts"
 const __dirname = import.meta.dirname
 

src/utils/Events/contextmenu.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { embedColor } from "~/config/options.js"
 import { IContextMenu } from "~/interfaces"
 import { ExtendedClient as Client } from "~/utils/Client.js"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 type FileType = "js" | "ts"
 const __dirname = import.meta.dirname
 

src/utils/Events/modal.ts

@@ -4,7 +4,7 @@ import path from "path"
 import { embedColor } from "~/config/options.js"
 import { IModal } from "~/interfaces"
 import { ExtendedClient as Client } from "~/utils/Client.js"
-import logToChannel from "~/utils/functions/logtochannel.js"
+import logToChannel from "~/utils/Functions/logtochannel.js"
 type FileType = "js" | "ts"
 const __dirname = import.meta.dirname
 

src/utils/Functions/intlFormaters.ts

@@ -0,0 +1,3 @@
+const numberFormatter = new Intl.NumberFormat("en-US")
+
+export { numberFormatter }

src/utils/Illegitimate.ts

@@ -3,7 +3,7 @@ import { YoutubeiExtractor } from "discord-player-youtubei"
 import { Redis } from "ioredis"
 import { ExtendedClient as Client } from "~/utils/Client.js"
 import env from "~/utils/Env.js"
-import { color } from "~/utils/functions/colors.js"
+import { color } from "~/utils/Functions/colors.js"
 import { MissingEnvVarsError } from "./Classes.js"
 import loadAllEvents from "./Events/loadevents.js"