leaderboard fixes

TheMonDon · Jul 22, 2024 · 5508cb3 · 5508cb3
1 parent 54d5b33
commit 5508cb3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/commands/Economy/clean-leaderboard.js b/commands/Economy/clean-leaderboard.js
@@ -45,7 +45,7 @@ class CleanLeaderboard extends Command {
 
     if (verified) {
       toRemove.forEach(async (i) => {
-        await db.delete(`servers.${msg.guild.id}.users.${i}.economy`);
+        await db.delete(`servers.${msg.guild.id}.users.${i}`);
       });
       return msg.channel.send(`${toRemove.length} users have been removed from the leaderboard.`);
     } else {

diff --git a/commands/Economy/leaderboard.js b/commands/Economy/leaderboard.js
@@ -28,7 +28,7 @@ class Leaderboard extends Command {
 
     for (const userId in usersData) {
       try {
-        const user = await this.client.users.cache.get(userId);
+        const user = await this.client.users.fetch(userId);
         if (user) {
           const cash = BigInt(usersData[userId]?.economy?.cash || 0);
           const bank = BigInt(usersData[userId]?.economy?.bank || 0);
@@ -43,15 +43,18 @@ class Leaderboard extends Command {
     const sortedLeaderboard = leaderboard
       .sort((a, b) => (b.money > a.money ? 1 : -1))
       .map((c, index) => {
-        let moneyStr = `${c.money.toLocaleString()}`;
+        const bigMoney = BigInt(c.money);
+        const neg = bigMoney < 0n;
+        const money = neg ? -bigMoney : bigMoney;
+        let moneyStr = `${money.toLocaleString()}`;
         if (moneyStr.length > 150) {
           moneyStr = moneyStr.slice(0, 147) + '...';
         }
         return {
           rank: index + 1,
           user: c.user,
           userId: c.userId,
-          display: `**${index + 1}.** ${c.user}: ${c.money < 0n ? '-' : ''}${currencySymbol}${moneyStr}`,
+          display: `**${index + 1}.** ${c.user}: ${bigMoney < 0n ? '-' : ''}${currencySymbol}${moneyStr}`,
         };
       });
 

diff --git a/slash_commands/Economy/leaderboard.js b/slash_commands/Economy/leaderboard.js
@@ -36,8 +36,8 @@ exports.run = async (interaction) => {
     try {
       const user = await interaction.client.users.fetch(userId);
       if (user) {
-        const cash = BigInt(parseInt(usersData[userId].economy.cash || 0, 10));
-        const bank = BigInt(parseInt(usersData[userId].economy.bank || 0, 10));
+        const cash = BigInt(usersData[userId].economy.cash || 0);
+        const bank = BigInt(usersData[userId].economy.bank || 0);
         const money = cash + bank;
         leaderboard.push({ user: user.tag, userId: user.id, money });
       }
@@ -50,15 +50,18 @@ exports.run = async (interaction) => {
   const sortedLeaderboard = leaderboard
     .sort((a, b) => (b.money > a.money ? 1 : -1))
     .map((c, index) => {
-      let moneyStr = `${Math.abs(Number(c.money)).toLocaleString()}`;
+      const bigMoney = BigInt(c.money);
+      const neg = bigMoney < 0n;
+      const money = neg ? -bigMoney : bigMoney;
+      let moneyStr = `${money.toLocaleString()}`;
       if (moneyStr.length > 150) {
         moneyStr = moneyStr.slice(0, 147) + '...';
       }
       return {
         rank: index + 1,
         user: c.user,
         userId: c.userId,
-        display: `**${index + 1}.** ${c.user}: ${c.money < 0n ? '-' : ''}${currencySymbol}${moneyStr}`,
+        display: `**${index + 1}.** ${c.user}: ${bigMoney < 0n ? '-' : ''}${currencySymbol}${moneyStr}`,
       };
     });