Update utils.py

src/utils.py

@@ -1,5 +1,6 @@
 import websockets as Server
 import json
+import asyncio
 import base64
 import uuid
 import urllib3
@@ -298,39 +299,37 @@ async def read_ban_list(
         ban_list = db_manager.get_ban_records()
         lifted_list: List[BanUser] = []
         logger.info("已经读取禁言列表")
-        for ban_record in list(ban_list):  
+        tasks = []
-            if ban_record.user_id == 0:
+        for record in ban_list:
+            if record.user_id == 0:  # 群全体禁言
+                async def handle_group(r=record):
                     try:
-                    fetched_group_info = await get_group_info(websocket, ban_record.group_id)
+                        group_info = await get_group_info(websocket, r.group_id)
                     except Exception as e:
-                    logger.warning(f"获取群信息失败（群号: {ban_record.group_id}）：{e}，保留全体禁言状态")
+                        logger.warning(f"获取群信息失败（群号: {r.group_id}）：{e}，保留禁言状态")
-                    continue
+                        return None
-                if not fetched_group_info:
+                    if not group_info or group_info.get("group_all_shut") == 0:
-                    logger.warning(f"群 {ban_record.group_id} 暂未返回群信息，跳过全体禁言检查")
+                        return r
-                    continue
+                    return None
-                group_all_shut = fetched_group_info.get("group_all_shut")
+                tasks.append(handle_group())
-                if group_all_shut == 0:
+            else:  # 普通用户
-                    lifted_list.append(ban_record)
+                async def handle_user(r=record):
-                    ban_list.remove(ban_record)
-                continue
                     try:
-                fetched_member_info = await get_member_info(websocket, ban_record.group_id, ban_record.user_id)
+                        member_info = await get_member_info(websocket, r.group_id, r.user_id)
                     except Exception as e:
-                logger.warning(
+                        logger.warning(f"获取成员信息失败（群号: {r.group_id} 用户ID: {r.user_id}）：{e}")
-                    f"获取群成员信息失败（群号: {ban_record.group_id} 用户ID: {ban_record.user_id}）：{e}，保留禁言状态"
+                        return None
-                )
+                    if not member_info:
-                continue
+                        return None
-            if fetched_member_info is None:
+                    lift_time = member_info.get("shut_up_timestamp", 0)
-                logger.warning(
+                    if lift_time == 0:
-                    f"群 {ban_record.group_id} 用户 {ban_record.user_id} 暂无成员信息（Napcat缓存未加载？），暂不视为解除"
+                        return r
-                )
+                    r.lift_time = lift_time
-                continue
+                    return None
-            lift_ban_time: int = fetched_member_info.get("shut_up_timestamp", 0)
+                tasks.append(handle_user())
-            if lift_ban_time == 0:
+        results = await asyncio.gather(*tasks)
-                lifted_list.append(ban_record)
+        lifted_list = [r for r in results if r is not None]
-                ban_list.remove(ban_record)
+        ban_list = [r for r in ban_list if r not in lifted_list]
-            else:
-                ban_record.lift_time = lift_ban_time
         db_manager.update_ban_record(ban_list)
         return ban_list, lifted_list
     except Exception as e: