1.4

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))