1.4

backend/app/routers/conversations.py

@@ -10,6 +10,8 @@ from app.schemas.conversation import (
     GroupCreate, GroupUpdate, MemberAdd, RoleUpdate,
 )
 from app.services.conversation_service import ConversationService
+from app.websocket.events import EventType
+from app.websocket.manager import manager
 
 router = APIRouter()
 
@@ -97,6 +99,16 @@ async def add_members(
     service = ConversationService(db)
     try:
         await service.add_members(conversation_id, user.id, req.user_ids)
+        # 通知新成员被加入群聊
+        detail = await service.get_conversation_detail(conversation_id, user.id)
+        group_name = detail.get("name", "群聊") if detail else "群聊"
+        for mid in req.user_ids:
+            await manager.send_to_user(mid, EventType.CONVERSATION_MEMBER_ADDED, {
+                "conversation_id": conversation_id,
+                "group_name": group_name,
+                "added_by_user_id": user.id,
+                "added_by_username": user.username,
+            })
         return {"success": True, "message": "成员已添加"}
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -113,6 +125,12 @@ async def remove_member(
     service = ConversationService(db)
     try:
         await service.remove_member(conversation_id, user.id, target_user_id)
+        # 通知被移除的用户
+        await manager.send_to_user(target_user_id, EventType.CONVERSATION_MEMBER_REMOVED, {
+            "conversation_id": conversation_id,
+            "removed_by_user_id": user.id,
+            "removed_by_username": user.username,
+        })
         return {"success": True, "message": "成员已移除"}
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -133,6 +151,21 @@ async def leave_group(
         raise HTTPException(status_code=400, detail=str(e))
 
 
+@router.post("/{conversation_id}/dissolve")
+async def dissolve_group(
+    conversation_id: str,
+    user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    """解散群聊（仅群主）"""
+    service = ConversationService(db)
+    try:
+        await service.dissolve_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,

backend/app/routers/friends.py

@@ -7,6 +7,8 @@ from app.dependencies import get_db, get_current_user
 from app.models.user import User
 from app.schemas.friend import FriendRequestCreate, FriendRead, FriendRequestRead, RemarkUpdate
 from app.services.friend_service import FriendService
+from app.websocket.events import EventType
+from app.websocket.manager import manager
 
 router = APIRouter()
 
@@ -41,6 +43,14 @@ async def send_friend_request(
     service = FriendService(db)
     try:
         await service.send_request(user.id, req.to_user_id, req.message)
+        # 通知接收者
+        await manager.send_to_user(req.to_user_id, EventType.FRIEND_REQUEST, {
+            "from_user_id": user.id,
+            "from_username": user.username,
+            "from_nickname": user.nickname,
+            "from_avatar": user.avatar_url,
+            "message": req.message,
+        })
         return {"success": True, "message": "好友请求已发送"}
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -86,7 +96,24 @@ async def accept_friend_request(
     """接受好友请求"""
     service = FriendService(db)
     try:
+        # Get request details before accepting to know who sent it
+        request = await service.get_pending_requests(user.id)
+        from_user_id = None
+        for r in request:
+            if r["id"] == request_id:
+                from_user_id = r["from_user_id"]
+                break
+
         await service.accept_request(request_id, user.id)
+
+        # Notify the requester that their request was accepted
+        if from_user_id:
+            await manager.send_to_user(from_user_id, EventType.FRIEND_ACCEPTED, {
+                "accepted_by_user_id": user.id,
+                "accepted_by_username": user.username,
+                "accepted_by_nickname": user.nickname,
+            })
+
         return {"success": True, "message": "已添加好友"}
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))