From 3b697785fc5748c782b7b740bbbfb2d2aa3ffa48 Mon Sep 17 00:00:00 2001
From: jimmy-sketch <jimmy163mail@163.com>
Date: Sat, 26 Jul 2025 08:47:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BD=BF/beatmaps/{beatmap}/score?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E6=AD=A3=E5=B8=B8=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/score.py   | 2 +-
 app/router/beatmap.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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()