refactor(userpage): move APIs into g0v0 private API
This commit is contained in:
@@ -1,22 +1,14 @@
|
||||
from typing import Annotated
|
||||
|
||||
from app.database import MeResp, User
|
||||
from app.database import MeResp
|
||||
from app.dependencies.database import Database
|
||||
from app.dependencies.user import UserAndToken, get_current_user, get_current_user_and_token
|
||||
from app.exceptions.userpage import UserpageError
|
||||
from app.dependencies.user import UserAndToken, get_current_user_and_token
|
||||
from app.models.score import GameMode
|
||||
from app.models.user import Page
|
||||
from app.models.userpage import (
|
||||
UpdateUserpageRequest,
|
||||
UpdateUserpageResponse,
|
||||
ValidateBBCodeRequest,
|
||||
ValidateBBCodeResponse,
|
||||
)
|
||||
from app.service.bbcode_service import bbcode_service
|
||||
|
||||
from .router import router
|
||||
|
||||
from fastapi import HTTPException, Path, Security
|
||||
from fastapi import Path, Security
|
||||
from fastapi.responses import RedirectResponse
|
||||
|
||||
|
||||
@router.get(
|
||||
@@ -50,92 +42,11 @@ async def get_user_info_default(
|
||||
return user_resp
|
||||
|
||||
|
||||
# @router.get(
|
||||
# "/users/{user_id}/page",
|
||||
# response_model=UserpageResponse,
|
||||
# name="获取用户页面",
|
||||
# description="获取指定用户的个人页面内容。匹配官方osu-web API格式。",
|
||||
# tags=["用户"],
|
||||
# )
|
||||
# async def get_userpage(
|
||||
# session: Database,
|
||||
# user_id: int = Path(description="用户ID"),
|
||||
# ):
|
||||
# """获取用户页面内容"""
|
||||
# # 查找用户
|
||||
# user = await session.get(User, user_id)
|
||||
# if not user:
|
||||
# raise HTTPException(status_code=404, detail={"error": "User not found"})
|
||||
|
||||
# # 返回页面内容
|
||||
# if user.page:
|
||||
# return UserpageResponse(html=user.page.get("html", ""), raw=user.page.get("raw", ""))
|
||||
# else:
|
||||
# return UserpageResponse(html="", raw="")
|
||||
@router.put("/users/{user_id}/page", include_in_schema=False)
|
||||
async def update_userpage():
|
||||
return RedirectResponse(url="/api/private/user/page", status_code=307)
|
||||
|
||||
|
||||
@router.put(
|
||||
"/users/{user_id}/page",
|
||||
response_model=UpdateUserpageResponse,
|
||||
name="更新用户页面",
|
||||
description="更新指定用户的个人页面内容(支持BBCode)。匹配官方osu-web API格式。",
|
||||
tags=["用户"],
|
||||
)
|
||||
async def update_userpage(
|
||||
request: UpdateUserpageRequest,
|
||||
session: Database,
|
||||
user_id: Annotated[int, Path(description="用户ID")],
|
||||
current_user: Annotated[User, Security(get_current_user, scopes=["edit"])],
|
||||
):
|
||||
"""更新用户页面内容(匹配官方osu-web实现)"""
|
||||
# 检查权限:只能编辑自己的页面(除非是管理员)
|
||||
if user_id != current_user.id:
|
||||
raise HTTPException(status_code=403, detail={"error": "Access denied"})
|
||||
|
||||
try:
|
||||
# 处理BBCode内容
|
||||
processed_page = bbcode_service.process_userpage_content(request.body)
|
||||
|
||||
# 更新数据库 - 直接更新用户对象
|
||||
current_user.page = Page(html=processed_page["html"], raw=processed_page["raw"])
|
||||
session.add(current_user)
|
||||
await session.commit()
|
||||
await session.refresh(current_user)
|
||||
|
||||
# 返回官方格式的响应:只包含html
|
||||
return UpdateUserpageResponse(html=processed_page["html"])
|
||||
|
||||
except UserpageError as e:
|
||||
# 使用官方格式的错误响应:{'error': message}
|
||||
raise HTTPException(status_code=422, detail={"error": e.message})
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500, detail={"error": "Failed to update user page"})
|
||||
|
||||
|
||||
@router.post(
|
||||
"/me/validate-bbcode",
|
||||
response_model=ValidateBBCodeResponse,
|
||||
name="验证BBCode",
|
||||
description="验证BBCode语法并返回预览。",
|
||||
tags=["用户"],
|
||||
)
|
||||
async def validate_bbcode(
|
||||
request: ValidateBBCodeRequest,
|
||||
):
|
||||
"""验证BBCode语法"""
|
||||
try:
|
||||
# 验证BBCode语法
|
||||
errors = bbcode_service.validate_bbcode(request.content)
|
||||
|
||||
# 生成预览(如果没有严重错误)
|
||||
if len(errors) == 0:
|
||||
preview = bbcode_service.process_userpage_content(request.content)
|
||||
else:
|
||||
preview = {"raw": request.content, "html": ""}
|
||||
|
||||
return ValidateBBCodeResponse(valid=len(errors) == 0, errors=errors, preview=preview)
|
||||
|
||||
except UserpageError as e:
|
||||
return ValidateBBCodeResponse(valid=False, errors=[e.message], preview={"raw": request.content, "html": ""})
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500, detail={"error": "Failed to validate BBCode"})
|
||||
@router.post("/me/validate-bbcode", include_in_schema=False)
|
||||
async def validate_bbcode():
|
||||
return RedirectResponse(url="/api/private/user/validate-bbcode", status_code=307)
|
||||
|
||||
Reference in New Issue
Block a user