declare showing ranking status

ppy-sb · Jun 3, 2024 · 849f199 · 849f199
1 parent 855d658
commit 849f199
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/src/server/backend/bancho.py/server/user.ts b/src/server/backend/bancho.py/server/user.ts
@@ -50,6 +50,7 @@ import { Mode, Rank, Ruleset } from '~/def'
 import { UserProvider as Base, type MailTokenProvider } from '$base/server'
 import type { ExtractLocationSettings, ExtractSettingType } from '$base/@define-setting'
 import { type RankingSystemScore } from '~/def/score'
+import { RankingStatus } from '~/def/beatmap'
 
 type ServerSetting = ExtractSettingType<ExtractLocationSettings<DynamicSettingStore.Server, typeof settings>>
 
@@ -107,6 +108,9 @@ class DBUserProvider extends Base<Id, ScoreId> implements Base<Id, ScoreId> {
     },
   ]
 
+  protected readonly bestsRankingStatuses = [RankingStatus.Ranked, RankingStatus.Approved]
+  protected readonly topsRankingStatuses = [RankingStatus.Ranked, RankingStatus.Approved, RankingStatus.Qualified]
+
   constructor() {
     super()
 
@@ -232,7 +236,7 @@ class DBUserProvider extends Base<Id, ScoreId> implements Base<Id, ScoreId> {
     rankingSystem,
     page,
     perPage,
-    rankingStatus,
+    rankingStatus = this.bestsRankingStatuses,
   }: Base.BaseQuery<Id, M, ActiveRuleset, RS>): Promise<RankingSystemScore<ScoreId, Id, Mode, RS>[]> {
     const start = page * perPage
     const _mode = toBanchoPyMode(mode, ruleset)
@@ -263,7 +267,7 @@ class DBUserProvider extends Base<Id, ScoreId> implements Base<Id, ScoreId> {
         ? desc(score.pp)
         : (rankingSystem === Rank.RankedScore || rankingSystem === Rank.TotalScore)
             ? desc(score.score)
-            : raiseError('unknown ranking system˝')
+            : raiseError('unknown ranking system')
       )
       .offset(start)
       .limit(perPage)
@@ -280,11 +284,19 @@ class DBUserProvider extends Base<Id, ScoreId> implements Base<Id, ScoreId> {
   }
 
   async getTops<M extends ActiveMode, RS extends LeaderboardRankingSystem>(opt: Base.BaseQuery<Id, M, ActiveRuleset, RS>) {
-    const { id, mode, ruleset, rankingSystem, page, perPage, rankingStatus } = opt
+    const {
+      id,
+      mode,
+      ruleset,
+      rankingSystem,
+      page,
+      perPage,
+      rankingStatus = this.topsRankingStatuses,
+    } = opt
 
     const start = page * perPage
 
-    const banchoPyRankingStatus = rankingStatus.map(i => fromRankingStatus(i))
+    const banchoPyRankingStatus = rankingStatus?.map(i => fromRankingStatus(i))
 
     // derived tables
     const s = aliasedTable(schema.scores, 's')
@@ -459,7 +471,7 @@ class DBUserProvider extends Base<Id, ScoreId> implements Base<Id, ScoreId> {
     returnValue.preferredMode = {
       mode, ruleset,
     }
-    const parallels: PromiseLike<any>[] = []
+    const parallels: Promise<any>[] = []
 
     returnValue.status = UserStatus.Offline
 

diff --git a/src/server/backend/[email protected]/server/user/index.ts b/src/server/backend/[email protected]/server/user/index.ts
@@ -13,6 +13,7 @@ import { Scope, type UserCompact, UserRole, UserStatus } from '~/def/user'
 import { ArticleProvider, UserProvider as BanchoPyUser } from '~/server/backend/bancho.py/server'
 import { fromBanchoPyMode, toFullUser, toUserClan } from '~/server/backend/bancho.py/transforms'
 import type { UserProvider as Base } from '$base/server'
+import { RankingStatus } from '~/def/beatmap'
 
 const logger = Logger.child({ label: 'user' })
 
@@ -34,6 +35,16 @@ export class UserProvider extends BanchoPyUser implements Base<Id, ScoreId> {
     },
   ]
 
+  protected override readonly topsRankingStatuses = [
+    RankingStatus.Approved,
+    RankingStatus.Loved,
+    RankingStatus.Qualified,
+    RankingStatus.Ranked,
+    RankingStatus.WIP,
+    RankingStatus.Graveyard,
+    RankingStatus.Pending,
+  ]
+
   async changeSettings(
     user: { id: Id; roles: UserRole[] },
     input: {