Merge branch 'dev' into 'main'
Updated formatting for large numbers and small bug fix See merge request illegitimate/illegitimate-bot!122
This commit is contained in:
@@ -107,8 +107,8 @@ async function guildInfo(interaction) {
|
|||||||
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 = new Intl.NumberFormat().format(guildExpUnformatted)
|
const guildExp = new Intl.NumberFormat("en-US").format(guildExpUnformatted)
|
||||||
const guildLvl = guildLevel(guildExp)
|
const guildLvl = guildLevel(guildExpUnformatted)
|
||||||
const guildMembers = guild.members
|
const guildMembers = guild.members
|
||||||
|
|
||||||
const guildCreatedDate = guildCreated.getDate()
|
const guildCreatedDate = guildCreated.getDate()
|
||||||
@@ -131,9 +131,9 @@ async function guildInfo(interaction) {
|
|||||||
|
|
||||||
const guildMembersDailyXP = Object.values(guildMembers).map((m) => m.expHistory[Object.keys(m.expHistory)[0]])
|
const guildMembersDailyXP = Object.values(guildMembers).map((m) => m.expHistory[Object.keys(m.expHistory)[0]])
|
||||||
const totalGuildMembersDailyXPUnformatted = guildMembersDailyXP.reduce((a, b) => a + b, 0)
|
const totalGuildMembersDailyXPUnformatted = guildMembersDailyXP.reduce((a, b) => a + b, 0)
|
||||||
const totalGuildMembersDailyXP = new Intl.NumberFormat().format(totalGuildMembersDailyXPUnformatted)
|
const totalGuildMembersDailyXP = new Intl.NumberFormat("en-US").format(totalGuildMembersDailyXPUnformatted)
|
||||||
const averageGuildMembersDailyXPUnformatted = Math.round(totalGuildMembersDailyXPUnformatted / 7)
|
const averageGuildMembersDailyXPUnformatted = Math.round(totalGuildMembersDailyXPUnformatted / 7)
|
||||||
const averageGuildMembersDailyXP = new Intl.NumberFormat().format(averageGuildMembersDailyXPUnformatted)
|
const averageGuildMembersDailyXP = new Intl.NumberFormat("en-US").format(averageGuildMembersDailyXPUnformatted)
|
||||||
|
|
||||||
const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
|
const footerText = interaction.guild ? interaction.guild.name : interaction.user.username
|
||||||
const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
|
const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true })
|
||||||
|
|||||||
@@ -105,13 +105,13 @@ async function guildMember(interaction) {
|
|||||||
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 + ":** " + "`" + new Intl.NumberFormat().format(memberGexp[key]) + "`" + "\n"
|
return "**➺ " + key + ":** " + "`" + new Intl.NumberFormat("en-US").format(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 = new Intl.NumberFormat().format(totalWeeklyGexpUnformatted)
|
const totalWeeklyGexp = new Intl.NumberFormat("en-US").format(totalWeeklyGexpUnformatted)
|
||||||
const averageWeeklyGexpUnformatted = Math.round(totalWeeklyGexpUnformatted / 7)
|
const averageWeeklyGexpUnformatted = Math.round(totalWeeklyGexpUnformatted / 7)
|
||||||
const averageWeeklyGexp = new Intl.NumberFormat().format(averageWeeklyGexpUnformatted)
|
const averageWeeklyGexp = new Intl.NumberFormat("en-US").format(averageWeeklyGexpUnformatted)
|
||||||
|
|
||||||
const guildMemberJoinMS = guildMember.joined
|
const guildMemberJoinMS = guildMember.joined
|
||||||
const guildMemberJoinTime = new Date(guildMemberJoinMS)
|
const guildMemberJoinTime = new Date(guildMemberJoinMS)
|
||||||
|
|||||||
Reference in New Issue
Block a user