diff --git a/src/commands/guild.js b/src/commands/guild.js index 80499ee..d1b2ba6 100644 --- a/src/commands/guild.js +++ b/src/commands/guild.js @@ -7,7 +7,7 @@ module.exports = { name: "guild", description: "Subcommands for guilds", type: "slash", - dev: true, + dev: false, public: true, data: new SlashCommandBuilder() diff --git a/src/commands/guild/info.js b/src/commands/guild/info.js index d878790..799146a 100644 --- a/src/commands/guild/info.js +++ b/src/commands/guild/info.js @@ -106,7 +106,8 @@ async function guildInfo(interaction) { const guildCreatedMS = guild.created const guildCreated = new Date(guildCreatedMS) const guildTag = guild.tag - const guildExp = guild.exp + const guildExpUnformatted = guild.exp + const guildExp = new Intl.NumberFormat().format(guildExpUnformatted) const guildLvl = guildLevel(guildExp) const guildMembers = guild.members @@ -129,7 +130,10 @@ async function guildInfo(interaction) { const guildRanks = guild.ranks.map((r) => "**➺ " + r.name + "** `[" + r.tag + "]`").join("\n") const guildMembersDailyXP = Object.values(guildMembers).map((m) => m.expHistory[Object.keys(m.expHistory)[0]]) - const totalGuildMembersDailyXP = guildMembersDailyXP.reduce((a, b) => a + b, 0) + const totalGuildMembersDailyXPUnformatted = guildMembersDailyXP.reduce((a, b) => a + b, 0) + const totalGuildMembersDailyXP = new Intl.NumberFormat().format(totalGuildMembersDailyXPUnformatted) + const averageGuildMembersDailyXPUnformatted = Math.round(totalGuildMembersDailyXPUnformatted / 7) + const averageGuildMembersDailyXP = new Intl.NumberFormat().format(averageGuildMembersDailyXPUnformatted) const footerText = interaction.guild ? interaction.guild.name : interaction.user.username const footerIcon = interaction.guild ? interaction.guild.iconURL({ dynamic: true }) : interaction.user.avatarURL({ dynamic: true }) @@ -149,7 +153,7 @@ async function guildInfo(interaction) { { name: "**GEXP**", value: "**➺ Total weekly GEXP:** `" + totalGuildMembersDailyXP + "`\n" + - "**➺ Daily avarage:** `" + Math.round(totalGuildMembersDailyXP / 7) + "`\n" + + "**➺ Daily avarage:** `" + averageGuildMembersDailyXP + "`\n" + "**➺ Total GEXP:** `" + guildExp + "`" }, { diff --git a/src/commands/guild/member.js b/src/commands/guild/member.js index 2636aa2..fb5b15f 100644 --- a/src/commands/guild/member.js +++ b/src/commands/guild/member.js @@ -105,11 +105,13 @@ async function guildMember(interaction) { const guildRank = guildMember.rank const memberGexp = guildMember.expHistory const allDaysGexp = Object.keys(memberGexp).map((key) => { - return "**➺ " + key + ":** " + "`" + memberGexp[key] + "`" + "\n" + return "**➺ " + key + ":** " + "`" + new Intl.NumberFormat().format(memberGexp[key]) + "`" + "\n" }) const expValue = allDaysGexp.join("") - const totalWeeklyGexp = Object.values(memberGexp).reduce((a, b) => a + b, 0) - const averageWeeklyGexp = Math.round(totalWeeklyGexp / 7) + const totalWeeklyGexpUnformatted = Object.values(memberGexp).reduce((a, b) => a + b, 0) + const totalWeeklyGexp = new Intl.NumberFormat().format(totalWeeklyGexpUnformatted) + const averageWeeklyGexpUnformatted = Math.round(totalWeeklyGexpUnformatted / 7) + const averageWeeklyGexp = new Intl.NumberFormat().format(averageWeeklyGexpUnformatted) const guildMemberJoinMS = guildMember.joined const guildMemberJoinTime = new Date(guildMemberJoinMS)