Upload router_messages.py

router_messages.py

@@ -9,41 +9,41 @@ from models import PrivateMessage
 
 router = APIRouter()
 
-# === 新增：用于接收系统公告的请求体模型 ===
+# ==========================================
+# 新增：系统公告请求体模型
+# ==========================================
 class SystemAnnouncement(BaseModel):
     admin_account: str
     content: str
 
-# === 新增：发布系统公告接口 (仅限管理员) ===
+# ==========================================
+# 新增：发布系统公告接口 (仅限管理员)
+# ==========================================
 @router.post("/api/system/announcement")
 async def publish_announcement(ann: SystemAnnouncement):
-    # 鉴权：只有指定的官方账号才能发公告
+    # 硬编码限制仅超级管理员账号可发布
     if ann.admin_account != "666666":
         raise HTTPException(status_code=403, detail="无权发布系统公告")
     
     announcements_db = db.load_data("announcements.json", default_data=[])
     
-    # 【防御性修复】：确保就算之前存成了别的格式，这里也强制转换为列表，防止 append 报错
-    if not isinstance(announcements_db, list):
-        announcements_db = []
-    
-    # 构造一条标准的系统公告数据结构
     new_ann = {
         "id": f"sys_{int(time.time())}_{uuid.uuid4().hex[:6]}",
         "type": "system",
         "from_user": "666666",
         "from_name": "官方团队",
-        "from_avatar": "https://via.placeholder.com/150/FF9800/FFFFFF?text=Sys", # 专属的橙色系统头像
+        "from_avatar": "https://via.placeholder.com/150/FF9800/FFFFFF?text=Sys",
         "content": ann.content,
         "created_at": int(time.time())
     }
     
     announcements_db.append(new_ann)
     db.save_data("announcements.json", announcements_db)
-    
-    return {"status": "success", "data": new_ann}
-
+    return {"status": "success"}
 
+# ==========================================
+# 原有功能：私信与聊天
+# ==========================================
 @router.post("/api/messages/private")
 async def send_private_message(msg: PrivateMessage):
     chats_db = db.load_data("chats.json", default_data={})
@@ -65,18 +65,15 @@ async def get_chat_list(account: str):
     chat_list = []
     for conv_id, msgs in chats_db.items():
         if account in conv_id:
-            participants = conv_id.split("_")
-            target_account = participants[0] if participants[1] == account else participants[1]
+            other_account = conv_id.replace(account, "").replace("_", "")
             if not msgs: continue
-            
-            last_msg = sorted(msgs, key=lambda x: x.get("created_at", 0))[-1]
+            last_msg = msgs[-1]
             unread_count = sum(1 for m in msgs if m["receiver"] == account and not m.get("is_read"))
-            
-            target_user = users_db.get(target_account, {})
+            other_user = users_db.get(other_account, {})
             chat_list.append({
-                "target_account": target_account,
-                "target_name": target_user.get("name", target_account),
-                "target_avatar": target_user.get("avatarDataUrl", "https://via.placeholder.com/150"),
+                "account": other_account,
+                "name": other_user.get("name", other_account),
+                "avatar": other_user.get("avatarDataUrl", "https://via.placeholder.com/150"),
                 "last_message": last_msg["content"],
                 "last_time": last_msg["created_at"],
                 "unread_count": unread_count
@@ -97,8 +94,7 @@ async def get_chat_history(account: str, target_account: str):
     modified = False
     
     for m in msgs:
-        # 聊天记录也遵循 7 天冷数据截断
-        if now - m.get("created_at", 0) < seven_days:
+        if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
             valid_msgs.append(m)
         else:
             modified = True
@@ -114,48 +110,40 @@ async def get_chat_history(account: str, target_account: str):
         
     return {"status": "success", "data": valid_msgs}
 
+# ==========================================
+# 改造：获取通知列表 (加入系统公告懒加载注入)
+# ==========================================
 @router.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, [])
     
-    # 【防御性修复】：确保 user_msgs 是列表
-    if not isinstance(user_msgs, list):
-        user_msgs = []
-    
-    # =========================================================
-    # 系统公告懒加载注入逻辑 (Lazy Push)
-    # =========================================================
+    # --- 核心改造区：瞬间比对并注入全局公告 ---
     announcements_db = db.load_data("announcements.json", default_data=[])
-    if not isinstance(announcements_db, list):
-        announcements_db = []
-        
-    # 获取用户已经拥有的消息 ID 集合，用于快速比对（加入防脏数据判断）
-    user_msg_ids = {m.get("id") for m in user_msgs if isinstance(m, dict)}
+    user_msg_ids = {m.get("id") for m in user_msgs}
     
     injected = False
     for ann in announcements_db:
-        if isinstance(ann, dict) and ann.get("id") not in user_msg_ids:
-            # 如果是新公告，构造一条个人消息注入进去
-            new_sys_msg = dict(ann) # 浅拷贝，防止修改全局数据
+        if ann.get("id") not in user_msg_ids:
+            new_sys_msg = dict(ann) 
             new_sys_msg["is_read"] = False
             new_sys_msg["receiver"] = account
             user_msgs.append(new_sys_msg)
             injected = True
             
     if injected:
-        # 如果注入了新公告，按照时间重新倒序排列，确保最新的消息/公告在最上面
-        user_msgs.sort(key=lambda x: x.get("created_at", 0) if isinstance(x, dict) else 0, reverse=True)
-    # =========================================================
+        # 重新按照时间倒序排列，让新公告置顶
+        user_msgs.sort(key=lambda x: x.get("created_at", 0), reverse=True)
+    # ----------------------------------------
     
     now = int(time.time())
     seven_days = 7 * 24 * 3600
     valid = []
-    # 如果刚才注入了新公告，说明用户的消息列表被修改了，必须触发保存
+    
+    # 如果注入了新公告，则判定为需要回写数据库保存
     modified = injected 
     
     for m in user_msgs:
-        if not isinstance(m, dict): continue
         if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
             valid.append(m)
         else:
@@ -165,22 +153,24 @@ async def get_messages(account: str):
         msgs_db[account] = valid
         db.save_data("messages.json", msgs_db)
         
-    return {"status": "success", "data": valid, "unread_count": sum(1 for m in valid if m.get("is_read") is False)}
+    return {
+        "status": "success", 
+        "data": valid, 
+        "unread_count": sum(1 for m in valid if not m.get("is_read"))
+    }
 
 @router.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, [])
     modified = False
-    
-    if isinstance(user_msgs, list):
-        for m in user_msgs:
-            if isinstance(m, dict) and not m.get("is_read"):
-                m["is_read"] = True
-                modified = True
-                
-        if modified:
-            msgs_db[account] = user_msgs
-            db.save_data("messages.json", msgs_db)
+    for m in user_msgs:
+        if not m.get("is_read"):
+            m["is_read"] = True
+            modified = True
+            
+    if modified:
+        msgs_db[account] = user_msgs
+        db.save_data("messages.json", msgs_db)
         
     return {"status": "success"}