BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #1253

pull/1258/head^2
UnCLAS-Prommer 2025-09-23 21:02:03 +08:00
parent 294b451c96
commit 680593d57c
No known key found for this signature in database
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/chat/message_receive/bot.py
View File

@ -3,7 +3,7 @@ import os
import re import re
from typing import Dict, Any, Optional from typing import Dict, Any, Optional
from maim_message import UserInfo, Seg from maim_message import UserInfo, Seg, GroupInfo
from src.common.logger import get_logger from src.common.logger import get_logger
from src.config.config import global_config from src.config.config import global_config
@ -27,7 +27,7 @@ PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..
logger = get_logger("chat") logger = get_logger("chat")
def _check_ban_words(text: str, chat: ChatStream, userinfo: UserInfo) -> bool: def _check_ban_words(text: str, userinfo: UserInfo, group_info: Optional[GroupInfo] = None) -> bool:
"""检查消息是否包含过滤词 """检查消息是否包含过滤词
Args: Args:
@ -40,14 +40,14 @@ def _check_ban_words(text: str, chat: ChatStream, userinfo: UserInfo) -> bool:
""" """
for word in global_config.message_receive.ban_words: for word in global_config.message_receive.ban_words:
if word in text: if word in text:
chat_name = chat.group_info.group_name if chat.group_info else "私聊" chat_name = group_info.group_name if group_info else "私聊"
logger.info(f"[{chat_name}]{userinfo.user_nickname}:{text}") logger.info(f"[{chat_name}]{userinfo.user_nickname}:{text}")
logger.info(f"[过滤词识别]消息中含有{word}，filtered") logger.info(f"[过滤词识别]消息中含有{word}，filtered")
return True return True
return False return False
def _check_ban_regex(text: str, chat: ChatStream, userinfo: UserInfo) -> bool: def _check_ban_regex(text: str, userinfo: UserInfo, group_info: Optional[GroupInfo] = None) -> bool:
"""检查消息是否匹配过滤正则表达式 """检查消息是否匹配过滤正则表达式
Args: Args:
@ -61,10 +61,10 @@ def _check_ban_regex(text: str, chat: ChatStream, userinfo: UserInfo) -> bool:
# 检查text是否为None或空字符串 # 检查text是否为None或空字符串
if text is None or not text: if text is None or not text:
return False return False
for pattern in global_config.message_receive.ban_msgs_regex: for pattern in global_config.message_receive.ban_msgs_regex:
if re.search(pattern, text): if re.search(pattern, text):
chat_name = chat.group_info.group_name if chat.group_info else "私聊" chat_name = group_info.group_name if group_info else "私聊"
logger.info(f"[{chat_name}]{userinfo.user_nickname}:{text}") logger.info(f"[{chat_name}]{userinfo.user_nickname}:{text}")
logger.info(f"[正则表达式过滤]消息匹配到{pattern}，filtered") logger.info(f"[正则表达式过滤]消息匹配到{pattern}，filtered")
return True return True
@ -251,6 +251,18 @@ class ChatBot:
# return # return
pass pass
# 过滤检查
if _check_ban_words(
message.processed_plain_text,
user_info, # type: ignore
group_info,
) or _check_ban_regex(
message.raw_message, # type: ignore
user_info, # type: ignore
group_info,
):
return
get_chat_manager().register_message(message) get_chat_manager().register_message(message)
chat = await get_chat_manager().get_or_create_stream( chat = await get_chat_manager().get_or_create_stream(
@ -268,14 +280,6 @@ class ChatBot:
# logger.warning(f"检测到消息中含有违法，色情，暴力，反动，敏感内容，消息内容：{message.processed_plain_text}，发送者：{message.message_info.user_info.user_nickname}") # logger.warning(f"检测到消息中含有违法，色情，暴力，反动，敏感内容，消息内容：{message.processed_plain_text}，发送者：{message.message_info.user_info.user_nickname}")
# return # return
# 过滤检查
if _check_ban_words(message.processed_plain_text, chat, user_info) or _check_ban_regex( # type: ignore
message.raw_message, # type: ignore
chat,
user_info, # type: ignore
):
return
# 命令处理 - 使用新插件系统检查并处理命令 # 命令处理 - 使用新插件系统检查并处理命令
is_command, cmd_result, continue_process = await self._process_commands_with_new_system(message) is_command, cmd_result, continue_process = await self._process_commands_with_new_system(message)