rank pagination

ppy-sb · Aug 20, 2023 · e226a0e · e226a0e
1 parent 285a45a
commit e226a0e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/pages/leaderboard/[[mode]].vue b/src/pages/leaderboard/[[mode]].vue
@@ -44,6 +44,8 @@ const selected = shallowRef<Required<SwitcherPropType<LeaderboardRankingSystem>>
 })
 const { data: total, refresh: refreshCount } = await app$.$client.rank.countLeaderboard.useQuery(selected)
 
+const totalPages = computed(() => Math.min(Math.ceil(total.value / perPage), 5))
+
 const {
   data: table,
   pending,
@@ -68,9 +70,9 @@ useHead({
 })
 
 function boundaryPage() {
-  const outOfRange = page.value * perPage - perPage > total.value
+  const outOfRange = page.value > totalPages.value
   if (outOfRange) {
-    page.value = Math.floor(total.value / perPage)
+    page.value = totalPages.value
   }
 }
 
@@ -190,7 +192,7 @@ zh-CN:
         </h2>
       </div>
       <div class="join mx-auto outline outline-2">
-        <input v-for="i in 5" :key="`pagination-${i}`" class="join-item btn btn-ghost checked:outline outline-2" type="radio" name="options" :aria-label="i.toString()" @click="reloadPage(i)">
+        <input v-for="i in totalPages" :key="`pagination-${i}`" class="join-item btn btn-ghost checked:outline outline-2" type="radio" :checked="page === i" name="options" :aria-label="i.toString()" @click="reloadPage(i)">
       </div>
     </div>
   </div>

diff --git a/src/server/backend/bancho.py/server/rank.ts b/src/server/backend/bancho.py/server/rank.ts
@@ -70,12 +70,15 @@ export class DatabaseRankProvider implements Base<Id> {
     const start = page * pageSize
     const result = await this.db.stat.findMany({
       where: {
+        pp: rankingSystem === Rank.PPv2 ? { gt: 0 } : undefined,
+        rankedScore: rankingSystem === Rank.RankedScore ? { gt: 0 } : undefined,
+        totalScore: rankingSystem === Rank.TotalScore ? { gt: 0 } : undefined,
+        mode: toBanchoPyMode(mode, ruleset),
         user: {
           priv: {
             gt: 2,
           },
         },
-        mode: toBanchoPyMode(mode, ruleset),
       },
       select: {
         user: true,
@@ -118,12 +121,12 @@ export class DatabaseRankProvider implements Base<Id> {
         pp: rankingSystem === Rank.PPv2 ? { gt: 0 } : undefined,
         rankedScore: rankingSystem === Rank.RankedScore ? { gt: 0 } : undefined,
         totalScore: rankingSystem === Rank.TotalScore ? { gt: 0 } : undefined,
+        mode: toBanchoPyMode(mode, ruleset),
         user: {
           priv: {
             gt: 2,
           },
         },
-        mode: toBanchoPyMode(mode, ruleset),
       },
 
     })