Fix negative amounts on leaderboard

TheMonDon · Jul 17, 2024 · c8c031d · c8c031d
1 parent fabc70a
commit c8c031d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/commands/Economy/leaderboard.js b/commands/Economy/leaderboard.js
@@ -42,16 +42,18 @@ class Leaderboard extends Command {
 
     const sortedLeaderboard = leaderboard
       .sort((a, b) => (b.money > a.money ? 1 : -1))
-      .map((c, index) => ({
-        rank: index + 1,
-        user: c.user,
-        userId: c.userId,
-        display: `**${index + 1}.** ${c.user}: ${c.money < 0n ? '-' : ''}${currencySymbol}${
-          c.money.toLocaleString().length > 156
-            ? `${c.money.toLocaleString().slice(0, 153) + '...'}`
-            : `${c.money.toLocaleString()}`
-        }`,
-      }));
+      .map((c, index) => {
+        let moneyStr = `${Math.abs(Number(c.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}`,
+        };
+      });
 
     function getOrdinalSuffix(n) {
       const s = ['th', 'st', 'nd', 'rd'];

diff --git a/slash_commands/Economy/leaderboard.js b/slash_commands/Economy/leaderboard.js
@@ -50,17 +50,15 @@ exports.run = async (interaction) => {
   const sortedLeaderboard = leaderboard
     .sort((a, b) => (b.money > a.money ? 1 : -1))
     .map((c, index) => {
-      const neg = c.money < 0n;
-      const money = neg ? c.money * -1n : c.money;
+      let moneyStr = `${Math.abs(Number(c.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}: ${neg ? '-' : ''}${currencySymbol}${
-          money.toLocaleString().length > 156
-            ? `${money.toLocaleString().slice(0, 153) + '...'}`
-            : `${money.toLocaleString()}`
-        }`,
+        display: `**${index + 1}.** ${c.user}: ${c.money < 0n ? '-' : ''}${currencySymbol}${moneyStr}`,
       };
     });