1.0

2026-06-13 07:33:46 +08:00
parent e2da13bc5c
commit 24017e7454
40 changed files with 3135 additions and 108 deletions
@@ -5,7 +5,10 @@ from sqlalchemy.ext.asyncio import AsyncSession

 from app.dependencies import get_db, get_current_user
 from app.models.user import User
-from app.schemas.conversation import ConversationCreate, ConversationRead, ConversationDetail, GroupCreate
+from app.schemas.conversation import (
+    ConversationCreate, ConversationRead, ConversationDetail,
+    GroupCreate, GroupUpdate, MemberAdd, RoleUpdate,
+)
 from app.services.conversation_service import ConversationService

 router = APIRouter()
@@ -65,3 +68,83 @@ async def get_conversation(
    if not detail:
        raise HTTPException(status_code=404, detail="会话不存在或无权访问")
    return detail
+
+
+@router.put("/{conversation_id}")
+async def update_group(
+    conversation_id: str,
+    req: GroupUpdate,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """更新群聊信息（群主/管理员）"""
+    service = ConversationService(db)
+    try:
+        await service.update_group(conversation_id, user.id, **req.model_dump(exclude_none=True))
+        return {"success": True, "message": "群信息已更新"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.post("/{conversation_id}/members")
+async def add_members(
+    conversation_id: str,
+    req: MemberAdd,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """添加群成员（群主/管理员）"""
+    service = ConversationService(db)
+    try:
+        await service.add_members(conversation_id, user.id, req.user_ids)
+        return {"success": True, "message": "成员已添加"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/{conversation_id}/members/{target_user_id}")
+async def remove_member(
+    conversation_id: str,
+    target_user_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """移除群成员（群主/管理员）"""
+    service = ConversationService(db)
+    try:
+        await service.remove_member(conversation_id, user.id, target_user_id)
+        return {"success": True, "message": "成员已移除"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.post("/{conversation_id}/leave")
+async def leave_group(
+    conversation_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """退出群聊"""
+    service = ConversationService(db)
+    try:
+        await service.leave_group(conversation_id, user.id)
+        return {"success": True, "message": "已退出群聊"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.put("/{conversation_id}/members/{target_user_id}/role")
+async def update_member_role(
+    conversation_id: str,
+    target_user_id: str,
+    req: RoleUpdate,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """修改群成员角色（群主）"""
+    service = ConversationService(db)
+    try:
+        await service.update_member_role(conversation_id, user.id, target_user_id, req.role)
+        return {"success": True, "message": "角色已更新"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
@@ -5,7 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession

 from app.dependencies import get_db, get_current_user
 from app.models.user import User
-from app.schemas.friend import FriendRequestCreate, FriendRead, FriendRequestRead
+from app.schemas.friend import FriendRequestCreate, FriendRead, FriendRequestRead, RemarkUpdate
 from app.services.friend_service import FriendService

 router = APIRouter()
@@ -46,6 +46,37 @@ async def send_friend_request(
        raise HTTPException(status_code=400, detail=str(e))


+@router.post("/add-direct")
+async def add_friend_direct(
+    req: FriendRequestCreate,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """直接添加好友（跳过验证）"""
+    service = FriendService(db)
+    try:
+        await service.add_direct(user.id, req.to_user_id)
+        return {"success": True, "message": "已添加好友"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.put("/{friend_user_id}/remark")
+async def update_friend_remark(
+    friend_user_id: str,
+    req: RemarkUpdate,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """修改好友备注"""
+    service = FriendService(db)
+    try:
+        await service.update_remark(user.id, friend_user_id, req.remark)
+        return {"success": True, "message": "备注已更新"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
@router.put("/request/{request_id}/accept")
 async def accept_friend_request(
    request_id: str,
@@ -0,0 +1,140 @@
+"""朋友圈路由"""
+
+from fastapi import APIRouter, Depends, HTTPException, Query
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.dependencies import get_db, get_current_user
+from app.models.user import User
+from app.schemas.moment import MomentCreate, MomentCommentCreate
+from app.services.moment_service import MomentService
+
+router = APIRouter()
+
+
+@router.get("/")
+async def get_feed(
+    cursor: str | None = Query(None),
+    limit: int = Query(20, ge=1, le=50),
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """获取朋友圈 feed"""
+    service = MomentService(db)
+    return await service.get_feed(user.id, cursor, limit)
+
+
+@router.post("/")
+async def create_moment(
+    req: MomentCreate,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """发布动态"""
+    service = MomentService(db)
+    try:
+        moment = await service.create_moment(user.id, req.content, req.images, req.visibility)
+        detail = await service.get_feed(user.id, limit=1)
+        return detail[0] if detail else {"success": True}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.get("/user/{target_user_id}")
+async def get_user_moments(
+    target_user_id: str,
+    cursor: str | None = Query(None),
+    limit: int = Query(20, ge=1, le=50),
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """获取指定用户的动态"""
+    service = MomentService(db)
+    return await service.get_user_moments(target_user_id, user.id, cursor, limit)
+
+
+@router.get("/{moment_id}")
+async def get_moment(
+    moment_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """获取单条动态详情"""
+    service = MomentService(db)
+    feed = await service.get_feed(user.id, limit=100)
+    moment = next((m for m in feed if m["id"] == moment_id), None)
+    if not moment:
+        raise HTTPException(status_code=404, detail="动态不存在")
+    return moment
+
+
+@router.delete("/{moment_id}")
+async def delete_moment(
+    moment_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """删除动态"""
+    service = MomentService(db)
+    try:
+        await service.delete_moment(moment_id, user.id)
+        return {"success": True, "message": "动态已删除"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.post("/{moment_id}/like")
+async def toggle_like(
+    moment_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """点赞/取消点赞"""
+    service = MomentService(db)
+    try:
+        is_liked = await service.toggle_like(moment_id, user.id)
+        return {"success": True, "is_liked": is_liked}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.get("/{moment_id}/comments")
+async def get_comments(
+    moment_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """获取评论列表"""
+    service = MomentService(db)
+    return await service.get_comments(moment_id)
+
+
+@router.post("/{moment_id}/comments")
+async def add_comment(
+    moment_id: str,
+    req: MomentCommentCreate,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """添加评论"""
+    service = MomentService(db)
+    try:
+        comment = await service.add_comment(moment_id, user.id, req.content, req.reply_to_id)
+        return comment
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/{moment_id}/comments/{comment_id}")
+async def delete_comment(
+    moment_id: str,
+    comment_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """删除评论"""
+    service = MomentService(db)
+    try:
+        await service.delete_comment(comment_id, user.id)
+        return {"success": True, "message": "评论已删除"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
@@ -5,7 +5,10 @@ from sqlalchemy.ext.asyncio import AsyncSession

 from app.dependencies import get_db, get_current_user
 from app.models.user import User
-from app.schemas.user import UserRead, UserProfile, UserUpdate, UserSearchResult
+from app.schemas.user import (
+    UserRead, UserProfile, UserUpdate, UserSearchResult,
+    PasswordChange, EmailChange,
+)
 from app.services.user_service import UserService

 router = APIRouter()
@@ -29,6 +32,36 @@ async def update_me(
    return updated


+@router.put("/me/password")
+async def change_password(
+    req: PasswordChange,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """修改密码"""
+    service = UserService(db)
+    try:
+        await service.change_password(user.id, req.old_password, req.new_password)
+        return {"success": True, "message": "密码修改成功"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.put("/me/email")
+async def change_email(
+    req: EmailChange,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """更换绑定邮箱"""
+    service = UserService(db)
+    try:
+        await service.change_email(user.id, req.email, req.password)
+        return {"success": True, "message": "邮箱已更新"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
@router.get("/search", response_model=list[UserSearchResult])
 async def search_users(
    q: str = Query(..., min_length=1),