Moved formatters to seperate file

This commit is contained in:
2024-10-16 19:51:05 +02:00
parent e0f4f2c0c8
commit 9f223f4b91
5 changed files with 19 additions and 12 deletions

View File

@@ -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: [{

View File

@@ -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)

View File

@@ -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