fix: update score urls

NiceAesth · Jan 30, 2024 · a7be028 · a7be028
1 parent c8f9e71
commit a7be028
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/aiosu/models/lazer.py b/aiosu/models/lazer.py
@@ -178,9 +178,9 @@ def score_url(self) -> Optional[str]:
         if (not self.id and not self.best_id) or not self.passed:
             return None
         return (
-            f"https://osu.ppy.sh/scores/{self.mode.name_api}/{self.best_id}"
-            if self.best_id
-            else f"https://osu.ppy.sh/scores/{self.id}"
+            f"https://osu.ppy.sh/scores/{self.id}"
+            if self.type == "solo_score"
+            else f"https://osu.ppy.sh/scores/{self.mode.name_api}/{self.best_id}"
         )
 
     @property
@@ -192,11 +192,10 @@ def replay_url(self) -> Optional[str]:
         """
         if not self.has_replay:
             return None
-        return (
-            f"https://osu.ppy.sh/scores/{self.mode.name_api}/{self.best_id}/download"
-            if self.best_id
-            else f"https://osu.ppy.sh/scores/{self.id}/download"
-        )
+        score_url = self.score_url
+        if not score_url:
+            return None
+        return score_url + "/download"
 
     @computed_field  # type: ignore
     @cached_property

diff --git a/aiosu/models/score.py b/aiosu/models/score.py
@@ -20,6 +20,7 @@
 from .beatmap import Beatmap
 from .beatmap import Beatmapset
 from .common import CurrentUserAttributes
+from .common import ScoreType
 from .gamemode import Gamemode
 from .mods import Mods
 from .user import User
@@ -148,6 +149,7 @@ class Score(BaseModel):
     created_at: datetime
     mode: Gamemode
     replay: bool
+    type: ScoreType = "solo_score"
     id: Optional[int] = None
     """Always present except for API v1 recent scores."""
     pp: Optional[float] = 0
@@ -158,7 +160,6 @@ class Score(BaseModel):
     user: Optional[User] = None
     rank_global: Optional[int] = None
     rank_country: Optional[int] = None
-    type: Optional[str] = None
     current_user_attributes: Optional[CurrentUserAttributes] = None
     beatmap_id: Optional[int] = None
     """Only present on API v1"""
@@ -173,9 +174,9 @@ def score_url(self) -> Optional[str]:
         if (not self.id and not self.best_id) or not self.passed:
             return None
         return (
-            f"https://osu.ppy.sh/scores/{self.mode.name_api}/{self.best_id}"
-            if self.best_id
-            else f"https://osu.ppy.sh/scores/{self.id}"
+            f"https://osu.ppy.sh/scores/{self.id}"
+            if self.type == "solo_score"
+            else f"https://osu.ppy.sh/scores/{self.mode.name_api}/{self.best_id}"
         )
 
     @property
@@ -187,11 +188,10 @@ def replay_url(self) -> Optional[str]:
         """
         if not self.replay:
             return None
-        return (
-            f"https://osu.ppy.sh/scores/{self.mode.name_api}/{self.best_id}/download"
-            if self.best_id
-            else f"https://osu.ppy.sh/scores/{self.id}/download"
-        )
+        score_url = self.score_url
+        if not score_url:
+            return None
+        return score_url + "/download"
 
     @computed_field  # type: ignore
     @cached_property