gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加一个关于数据库在前面没有正确识别用户身份的时候的最小回退并改进ada插件的关于消息处理时可能会错误地把@消息识别为[视频]的情况

Browse Source
This commit is contained in:
Furina-1013-create
2025-09-06 22:58:50 +08:00
committed by Windpicker-owo
parent fc534571f2
commit 0d3a43a274
2 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/message_handler.py
View File

@@ -156,6 +156,21 @@ class MessageHandler:
Parameters:
raw_message: dict: 原始消息
"""
# 添加原始消息调试日志，特别关注message字段
logger.debug(f"收到原始消息: message_type={raw_message.get('message_type')}, message_id={raw_message.get('message_id')}")
logger.debug(f"原始消息内容: {raw_message.get('message', [])}")
# 检查是否包含@或video消息段
message_segments = raw_message.get('message', [])
if message_segments:
for i, seg in enumerate(message_segments):
seg_type = seg.get('type')
if seg_type in ['at', 'video']:
logger.info(f"检测到 {seg_type.upper()} 消息段 [{i}]: {seg}")
elif seg_type not in ['text', 'face', 'image']:
logger.warning(f"检测到特殊消息段 [{i}]: type={seg_type}, data={seg.get('data', {})}")
message_type: str = raw_message.get("message_type")
message_id: int = raw_message.get("message_id")
# message_time: int = raw_message.get("time")
@@ -353,6 +368,18 @@ class MessageHandler:
for sub_message in real_message:
sub_message: dict
sub_message_type = sub_message.get("type")
# 添加详细的消息类型调试信息
logger.debug(f"处理消息段: type={sub_message_type}, data={sub_message.get('data', {})}")
# 特别关注 at 和 video 消息的识别
if sub_message_type == "at":
logger.debug(f"检测到@消息: {sub_message}")
elif sub_message_type == "video":
logger.debug(f"检测到VIDEO消息: {sub_message}")
elif sub_message_type not in ["text", "face", "image", "record"]:
logger.warning(f"检测到特殊消息类型: {sub_message_type}, 完整消息: {sub_message}")
match sub_message_type:
case RealMessageType.text:
ret_seg = await self.handle_text_message(sub_message)
@@ -406,6 +433,7 @@ class MessageHandler:
else:
logger.warning("record处理失败或不支持")
case RealMessageType.video:
logger.debug(f"开始处理VIDEO消息段: {sub_message}")
ret_seg = await self.handle_video_message(sub_message)
if ret_seg:
await event_manager.trigger_event(
@@ -413,8 +441,9 @@ class MessageHandler:
)
seg_message.append(ret_seg)
else:
logger.warning("video处理失败")
logger.warning(f"video处理失败，原始消息: {sub_message}")
case RealMessageType.at:
logger.debug(f"开始处理AT消息段: {sub_message}")
ret_seg = await self.handle_at_message(
sub_message,
raw_message.get("self_id"),
@@ -426,7 +455,7 @@ class MessageHandler:
)
seg_message.append(ret_seg)
else:
logger.warning("at处理失败")
logger.warning(f"at处理失败，原始消息: {sub_message}")
case RealMessageType.rps:
ret_seg = await self.handle_rps_message(sub_message)
if ret_seg: