diff --git a/app/models/score.py b/app/models/score.py index 416b68d..7c91fe0 100644 --- a/app/models/score.py +++ b/app/models/score.py @@ -36,7 +36,7 @@ class Rank(str, Enum): class APIMod(BaseModel): acronym: str - settings: dict[str, Any] = {} + # settings: dict[str, Any] = {} # https://github.com/ppy/osu/blob/master/osu.Game/Rulesets/Scoring/HitResult.cs diff --git a/app/router/beatmap.py b/app/router/beatmap.py index f6a44b1..aa8864a 100644 --- a/app/router/beatmap.py +++ b/app/router/beatmap.py @@ -9,6 +9,7 @@ from app.database.score import Score, ScoreResp, APIMod from app.database.beatmapset import Beatmapset from app.dependencies.database import get_db from app.dependencies.user import get_current_user +from typing import List, Optional from .api_router import router @@ -77,8 +78,8 @@ async def batch_get_beatmaps( class BeatmapScores(BaseModel): - scores: list[ScoreResp] - userScore: ScoreResp | None + scores: List[ScoreResp] + userScore: Optional[ScoreResp] = None @router.get( @@ -88,7 +89,7 @@ async def get_beatmapset_scores( beatmap: int, legacy_only: bool = Query(None), # TODO:加入对这个参数的查询 mode: str = Query(None), - mods: list[APIMod] = Query(None), + # mods: List[APIMod] = Query(None), # TODO:加入指定MOD的查询 type: str = Query(None), current_user: DBUser = Depends(get_current_user), db: AsyncSession = Depends(get_db), @@ -102,7 +103,7 @@ async def get_beatmapset_scores( await db.exec( select(Score) .where(Score.beatmap_id == beatmap) - .where(Score.mods == APIMod if mods else True) + # .where(Score.mods == mods if mods else True) ) ).all()