🐛 bug修复

zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py

@@ -1,20 +1,15 @@
-import re
-from typing import Literal
-
 import nonebot
 from fastapi import APIRouter
 from nonebot import on_message
-from nonebot.adapters.onebot.v11 import MessageEvent
-from nonebot_plugin_alconna import At, Emoji, Hyper, Image, Text, UniMessage, UniMsg
 from nonebot_plugin_session import EventSession
-from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
+from nonebot.adapters.onebot.v11 import MessageEvent
+from nonebot_plugin_alconna import At, Text, Hyper, Image, UniMsg
+from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
 
-from zhenxun.models.friend_user import FriendUser
-from zhenxun.models.group_console import GroupConsole
-from zhenxun.models.group_member_info import GroupInfoUser
 from zhenxun.utils.depends import UserName
+from zhenxun.models.group_member_info import GroupInfoUser
 
-from ....config import AVA_URL, GROUP_AVA_URL
+from ....config import AVA_URL
 from .model import Message, MessageItem
 
 driver = nonebot.get_driver()
@@ -27,7 +22,8 @@ ID_LIST = []
 
 ws_router = APIRouter()
 
-matcher = on_message(block=False, priority=1)
+
+matcher = on_message(block=False, priority=1, rule=lambda: bool(ws_conn))
 
 
 @driver.on_shutdown
@@ -44,7 +40,7 @@ async def _(websocket: WebSocket):
         ws_conn = websocket
         try:
             while websocket.client_state == WebSocketState.CONNECTED:
-                recv = await websocket.receive()
+                await websocket.receive()
         except WebSocketDisconnect:
             ws_conn = None
 
@@ -55,7 +51,7 @@ async def message_handle(
 ):
     messages = []
     for m in message:
-        if isinstance(m, (Text, str)):
+        if isinstance(m, Text | str):
             messages.append(MessageItem(type="text", msg=str(m)))
         elif isinstance(m, Image):
             if m.url:
@@ -70,18 +66,15 @@ async def message_handle(
                         ID2NAME[group_id] = {}
                     if m.target in ID2NAME[group_id]:
                         uname = ID2NAME[group_id][m.target]
-                    else:
-                        if group_user := await GroupInfoUser.get_or_none(
-                            user_id=m.target, group_id=group_id
-                        ):
-                            uname = group_user.user_name
-                            if m.target not in ID2NAME[group_id]:
-                                ID2NAME[group_id][m.target] = uname
+                    elif group_user := await GroupInfoUser.get_or_none(
+                        user_id=m.target, group_id=group_id
+                    ):
+                        uname = group_user.user_name
+                        if m.target not in ID2NAME[group_id]:
+                            ID2NAME[group_id][m.target] = uname
                 messages.append(MessageItem(type="at", msg=f"@{uname}"))
-        # elif isinstance(m, Emoji):
-        # messages.append(MessageItem(type="text", msg=f"[emoji]"))
         elif isinstance(m, Hyper):
-            messages.append(MessageItem(type="text", msg=f"[分享消息]"))
+            messages.append(MessageItem(type="text", msg="[分享消息]"))
     return messages
 
 
@@ -91,7 +84,6 @@ async def _(
 ):
     global ws_conn, ID2NAME, ID_LIST
     uid = session.id1
-    gid = session.id3 or session.id2
     if ws_conn and ws_conn.client_state == WebSocketState.CONNECTED and uid:
         msg_id = event.message_id
         if msg_id in ID_LIST:
@@ -99,6 +91,7 @@ async def _(
         ID_LIST.append(msg_id)
         if len(ID_LIST) > 50:
             ID_LIST = ID_LIST[40:]
+        gid = session.id3 or session.id2
         messages = await message_handle(message, gid)
         data = Message(
             object_id=gid or uid,