chore(merge): merge branch 'main' into feat/multiplayer-api

app/models/beatmap.py

@@ -42,11 +42,12 @@ class Language(IntEnum):
     KOREAN = 6
     FRENCH = 7
     GERMAN = 8
-    ITALIAN = 9
-    SPANISH = 10
-    RUSSIAN = 11
-    POLISH = 12
-    OTHER = 13
+    SWEDISH = 9
+    ITALIAN = 10
+    SPANISH = 11
+    RUSSIAN = 12
+    POLISH = 13
+    OTHER = 14
 
 
 class BeatmapAttributes(BaseModel):

app/models/oauth.py

@@ -1,7 +1,6 @@
 # OAuth 相关模型
 from __future__ import annotations
 
-from typing import List
 from pydantic import BaseModel
 
 
@@ -39,18 +38,21 @@ class OAuthErrorResponse(BaseModel):
 
 class RegistrationErrorResponse(BaseModel):
     """注册错误响应模型"""
+
     form_error: dict
 
 
 class UserRegistrationErrors(BaseModel):
     """用户注册错误模型"""
-    username: List[str] = []
-    user_email: List[str] = []
-    password: List[str] = []
+
+    username: list[str] = []
+    user_email: list[str] = []
+    password: list[str] = []
 
 
 class RegistrationRequestErrors(BaseModel):
     """注册请求错误模型"""
+
     message: str | None = None
     redirect: str | None = None
     user: UserRegistrationErrors | None = None

app/models/score.py

@@ -132,7 +132,7 @@ class HitResultInt(IntEnum):
 
 class LeaderboardType(Enum):
     GLOBAL = "global"
-    FRIENDS = "friends"
+    FRIENDS = "friend"
     COUNTRY = "country"
     TEAM = "team"
 

app/models/user.py

@@ -2,15 +2,11 @@ from __future__ import annotations
 
 from datetime import datetime
 from enum import Enum
-from typing import TYPE_CHECKING
 
-from .score import GameMode
+from .model import UTCBaseModel
 
 from pydantic import BaseModel
 
-if TYPE_CHECKING:
-    from app.database import LazerUserAchievement, Team
-
 
 class PlayStyle(str, Enum):
     MOUSE = "mouse"
@@ -77,24 +73,7 @@ class MonthlyPlaycount(BaseModel):
     count: int
 
 
-class UserAchievement(BaseModel):
-    achieved_at: datetime
-    achievement_id: int
-
-    # 添加数据库模型转换方法
-    def to_db_model(self, user_id: int) -> "LazerUserAchievement":
-        from app.database import (
-            LazerUserAchievement,
-        )
-
-        return LazerUserAchievement(
-            user_id=user_id,
-            achievement_id=self.achievement_id,
-            achieved_at=self.achieved_at,
-        )
-
-
-class RankHighest(BaseModel):
+class RankHighest(UTCBaseModel):
     rank: int
     updated_at: datetime
 
@@ -104,115 +83,6 @@ class RankHistory(BaseModel):
     data: list[int]
 
 
-class DailyChallengeStats(BaseModel):
-    daily_streak_best: int = 0
-    daily_streak_current: int = 0
-    last_update: datetime | None = None
-    last_weekly_streak: datetime | None = None
-    playcount: int = 0
-    top_10p_placements: int = 0
-    top_50p_placements: int = 0
-    user_id: int
-    weekly_streak_best: int = 0
-    weekly_streak_current: int = 0
-
-
 class Page(BaseModel):
     html: str = ""
     raw: str = ""
-
-
-class User(BaseModel):
-    # 基本信息
-    id: int
-    username: str
-    avatar_url: str
-    country_code: str
-    default_group: str = "default"
-    is_active: bool = True
-    is_bot: bool = False
-    is_deleted: bool = False
-    is_online: bool = True
-    is_supporter: bool = False
-    is_restricted: bool = False
-    last_visit: datetime | None = None
-    pm_friends_only: bool = False
-    profile_colour: str | None = None
-
-    # 个人资料
-    cover_url: str | None = None
-    discord: str | None = None
-    has_supported: bool = False
-    interests: str | None = None
-    join_date: datetime
-    location: str | None = None
-    max_blocks: int = 100
-    max_friends: int = 500
-    occupation: str | None = None
-    playmode: GameMode = GameMode.OSU
-    playstyle: list[PlayStyle] = []
-    post_count: int = 0
-    profile_hue: int | None = None
-    profile_order: list[str] = [
-        "me",
-        "recent_activity",
-        "top_ranks",
-        "medals",
-        "historical",
-        "beatmaps",
-        "kudosu",
-    ]
-    title: str | None = None
-    title_url: str | None = None
-    twitter: str | None = None
-    website: str | None = None
-    session_verified: bool = False
-    support_level: int = 0
-
-    # 关联对象
-    country: Country
-    cover: Cover
-    kudosu: Kudosu
-    statistics: Statistics
-    statistics_rulesets: dict[str, Statistics]
-
-    # 计数信息
-    beatmap_playcounts_count: int = 0
-    comments_count: int = 0
-    favourite_beatmapset_count: int = 0
-    follower_count: int = 0
-    graveyard_beatmapset_count: int = 0
-    guest_beatmapset_count: int = 0
-    loved_beatmapset_count: int = 0
-    mapping_follower_count: int = 0
-    nominated_beatmapset_count: int = 0
-    pending_beatmapset_count: int = 0
-    ranked_beatmapset_count: int = 0
-    ranked_and_approved_beatmapset_count: int = 0
-    unranked_beatmapset_count: int = 0
-    scores_best_count: int = 0
-    scores_first_count: int = 0
-    scores_pinned_count: int = 0
-    scores_recent_count: int = 0
-
-    # 历史数据
-    account_history: list[dict] = []
-    active_tournament_banner: dict | None = None
-    active_tournament_banners: list[dict] = []
-    badges: list[dict] = []
-    current_season_stats: dict | None = None
-    daily_challenge_user_stats: DailyChallengeStats | None = None
-    groups: list[dict] = []
-    monthly_playcounts: list[MonthlyPlaycount] = []
-    page: Page = Page()
-    previous_usernames: list[str] = []
-    rank_highest: RankHighest | None = None
-    rank_history: RankHistory | None = None
-    rankHistory: RankHistory | None = None  # 兼容性别名
-    replays_watched_counts: list[dict] = []
-    team: "Team | None" = None
-    user_achievements: list[UserAchievement] = []
-
-
-class APIUser(BaseModel):
-    id: int