From 0c3df27e9f6288b4ea9c22a8b9d2065660108ad7 Mon Sep 17 00:00:00 2001
From: Braeden Sowinski <sowinskibraeden@gmail.com>
Date: Fri, 28 Apr 2023 09:15:51 -0700
Subject: [PATCH] debug money leaderboard

---
 commands/leaderboard.js    | 16 +++++++++-------
 events/ready.js            |  2 +-
 package.json               |  2 +-
 structures/DayzArmbands.js |  7 ++++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/commands/leaderboard.js b/commands/leaderboard.js
index daa967c..e17558c 100644
--- a/commands/leaderboard.js
+++ b/commands/leaderboard.js
@@ -49,12 +49,12 @@ module.exports = {
       let leaderboard;
       if (category == 'money') {
 
-        let users = client.dbo.collection("users").find({}).toArray();
+        let users = await client.dbo.collection("users").find({}).toArray();
 
-        users.map(u => u.user.guilds[GuildDB.serverID].bankAccount.total = a.user.guilds[GuildDB.serverID].bankAccount.balance + a.user.guilds[GuildDB.serverID].bankAccount.cash);
+        users.map(u => u.user.guilds[GuildDB.serverID].bankAccount.total = u.user.guilds[GuildDB.serverID].bankAccount.balance + u.user.guilds[GuildDB.serverID].bankAccount.cash);
 
         leaderboard = users.sort(function(a, b) {
-          return b.user.guilds[GuildDB.serverID].bankAccount.total - a.users.guild[GuildDB.serverID].bankAccount.total;
+          return b.user.guilds[GuildDB.serverID].bankAccount.total - a.user.guilds[GuildDB.serverID].bankAccount.total;
         });
 
       } else {
@@ -88,6 +88,7 @@ module.exports = {
 
       leaderboardEmbed.setTitle(`**${title} - DayZ Reforger**`);
 
+      let des = ``;
       for (let i = 0; i < limit; i++) {
         let stats = category == 'kills' ? `${leaderboard[i].kills} Kill${leaderboard[i].kills>1||leaderboard[i].kills==0?'s':''}` :
                     category == 'killstreak' ? `${leaderboard[i].killStreak} Player Killstreak` :
@@ -96,13 +97,14 @@ module.exports = {
                     category == 'deathstreak' ? `${leaderboard[i].deathStreak} Deathstreak` :
                     category == 'worst_deathstreak' ? `${leaderboard[i].worstDeathStreak} Deathstreak` :
                     category == 'longest_kill' ? `${leaderboard[i].longestKill}m` : 
-                    category == 'money' ? `${leaderboard[i].user.guilds[GuildDB.serverID].bankAccount.total}` : 'N/A Error';
-        
-        let tag = category == 'money' ? `<@${leaderboard[i].user.userID}>` : leaderboard[i].gamertag;
+                    category == 'money' ? `$${(leaderboard[i].user.guilds[GuildDB.serverID].bankAccount.total).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2})}` : 'N/A Error';
 
-        leaderboardEmbed.addFields({ name: `**${i+1}. ${tag}**`, value: `**${stats}**`, inline: category == 'money' ? false : true });
+        if (category == 'money') des += `**${i+1}.** <@${leaderboard[i].user.userID}> - **${stats}**\n`
+        else leaderboardEmbed.addFields({ name: `**${i+1}. ${leaderboard[i].gamertag}**`, value: `**${stats}**`, inline: true });
       }
 
+      if (category == 'money') leaderboardEmbed.setDescription(des);
+      
       return interaction.send({ embeds: [leaderboardEmbed] });
     },
   },
diff --git a/events/ready.js b/events/ready.js
index 2615d67..95c4430 100644
--- a/events/ready.js
+++ b/events/ready.js
@@ -7,5 +7,5 @@ module.exports = async (client) => {
   client.log(`Successfully Logged in as ${client.user.tag}`);
   client.log(`Ready to serve in ${client.channels.cache.size} channels on ${client.guilds.cache.size} servers, for a total of ${client.users.cache.size} users.`)
   client.RegisterSlashCommands();
-  setInterval(client.logsUpdateTimer, client.timer, client);
+  // setInterval(client.logsUpdateTimer, client.timer, client);
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index 9202435..dc3f558 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dayz-armbands",
-  "version": "6.6.0",
+  "version": "6.6.4",
   "description": "A General Purpose Discord Bot for DayZ Servers.",
   "main": "index.js",
   "nodemonConfig": {
diff --git a/structures/DayzArmbands.js b/structures/DayzArmbands.js
index 9add2ce..010e1e6 100644
--- a/structures/DayzArmbands.js
+++ b/structures/DayzArmbands.js
@@ -100,6 +100,10 @@ class DayzArmbands extends Client {
     const client = this;
   }
 
+
+  log(Text) { this.logger.log(Text); }
+  error(Text) { this.logger.error(Text); }
+
   async getDateEST(time) {
     let t = new Date(); // Get current date (PST)
     let e = new Date(t.getTime() + 180*60*1000); // Convert to EST to ensure the date is correct for the applied EST time
@@ -419,9 +423,6 @@ class DayzArmbands extends Client {
     };
   }
 
-  log(Text) { this.logger.log(Text); }
-  error(Text) { this.logger.error(Text); }
-
   build() {
     this.login(this.config.Token);
   }