Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/experimental/only_message_process.py

@@ -2,7 +2,11 @@ from src.common.logger_manager import get_logger
 from src.chat.message_receive.message import MessageRecv
 from src.chat.message_receive.storage import MessageStorage
 from src.config.config import global_config
+from src.chat.message_receive.chat_stream import ChatStream
+
+from maim_message import UserInfo
 from datetime import datetime
+import re
 
 logger = get_logger("pfc")
 
@@ -14,7 +18,7 @@ class MessageProcessor:
         self.storage = MessageStorage()
 
     @staticmethod
-    def _check_ban_words(text: str, chat, userinfo) -> bool:
+    def _check_ban_words(text: str, chat: ChatStream, userinfo: UserInfo) -> bool:
         """检查消息中是否包含过滤词"""
         for word in global_config.message_receive.ban_words:
             if word in text:
@@ -26,13 +30,12 @@ class MessageProcessor:
         return False
 
     @staticmethod
-    def _check_ban_regex(text: str, chat, userinfo) -> bool:
+    def _check_ban_regex(text: str, chat: ChatStream, userinfo: UserInfo) -> bool:
         """检查消息是否匹配过滤正则表达式"""
-        for pattern in global_config.chat.ban_msgs_regex:
-            if pattern.search(text):
-                logger.info(
-                    f"[{chat.group_info.group_name if chat.group_info else '私聊'}]{userinfo.user_nickname}:{text}"
-                )
+        for pattern in global_config.message_receive.ban_msgs_regex:
+            if re.search(pattern, text):
+                chat_name = chat.group_info.group_name if chat.group_info else "私聊"
+                logger.info(f"[{chat_name}]{userinfo.user_nickname}:{text}")
                 logger.info(f"[正则表达式过滤]消息匹配到{pattern}，filtered")
                 return True
         return False