fix: leaderboard points

Would-You-Bot · Sep 22, 2024 · 3c92230 · 3c92230
1 parent 72bf20f
commit 3c92230
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 36 deletions.
diff --git a/src/buttons/pagination/paginateLast.ts b/src/buttons/pagination/paginateLast.ts
@@ -126,18 +126,22 @@ const button: Button = {
         );
       } else {
         data = await Promise.all(
-          guildDb.gameScores.sort((a: any, b: any) => b.higherlower - a.higherlower).slice((paginate.pages.length - 1) * 10).map(async (u: any) => {
-            const user = await client.database.getUser(u.userID, true);
-            return user?.votePrivacy
-              ? {
-                  user: "Anonymous",
-                  score: u.higherlower,
-                }
-              : {
-                  user: u.userID,
-                  score: u.higherlower,
-                };
-          }),
+          guildDb.gameScores
+            .filter((u: any) => u.higherlower >= 1)
+            .sort((a: any, b: any) => b.higherlower - a.higherlower)
+            .slice((paginate.pages.length - 1) * 10)
+            .map(async (u: any) => {
+              const user = await client.database.getUser(u.userID, true);
+              return user?.votePrivacy
+                ? {
+                    user: "Anonymous",
+                    score: u.higherlower,
+                  }
+                : {
+                    user: u.userID,
+                    score: u.higherlower,
+                  };
+            }),
         );
       }
 

diff --git a/src/buttons/pagination/paginateNext.ts b/src/buttons/pagination/paginateNext.ts
@@ -124,18 +124,23 @@ const button: Button = {
         );
       } else {
         data = await Promise.all(
-          guildDb.gameScores.sort((a: any, b: any) => b.higherlower - a.higherlower).slice(paginate.page * 10).map(async (u: any) => { // , paginate.page * 10 + 10
-            const user = await client.database.getUser(u.userID, true);
-            return user?.votePrivacy
-              ? {
-                  user: "Anonymous",
-                  score: u.higherlower,
-                }
-              : {
-                  user: u.userID,
-                  score: u.higherlower,
-                };
-          }),
+          guildDb.gameScores
+            .filter((u: any) => u.higherlower >= 1)
+            .sort((a: any, b: any) => b.higherlower - a.higherlower)
+            .slice(paginate.page * 10)
+            .map(async (u: any) => {
+              // , paginate.page * 10 + 10
+              const user = await client.database.getUser(u.userID, true);
+              return user?.votePrivacy
+                ? {
+                    user: "Anonymous",
+                    score: u.higherlower,
+                  }
+                : {
+                    user: u.userID,
+                    score: u.higherlower,
+                  };
+            }),
         );
       }
 

diff --git a/src/buttons/pagination/paginatePrev.ts b/src/buttons/pagination/paginatePrev.ts
@@ -125,18 +125,21 @@ const button: Button = {
         );
       } else {
         data = await Promise.all(
-          guildDb.gameScores.map(async (u: any) => {
-            const user = await client.database.getUser(u.userID, true);
-            return user?.votePrivacy
-              ? {
-                  user: "Anonymous",
-                  score: u.higherlower,
-                }
-              : {
-                  user: u.userID,
-                  score: u.higherlower,
-                };
-          }),
+          guildDb.gameScores
+            .filter((u: any) => u.higherlower >= 1)
+            .sort((a: any, b: any) => b.higherlower - a.higherlower)
+            .map(async (u: any) => {
+              const user = await client.database.getUser(u.userID, true);
+              return user?.votePrivacy
+                ? {
+                    user: "Anonymous",
+                    score: u.higherlower,
+                  }
+                : {
+                    user: u.userID,
+                    score: u.higherlower,
+                  };
+            }),
         );
       }
 

diff --git a/src/commands/game/leaderboard.ts b/src/commands/game/leaderboard.ts
@@ -146,6 +146,7 @@ const command: ChatInputCommand = {
             }
             data = await Promise.all(
               guildDb.gameScores
+                .filter((u: any) => u.higherlower >= 1)
                 .sort((a: any, b: any) => b.higherlower - a.higherlower)
                 .map(async (u: any) => {
                   const user = await client.database.getUser(u.userID, true);