Upload router_messages.py

router_messages.py

@@ -1,106 +1,162 @@
-# router_messages.py
-from fastapi import APIRouter
-import time
-import uuid
-import 数据库连接 as db
-from notifications import add_notification
-from models import PrivateMessage
-
-router = APIRouter()
-
-@router.post("/api/messages/private")
-async def send_private_message(msg: PrivateMessage):
-    chats_db = db.load_data("chats.json", default_data={})
-    conv_id = f"{min(msg.sender, msg.receiver)}_{max(msg.sender, msg.receiver)}"
-    if conv_id not in chats_db: chats_db[conv_id] = []
-    
-    chat_msg = {"id": f"chat_{int(time.time())}_{uuid.uuid4().hex[:6]}", "sender": msg.sender, "receiver": msg.receiver, "content": msg.content, "created_at": int(time.time()), "is_read": False}
-    chats_db[conv_id].append(chat_msg)
-    db.save_data("chats.json", chats_db)
-    
-    add_notification(msg.receiver, {"type": "private", "from_user": msg.sender, "content": msg.content})
-    return {"status": "success"}
-
-@router.get("/api/chats/{account}")
-async def get_chat_list(account: str):
-    chats_db = db.load_data("chats.json", default_data={})
-    users_db = db.load_data("users.json", default_data={})
-    chat_list = []
-    now = int(time.time())
-    seven_days = 7 * 24 * 3600
-    
-    for conv_id, msgs in chats_db.items():
-        accs = conv_id.split("_")
-        if account in accs and msgs:
-            # 列表中只统计有效消息
-            valid_msgs = [m for m in msgs if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days)]
-            if valid_msgs:
-                target = accs[0] if accs[1] == account else accs[1]
-                target_info = users_db.get(target, {})
-                chat_list.append({
-                    "target_account": target, "target_name": target_info.get("name", target),
-                    "last_message": valid_msgs[-1]["content"], "last_time": valid_msgs[-1]["created_at"],
-                    "unread": sum(1 for m in valid_msgs if m["receiver"] == account and not m.get("is_read"))
-                })
-    chat_list.sort(key=lambda x: x["last_time"], reverse=True)
-    return {"status": "success", "data": chat_list}
-
-@router.get("/api/chats/{account}/{target}")
-async def get_chat_history(account: str, target: str):
-    chats_db = db.load_data("chats.json", default_data={})
-    conv_id = f"{min(account, target)}_{max(account, target)}"
-    msgs = chats_db.get(conv_id, [])
-    
-    now = int(time.time())
-    seven_days = 7 * 24 * 3600
-    valid_msgs = []
-    modified = False
-    
-    for m in msgs:
-        # 【核心策略】：未读的永远保留，已读的超过 7 天直接抛弃
-        if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
-            valid_msgs.append(m)
-        else:
-            modified = True
-            
-        # 本次访问即为已读
-        if m["receiver"] == account and not m.get("is_read"): 
-            m["is_read"] = True
-            modified = True
-            
-    if modified or len(valid_msgs) != len(msgs): 
-        chats_db[conv_id] = valid_msgs
-        db.save_data("chats.json", chats_db)
-        
-    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, [])
-    
-    now = int(time.time())
-    seven_days = 7 * 24 * 3600
-    valid = []
-    modified = False
-    
-    for m in user_msgs:
-        if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
-            valid.append(m)
-        else:
-            modified = True
-            
-    if modified:
-        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 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, [])
-    for m in user_msgs: m["is_read"] = True
-    msgs_db[account] = user_msgs
-    db.save_data("messages.json", msgs_db)
+# router_messages.py
+from fastapi import APIRouter, HTTPException
+from pydantic import BaseModel
+import time
+import uuid
+import 数据库连接 as db
+from notifications import add_notification
+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=[])
+    
+    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",
+        "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}
+
+@router.post("/api/messages/private")
+async def send_private_message(msg: PrivateMessage):
+    chats_db = db.load_data("chats.json", default_data={})
+    conv_id = f"{min(msg.sender, msg.receiver)}_{max(msg.sender, msg.receiver)}"
+    if conv_id not in chats_db: chats_db[conv_id] = []
+    
+    chat_msg = {"id": f"chat_{int(time.time())}_{uuid.uuid4().hex[:6]}", "sender": msg.sender, "receiver": msg.receiver, "content": msg.content, "created_at": int(time.time()), "is_read": False}
+    chats_db[conv_id].append(chat_msg)
+    db.save_data("chats.json", chats_db)
+    
+    add_notification(msg.receiver, {"type": "private", "from_user": msg.sender, "content": msg.content})
+    return {"status": "success"}
+
+@router.get("/api/chats/{account}")
+async def get_chat_list(account: str):
+    chats_db = db.load_data("chats.json", default_data={})
+    users_db = db.load_data("users.json", default_data={})
+    
+    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]
+            if not msgs: continue
+            
+            last_msg = sorted(msgs, key=lambda x: x.get("created_at", 0))[-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, {})
+            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"),
+                "last_message": last_msg["content"],
+                "last_time": last_msg["created_at"],
+                "unread_count": unread_count
+            })
+            
+    chat_list.sort(key=lambda x: x["last_time"], reverse=True)
+    return {"status": "success", "data": chat_list}
+
+@router.get("/api/chats/{account}/{target_account}")
+async def get_chat_history(account: str, target_account: str):
+    chats_db = db.load_data("chats.json", default_data={})
+    conv_id = f"{min(account, target_account)}_{max(account, target_account)}"
+    msgs = chats_db.get(conv_id, [])
+    
+    now = int(time.time())
+    seven_days = 7 * 24 * 3600
+    valid_msgs = []
+    modified = False
+    
+    for m in msgs:
+        if now - m.get("created_at", 0) < seven_days:
+            valid_msgs.append(m)
+        else:
+            modified = True
+            
+        if m["receiver"] == account and not m.get("is_read"): 
+            m["is_read"] = True
+            modified = True
+            
+    if modified or len(valid_msgs) != len(msgs): 
+        chats_db[conv_id] = valid_msgs
+        db.save_data("chats.json", chats_db)
+        
+    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, [])
+    
+    # --- 系统公告懒加载注入 ---
+    announcements_db = db.load_data("announcements.json", default_data=[])
+    user_msg_ids = {m.get("id") for m in user_msgs}
+    
+    injected = False
+    for ann in announcements_db:
+        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), reverse=True)
+    # --------------------------
+    
+    now = int(time.time())
+    seven_days = 7 * 24 * 3600
+    valid = []
+    modified = injected 
+    
+    for m in user_msgs:
+        if not m.get("is_read") or (now - m.get("created_at", 0) < seven_days):
+            valid.append(m)
+        else:
+            modified = True
+            
+    if modified:
+        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 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
+    
+    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"}