From a9b1d5ba67d5ec04afe923ad6b1e6801b242fa4f Mon Sep 17 00:00:00 2001 From: Taken Date: Thu, 14 Nov 2024 17:24:12 +0100 Subject: [PATCH] Updated intl formatters --- src/commands/guild/info.ts | 8 ++--- src/commands/guild/member.ts | 8 ++--- src/commands/guild/top.ts | 6 ++-- src/events/cron/weeklyGexp.ts | 6 ++-- .../server/guildMemberAdd/logNewJoins.ts | 2 +- src/utils/Functions/intlFormaters.ts | 32 +++++++++++++------ 6 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index 93eb38e..f2f7c90 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -108,10 +108,10 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction const guildCreated = new Date(guildCreatedMS) const guildTag = guild!.tag const guildExpUnformatted = guild!.exp - const guildExp = numberFormatter.format(guildExpUnformatted) + const guildExp = numberFormatter(guildExpUnformatted) const guildLvl = guildLevel(guildExpUnformatted) const guildMembers = guild!.members - const guildCreatedTime = dateTimeFormatter.format(guildCreated) + const guildCreatedTime = dateTimeFormatter(guildCreated) const guildOwner = guildMembers.find(m => m.rank === "Guild Master")!.uuid const guildOwnerName = await getIGN(guildOwner) @@ -124,10 +124,10 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction }) const totalGuildMembersWeeklyXPUnformatted = guildMembersWeeklyXP.reduce((a, b) => a + b, 0) - const totalGuildMembersWeeklyXP = numberFormatter.format(totalGuildMembersWeeklyXPUnformatted) + const totalGuildMembersWeeklyXP = numberFormatter(totalGuildMembersWeeklyXPUnformatted) const averageGuildMembersWeeklyXPUnformatted = Math.round(totalGuildMembersWeeklyXPUnformatted / 7) - const averageGuildMembersWeeklyXP = numberFormatter.format(averageGuildMembersWeeklyXPUnformatted) + const averageGuildMembersWeeklyXP = numberFormatter(averageGuildMembersWeeklyXPUnformatted) await interaction.editReply({ embeds: [{ diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index 869d5ea..01c8ce5 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -102,17 +102,17 @@ export default async function guildMember(interaction: ChatInputCommandInteracti const guildRank = guildMember!.rank const memberGexp = guildMember!.expHistory const allDaysGexp = Object.keys(memberGexp).map(key => { - return ("**➺ " + key + ":** " + "`" + numberFormatter.format(memberGexp[key]) + "`" + "\n") + return ("**➺ " + key + ":** " + "`" + numberFormatter(memberGexp[key]) + "`" + "\n") }) const expValue = allDaysGexp.join("") const totalWeeklyGexpUnformatted = Object.values(memberGexp).reduce((a, b) => a + b, 0) - const totalWeeklyGexp = numberFormatter.format(totalWeeklyGexpUnformatted) + const totalWeeklyGexp = numberFormatter(totalWeeklyGexpUnformatted) const averageWeeklyGexpUnformatted = Math.round(totalWeeklyGexpUnformatted / 7) - const averageWeeklyGexp = numberFormatter.format(averageWeeklyGexpUnformatted) + const averageWeeklyGexp = numberFormatter(averageWeeklyGexpUnformatted) const guildMemberJoinMS = guildMember!.joined const guildMemberJoinTime = new Date(guildMemberJoinMS) - const guildMemberJoin = dateTimeFormatter.format(guildMemberJoinTime) + const guildMemberJoin = dateTimeFormatter(guildMemberJoinTime) await interaction.editReply({ embeds: [{ diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 1f75e73..7ae59d6 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -114,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 = numberFormatter.format(gexpTodayUnformatted) + const gexpToday = numberFormatter(gexpTodayUnformatted) const averageGuildMemberGEXPUnformatted = Math.floor(gexpTodayUnformatted / guildMembers.length) - const averageGuildMemberGEXP = numberFormatter.format(averageGuildMemberGEXPUnformatted) + const averageGuildMemberGEXP = numberFormatter(averageGuildMemberGEXPUnformatted) const allMembersDailyGEXP = guildMembers.map(member => { return { @@ -178,7 +178,7 @@ export default async function guildTop(interaction: ChatInputCommandInteraction) const sliceSize = amount / 4 for (let i = 0; i < amount; i++) { - const gexp = numberFormatter.format(topMembers[i].gexp) + const gexp = numberFormatter(topMembers[i].gexp) const ign = guildData.find(member => member.uuid === topMembers[i].uuid)?.ign const position = i + 1 diff --git a/src/events/cron/weeklyGexp.ts b/src/events/cron/weeklyGexp.ts index 08c113b..96dab76 100644 --- a/src/events/cron/weeklyGexp.ts +++ b/src/events/cron/weeklyGexp.ts @@ -40,7 +40,7 @@ async function guildWeekly() { for (let i = 0; i < allMembersGexpSorted.length; i++) { const ign = await getIGN(allMembersGexpSorted[i].uuid) - const gexp = numberFormatter.format(allMembersGexpSorted[i].exp) + const gexp = numberFormatter(allMembersGexpSorted[i].exp) const position = i + 1 guildMembersList.push("**#" + position + " " + ign + ":** `" + gexp + "`") } @@ -66,8 +66,8 @@ async function guildWeekly() { const averageGuildMembersDailyXPUnformatted = totalGuildMembersWeeklyXPUnformatted / 7 // final values - const totalGuildMembersWeeklyXP = numberFormatter.format(totalGuildMembersWeeklyXPUnformatted) - const averageGuildMembersWeeklyXP = numberFormatter.format(averageGuildMembersDailyXPUnformatted) + const totalGuildMembersWeeklyXP = numberFormatter(totalGuildMembersWeeklyXPUnformatted) + const averageGuildMembersWeeklyXP = numberFormatter(averageGuildMembersDailyXPUnformatted) await message.edit({ embeds: [{ diff --git a/src/events/server/guildMemberAdd/logNewJoins.ts b/src/events/server/guildMemberAdd/logNewJoins.ts index b3854f6..01f5a27 100644 --- a/src/events/server/guildMemberAdd/logNewJoins.ts +++ b/src/events/server/guildMemberAdd/logNewJoins.ts @@ -12,7 +12,7 @@ export default { embeds: [{ title: "New Member", description: userMention(member.id) + " has joined the server.\n" + - "Account created: " + dateTimeFormatter.format(member.user.createdAt), + "Account created: " + dateTimeFormatter(member.user.createdAt), color: embedColor, thumbnail: { url: member.user.avatarURL() || "" diff --git a/src/utils/Functions/intlFormaters.ts b/src/utils/Functions/intlFormaters.ts index 7d42823..77acf5c 100644 --- a/src/utils/Functions/intlFormaters.ts +++ b/src/utils/Functions/intlFormaters.ts @@ -1,12 +1,24 @@ -const numberFormatter = new Intl.NumberFormat("en-US") +export function numberFormatter(d: number): string { + return new Intl.NumberFormat("en-US").format(d) +} -const dateTimeFormatter = new Intl.DateTimeFormat("hr-HR", { - year: "numeric", - month: "numeric", - day: "numeric", - hour: "numeric", - minute: "numeric", - second: "numeric" -}) +export function dateTimeFormatter(d: Date): string { + return new Intl.DateTimeFormat("hr-HR", { + year: "numeric", + month: "numeric", + day: "numeric", + hour: "numeric", + minute: "numeric", + second: "numeric" + }).format(d) +} -export { dateTimeFormatter, numberFormatter } +export function logTimeFormatter(d: Date): string { + return new Intl.DateTimeFormat("hr-HR", { + year: "numeric", + month: "numeric", + day: "numeric", + hour: "numeric", + minute: "numeric" + }).format(d) +}