Upload app.py

app.py

@@ -1,4 +1,4 @@
-# ⚙️ 后端逻辑/核心服务端.py (Hugging Face Spaces app.py)
+# ⚙️ 后端逻辑/核心服务端.py
 from fastapi import FastAPI, HTTPException, File, UploadFile, Form
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
@@ -37,10 +37,7 @@ async def upload_file(file: UploadFile = File(...), file_type: str = Form(...)):
     db.save_file(full_path_in_repo, content)
     url = f"https://huggingface.co/datasets/{db.DATASET_REPO_ID}/resolve/main/{full_path_in_repo}"
     
-    return {
-        "status": "success", "url": url, 
-        "display_name": original_name, "hashed_name": new_filename
-    }
+    return {"status": "success", "url": url, "display_name": original_name, "hashed_name": new_filename}
 
 # --- 数据模型 ---
 class UserRegister(BaseModel):
@@ -60,7 +57,6 @@ class UserLogin(BaseModel):
     account: str   
     password: str
 
-# 【新增阶段一】：用户资料更新模型
 class UserUpdate(BaseModel):
     name: Optional[str] = None
     intro: Optional[str] = None
@@ -70,7 +66,6 @@ class UserUpdate(BaseModel):
     gender: Optional[str] = None
     avatarDataUrl: Optional[str] = None
 
-# 【新增阶段一】：修改密码模型
 class PasswordReset(BaseModel):
     old_password: str
     new_password: str
@@ -103,107 +98,107 @@ class FollowToggle(BaseModel):
     target_account: str
     is_active: bool
 
+# 【核心新增】：私信数据模型
+class PrivateMessage(BaseModel):
+    sender: str
+    receiver: str
+    content: str
+
+# --- 消息分发引擎 ---
+def add_notification(target_account: str, notif_data: dict):
+    from_user = notif_data.get("from_user")
+    if target_account == from_user or not target_account: 
+        return # 不给自己发通知
+    
+    users_db = db.load_data("users.json", default_data={})
+    user_info = users_db.get(from_user, {})
+    
+    notif = {
+        "id": f"msg_{int(time.time())}_{uuid.uuid4().hex[:6]}",
+        "type": notif_data.get("type"), # like, favorite, comment, reply, follow, private
+        "from_user": from_user,
+        "from_name": user_info.get("name", from_user),
+        "from_avatar": user_info.get("avatarDataUrl", "https://via.placeholder.com/150"),
+        "target_item_id": notif_data.get("target_item_id", ""),
+        "target_item_title": notif_data.get("target_item_title", ""),
+        "content": notif_data.get("content", ""),
+        "is_read": False,
+        "created_at": int(time.time())
+    }
+    
+    msgs_db = db.load_data("messages.json", default_data={})
+    if target_account not in msgs_db: msgs_db[target_account] = []
+    msgs_db[target_account].insert(0, notif)
+    db.save_data("messages.json", msgs_db)
+
 # --- 1. 用户系统 ---
 @app.post("/api/users/register")
 async def register_user(user: UserRegister):
     users_db = db.load_data("users.json", default_data={})
-    
     if user.account in users_db: raise HTTPException(status_code=400, detail="该账号已被注册")
-    for existing_user in users_db.values():
-        if existing_user.get("email") == user.email: raise HTTPException(status_code=400, detail="该邮箱已被绑定")
-        if existing_user.get("phone") == user.phone: raise HTTPException(status_code=400, detail="该手机号已被绑定")
-    
     new_user = user.dict()
-    new_user.update({
-        "created_at": int(time.time()), 
-        "followers": [], "following": [],
-        "privacy": {"follows": False, "likes": False, "favorites": False, "downloads": False}
-    })
-    
+    new_user.update({"created_at": int(time.time()), "followers": [], "following": [], "privacy": {"follows": False, "likes": False, "favorites": False, "downloads": False}})
     users_db[user.account] = new_user
     db.save_data("users.json", users_db)
-    
-    safe_user_data = {k: v for k, v in new_user.items() if k != "password"}
-    return {"status": "success", "message": "注册成功", "data": safe_user_data}
+    return {"status": "success", "message": "注册成功", "data": {k: v for k, v in new_user.items() if k != "password"}}
 
 @app.post("/api/users/login")
 async def login_user(user: UserLogin):
     users_db = db.load_data("users.json", default_data={})
-    if user.account not in users_db: raise HTTPException(status_code=404, detail="账号不存在，请检查或先注册")
+    if user.account not in users_db: raise HTTPException(status_code=404, detail="账号不存在")
     user_data = users_db[user.account]
     if user_data.get("password") != user.password: raise HTTPException(status_code=401, detail="密码错误")
-        
-    return {
-        "status": "success", "token": f"mock_token_{user.account}",
-        "account": user.account, "name": user_data["name"], 
-        "avatar": user_data.get("avatarDataUrl", "https://via.placeholder.com/150")
-    }
+    return {"status": "success", "token": f"mock_token_{user.account}", "account": user.account, "name": user_data["name"], "avatar": user_data.get("avatarDataUrl", "https://via.placeholder.com/150")}
 
 @app.get("/api/users/{account}")
 async def get_user_profile(account: str):
     users_db = db.load_data("users.json", default_data={})
     if account not in users_db: raise HTTPException(status_code=404, detail="用户不存在")
-    
     user_data = users_db[account]
     items_db = db.load_data("items.json", default_data=[])
     user_items = [item for item in items_db if item.get("author") == account]
-    
     user_data["receivedLikes"] = sum(item.get("likes", 0) for item in user_items)
     user_data["receivedFavorites"] = sum(item.get("favorites", 0) for item in user_items)
     user_data["receivedUses"] = sum(item.get("uses", 0) for item in user_items)
-    
-    safe_user_data = {k: v for k, v in user_data.items() if k != "password"}
-    return {"status": "success", "data": safe_user_data}
+    return {"status": "success", "data": {k: v for k, v in user_data.items() if k != "password"}}
 
-# 【新增阶段一】：全量更新用户资料
 @app.put("/api/users/{account}")
 async def update_user_profile(account: str, update_data: UserUpdate):
     users_db = db.load_data("users.json", default_data={})
     if account not in users_db: raise HTTPException(status_code=404, detail="用户不存在")
-    
     user = users_db[account]
-    update_dict = update_data.dict(exclude_unset=True) # 仅更新传入的字段
-    
+    update_dict = update_data.dict(exclude_unset=True) 
     for k, v in update_dict.items():
-        if v is not None:
-            user[k] = v
-            
+        if v is not None: user[k] = v
     db.save_data("users.json", users_db)
-    safe_user_data = {k: v for k, v in user.items() if k != "password"}
-    return {"status": "success", "message": "资料更新成功", "data": safe_user_data}
+    return {"status": "success", "data": {k: v for k, v in user.items() if k != "password"}}
 
-# 【新增阶段一】：修改账号密码
 @app.post("/api/users/{account}/reset-password")
 async def reset_password(account: str, pwd_data: PasswordReset):
     users_db = db.load_data("users.json", default_data={})
     if account not in users_db: raise HTTPException(status_code=404, detail="用户不存在")
-    
     user = users_db[account]
-    if user.get("password") != pwd_data.old_password:
-        raise HTTPException(status_code=401, detail="原密码错误，修改失败")
-        
+    if user.get("password") != pwd_data.old_password: raise HTTPException(status_code=401, detail="原密码错误")
     user["password"] = pwd_data.new_password
     db.save_data("users.json", users_db)
-    return {"status": "success", "message": "密码修改成功"}
+    return {"status": "success"}
 
 @app.post("/api/users/follow")
 async def toggle_follow(follow: FollowToggle):
     users_db = db.load_data("users.json", default_data={})
     if follow.target_account not in users_db or follow.user_id not in users_db: raise HTTPException(status_code=404, detail="用户不存在")
-        
-    target_user = users_db[follow.target_account]
-    current_user = users_db[follow.user_id]
-    
-    target_followers = target_user.setdefault("followers", [])
-    current_following = current_user.setdefault("following", [])
+    target_followers = users_db[follow.target_account].setdefault("followers", [])
+    current_following = users_db[follow.user_id].setdefault("following", [])
     
     if follow.is_active:
-        if follow.user_id not in target_followers: target_followers.append(follow.user_id)
+        if follow.user_id not in target_followers: 
+            target_followers.append(follow.user_id)
+            # 派发关注通知
+            add_notification(follow.target_account, {"type": "follow", "from_user": follow.user_id})
         if follow.target_account not in current_following: current_following.append(follow.target_account)
     else:
         if follow.user_id in target_followers: target_followers.remove(follow.user_id)
         if follow.target_account in current_following: current_following.remove(follow.target_account)
-        
     db.save_data("users.json", users_db)
     return {"status": "success"}
 
@@ -211,7 +206,13 @@ async def toggle_follow(follow: FollowToggle):
 @app.get("/api/items")
 async def get_items(type: str = "tool", sort: str = "time", limit: int = 20):
     items_db = db.load_data("items.json", default_data=[])
+    comments_db = db.load_data("comments.json", default_data={})
     filtered_items = [item for item in items_db if item.get("type") == type]
+    for item in filtered_items:
+        # 动态挂载评论区数据
+        item["commentsData"] = comments_db.get(item["id"], [])
+        item["comments"] = len(item["commentsData"])
+        
     if sort == "likes": filtered_items.sort(key=lambda x: x.get("likes", 0), reverse=True)
     elif sort == "favorites": filtered_items.sort(key=lambda x: x.get("favorites", 0), reverse=True)
     elif sort == "downloads": filtered_items.sort(key=lambda x: x.get("uses", 0), reverse=True)
@@ -222,6 +223,7 @@ async def get_items(type: str = "tool", sort: str = "time", limit: int = 20):
 async def get_creators(sort: str = "downloads", limit: int = 20):
     users_db = db.load_data("users.json", default_data={})
     items_db = db.load_data("items.json", default_data=[])
+    comments_db = db.load_data("comments.json", default_data={})
     
     creators = []
     for account, u in users_db.items():
@@ -237,6 +239,7 @@ async def get_creators(sort: str = "downloads", limit: int = 20):
             "shortDesc": u.get("intro", "这个人很懒，什么都没写..."), "fullDesc": u.get("intro", "这个人很懒，什么都没写..."),
             "likes": likes, "favorites": favorites, "downloads": uses, "toolsCount": tools_count, "appsCount": apps_count,
             "followers": len(u.get("followers", [])), "created_at": u.get("created_at", 0),
+            "commentsData": comments_db.get(account, []), # 挂载留言板数据
             "trendData": {"tools": [0,0,0,0,0, tools_count], "apps": [0,0,0,0,0, apps_count]}
         })
         
@@ -260,7 +263,7 @@ async def create_item(item: ItemCreate):
     db.save_data("items.json", items_db)
     return {"status": "success", "data": new_item}
 
-# --- 3. 社交与互动 ---
+# --- 3. 社交与互动 (点赞/收藏防抖与通知派发) ---
 @app.post("/api/interactions/toggle")
 async def toggle_interaction(interaction: InteractionToggle):
     items_db = db.load_data("items.json", default_data=[])
@@ -273,27 +276,55 @@ async def toggle_interaction(interaction: InteractionToggle):
 
     user_list = target_item[list_key]
     if interaction.is_active:
-        if interaction.user_id not in user_list: user_list.append(interaction.user_id); target_item[count_key] += 1
+        if interaction.user_id not in user_list: 
+            user_list.append(interaction.user_id)
+            target_item[count_key] += 1
+            # 派发点赞/收藏通知给作者
+            add_notification(target_item.get("author", ""), {
+                "type": interaction.action_type, "from_user": interaction.user_id,
+                "target_item_id": target_item["id"], "target_item_title": target_item["title"]
+            })
     else:
         if interaction.user_id in user_list: user_list.remove(interaction.user_id); target_item[count_key] = max(0, target_item[count_key] - 1)
             
     db.save_data("items.json", items_db)
     return {"status": "success", "new_count": target_item[count_key]}
 
-# --- 4. 评论系统 ---
+# --- 4. 评论系统与消息 ---
 @app.post("/api/comments")
 async def post_comment(comment: CommentCreate):
     comments_db = db.load_data("comments.json", default_data={}) 
+    users_db = db.load_data("users.json", default_data={})
+    
+    author_info = users_db.get(comment.author, {})
+    reply_name = users_db.get(comment.reply_to_user, {}).get("name", comment.reply_to_user) if comment.reply_to_user else None
+
     item_comments = comments_db.get(comment.item_id, [])
     new_comment = {
-        "id": f"c_{int(time.time())}_{uuid.uuid4().hex[:6]}", "author": comment.author, "content": comment.content,
-        "replyToUser": comment.reply_to_user, "isDeleted": False, "replies": [], "created_at": int(time.time())
+        "id": f"c_{int(time.time())}_{uuid.uuid4().hex[:6]}", "author": comment.author, 
+        "authorName": author_info.get("name", comment.author), "avatar": author_info.get("avatarDataUrl", "https://via.placeholder.com/150"),
+        "content": comment.content, "replyToUser": comment.reply_to_user, "replyToUserName": reply_name,
+        "isDeleted": False, "replies": [], "created_at": int(time.time())
     }
+    
     if comment.parent_id:
         parent = next((c for c in item_comments if c["id"] == comment.parent_id), None)
-        if parent: parent["replies"].append(new_comment)
+        if parent: 
+            parent["replies"].append(new_comment)
+            # 通知被回复者
+            if comment.reply_to_user:
+                add_notification(comment.reply_to_user, {"type": "reply", "from_user": comment.author, "target_item_id": comment.item_id, "target_item_title": "收到新的回复", "content": comment.content})
         else: raise HTTPException(status_code=404, detail="找不到要回复的评论")
-    else: item_comments.append(new_comment)
+    else: 
+        item_comments.append(new_comment)
+        # 通知作品作者 或 留言板主人
+        items_db = db.load_data("items.json", default_data=[])
+        target_item = next((item for item in items_db if item["id"] == comment.item_id), None)
+        if target_item:
+            add_notification(target_item.get("author", ""), {"type": "comment", "from_user": comment.author, "target_item_id": comment.item_id, "target_item_title": target_item["title"], "content": comment.content})
+        elif comment.item_id in users_db:
+            add_notification(comment.item_id, {"type": "comment", "from_user": comment.author, "target_item_id": comment.item_id, "target_item_title": "您的个人留言板", "content": comment.content})
+
     comments_db[comment.item_id] = item_comments
     db.save_data("comments.json", comments_db)
     return {"status": "success", "data": new_comment}
@@ -314,4 +345,25 @@ async def soft_delete_comment(item_id: str, comment_id: str, author: str):
     if find_and_delete(item_comments):
         db.save_data("comments.json", comments_db)
         return {"status": "success", "message": "评论已删除"}
-    raise HTTPException(status_code=404, detail="找不到该评论")
+    raise HTTPException(status_code=404, detail="找不到该评论")
+
+@app.post("/api/messages/private")
+async def send_private_message(msg: PrivateMessage):
+    add_notification(msg.receiver, {"type": "private", "from_user": msg.sender, "content": msg.content})
+    return {"status": "success"}
+
+@app.get("/api/messages/{account}")
+async def get_messages(account: str):
+    msgs_db = db.load_data("messages.json", default_data={})
+    user_msgs = msgs_db.get(account, [])
+    unread_count = sum(1 for m in user_msgs if not m.get("is_read"))
+    return {"status": "success", "data": user_msgs, "unread_count": unread_count}
+
+@app.post("/api/messages/{account}/read")
+async def mark_messages_read(account: str):
+    msgs_db = db.load_data("messages.json", default_data={})
+    user_msgs = msgs_db.get(account, [])
+    for m in user_msgs: m["is_read"] = True
+    msgs_db[account] = user_msgs
+    db.save_data("messages.json", msgs_db)
+    return {"status": "success"}