Updated intl formatters
This commit is contained in:
@@ -108,10 +108,10 @@ export default async function guildInfo(interaction: ChatInputCommandInteraction
|
|||||||
const guildCreated = new Date(guildCreatedMS)
|
const guildCreated = new Date(guildCreatedMS)
|
||||||
const guildTag = guild!.tag
|
const guildTag = guild!.tag
|
||||||
const guildExpUnformatted = guild!.exp
|
const guildExpUnformatted = guild!.exp
|
||||||
const guildExp = numberFormatter.format(guildExpUnformatted)
|
const guildExp = numberFormatter(guildExpUnformatted)
|
||||||
const guildLvl = guildLevel(guildExpUnformatted)
|
const guildLvl = guildLevel(guildExpUnformatted)
|
||||||
const guildMembers = guild!.members
|
const guildMembers = guild!.members
|
||||||
const guildCreatedTime = dateTimeFormatter.format(guildCreated)
|
const guildCreatedTime = dateTimeFormatter(guildCreated)
|
||||||
|
|
||||||
const guildOwner = guildMembers.find(m => m.rank === "Guild Master")!.uuid
|
const guildOwner = guildMembers.find(m => m.rank === "Guild Master")!.uuid
|
||||||
const guildOwnerName = await getIGN(guildOwner)
|
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 totalGuildMembersWeeklyXPUnformatted = guildMembersWeeklyXP.reduce((a, b) => a + b, 0)
|
||||||
const totalGuildMembersWeeklyXP = numberFormatter.format(totalGuildMembersWeeklyXPUnformatted)
|
const totalGuildMembersWeeklyXP = numberFormatter(totalGuildMembersWeeklyXPUnformatted)
|
||||||
|
|
||||||
const averageGuildMembersWeeklyXPUnformatted = Math.round(totalGuildMembersWeeklyXPUnformatted / 7)
|
const averageGuildMembersWeeklyXPUnformatted = Math.round(totalGuildMembersWeeklyXPUnformatted / 7)
|
||||||
const averageGuildMembersWeeklyXP = numberFormatter.format(averageGuildMembersWeeklyXPUnformatted)
|
const averageGuildMembersWeeklyXP = numberFormatter(averageGuildMembersWeeklyXPUnformatted)
|
||||||
|
|
||||||
await interaction.editReply({
|
await interaction.editReply({
|
||||||
embeds: [{
|
embeds: [{
|
||||||
|
|||||||
@@ -102,17 +102,17 @@ export default async function guildMember(interaction: ChatInputCommandInteracti
|
|||||||
const guildRank = guildMember!.rank
|
const guildRank = guildMember!.rank
|
||||||
const memberGexp = guildMember!.expHistory
|
const memberGexp = guildMember!.expHistory
|
||||||
const allDaysGexp = Object.keys(memberGexp).map(key => {
|
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 expValue = allDaysGexp.join("")
|
||||||
const totalWeeklyGexpUnformatted = Object.values(memberGexp).reduce((a, b) => a + b, 0)
|
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 averageWeeklyGexpUnformatted = Math.round(totalWeeklyGexpUnformatted / 7)
|
||||||
const averageWeeklyGexp = numberFormatter.format(averageWeeklyGexpUnformatted)
|
const averageWeeklyGexp = numberFormatter(averageWeeklyGexpUnformatted)
|
||||||
|
|
||||||
const guildMemberJoinMS = guildMember!.joined
|
const guildMemberJoinMS = guildMember!.joined
|
||||||
const guildMemberJoinTime = new Date(guildMemberJoinMS)
|
const guildMemberJoinTime = new Date(guildMemberJoinMS)
|
||||||
const guildMemberJoin = dateTimeFormatter.format(guildMemberJoinTime)
|
const guildMemberJoin = dateTimeFormatter(guildMemberJoinTime)
|
||||||
|
|
||||||
await interaction.editReply({
|
await interaction.editReply({
|
||||||
embeds: [{
|
embeds: [{
|
||||||
|
|||||||
@@ -114,10 +114,10 @@ export default async function guildTop(interaction: ChatInputCommandInteraction)
|
|||||||
const gexpTodayUnformatted = guildMembers.map(member => {
|
const gexpTodayUnformatted = guildMembers.map(member => {
|
||||||
return member.expHistory[Object.keys(member.expHistory)[0]]
|
return member.expHistory[Object.keys(member.expHistory)[0]]
|
||||||
}).reduce((a, b) => a + b, 0)
|
}).reduce((a, b) => a + b, 0)
|
||||||
const gexpToday = numberFormatter.format(gexpTodayUnformatted)
|
const gexpToday = numberFormatter(gexpTodayUnformatted)
|
||||||
|
|
||||||
const averageGuildMemberGEXPUnformatted = Math.floor(gexpTodayUnformatted / guildMembers.length)
|
const averageGuildMemberGEXPUnformatted = Math.floor(gexpTodayUnformatted / guildMembers.length)
|
||||||
const averageGuildMemberGEXP = numberFormatter.format(averageGuildMemberGEXPUnformatted)
|
const averageGuildMemberGEXP = numberFormatter(averageGuildMemberGEXPUnformatted)
|
||||||
|
|
||||||
const allMembersDailyGEXP = guildMembers.map(member => {
|
const allMembersDailyGEXP = guildMembers.map(member => {
|
||||||
return {
|
return {
|
||||||
@@ -178,7 +178,7 @@ export default async function guildTop(interaction: ChatInputCommandInteraction)
|
|||||||
const sliceSize = amount / 4
|
const sliceSize = amount / 4
|
||||||
|
|
||||||
for (let i = 0; i < amount; i++) {
|
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 ign = guildData.find(member => member.uuid === topMembers[i].uuid)?.ign
|
||||||
|
|
||||||
const position = i + 1
|
const position = i + 1
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ async function guildWeekly() {
|
|||||||
|
|
||||||
for (let i = 0; i < allMembersGexpSorted.length; i++) {
|
for (let i = 0; i < allMembersGexpSorted.length; i++) {
|
||||||
const ign = await getIGN(allMembersGexpSorted[i].uuid)
|
const ign = await getIGN(allMembersGexpSorted[i].uuid)
|
||||||
const gexp = numberFormatter.format(allMembersGexpSorted[i].exp)
|
const gexp = numberFormatter(allMembersGexpSorted[i].exp)
|
||||||
const position = i + 1
|
const position = i + 1
|
||||||
guildMembersList.push("**#" + position + " " + ign + ":** `" + gexp + "`")
|
guildMembersList.push("**#" + position + " " + ign + ":** `" + gexp + "`")
|
||||||
}
|
}
|
||||||
@@ -66,8 +66,8 @@ async function guildWeekly() {
|
|||||||
const averageGuildMembersDailyXPUnformatted = totalGuildMembersWeeklyXPUnformatted / 7
|
const averageGuildMembersDailyXPUnformatted = totalGuildMembersWeeklyXPUnformatted / 7
|
||||||
|
|
||||||
// final values
|
// final values
|
||||||
const totalGuildMembersWeeklyXP = numberFormatter.format(totalGuildMembersWeeklyXPUnformatted)
|
const totalGuildMembersWeeklyXP = numberFormatter(totalGuildMembersWeeklyXPUnformatted)
|
||||||
const averageGuildMembersWeeklyXP = numberFormatter.format(averageGuildMembersDailyXPUnformatted)
|
const averageGuildMembersWeeklyXP = numberFormatter(averageGuildMembersDailyXPUnformatted)
|
||||||
|
|
||||||
await message.edit({
|
await message.edit({
|
||||||
embeds: [{
|
embeds: [{
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export default {
|
|||||||
embeds: [{
|
embeds: [{
|
||||||
title: "New Member",
|
title: "New Member",
|
||||||
description: userMention(member.id) + " has joined the server.\n" +
|
description: userMention(member.id) + " has joined the server.\n" +
|
||||||
"Account created: " + dateTimeFormatter.format(member.user.createdAt),
|
"Account created: " + dateTimeFormatter(member.user.createdAt),
|
||||||
color: embedColor,
|
color: embedColor,
|
||||||
thumbnail: {
|
thumbnail: {
|
||||||
url: member.user.avatarURL() || ""
|
url: member.user.avatarURL() || ""
|
||||||
|
|||||||
@@ -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", {
|
export function dateTimeFormatter(d: Date): string {
|
||||||
|
return new Intl.DateTimeFormat("hr-HR", {
|
||||||
year: "numeric",
|
year: "numeric",
|
||||||
month: "numeric",
|
month: "numeric",
|
||||||
day: "numeric",
|
day: "numeric",
|
||||||
hour: "numeric",
|
hour: "numeric",
|
||||||
minute: "numeric",
|
minute: "numeric",
|
||||||
second: "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)
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user