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

Merge pull request #725 from Dax233/fix

Browse Source 
修复未启用私信情况下收到私信报错的bug
This commit is contained in:
墨梓柒
2025-04-11 23:30:28 +08:00
committed by GitHub
parent b9196635a8 e62d533c35
commit 3ce56e3791
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/chat/bot.py
View File

@@ -91,18 +91,19 @@ class ChatBot:
if global_config.enable_pfc_chatting: if global_config.enable_pfc_chatting:
try: try:
if groupinfo is None and global_config.enable_friend_chat: if groupinfo is None:
userinfo = message.message_info.user_info if global_config.enable_friend_chat:
messageinfo = message.message_info userinfo = message.message_info.user_info
# 创建聊天流 messageinfo = message.message_info
chat = await chat_manager.get_or_create_stream( # 创建聊天流
platform=messageinfo.platform, chat = await chat_manager.get_or_create_stream(
user_info=userinfo, platform=messageinfo.platform,
group_info=groupinfo, user_info=userinfo,
) group_info=groupinfo,
message.update_chat_stream(chat) )
await self.only_process_chat.process_message(message) message.update_chat_stream(chat)
await self._create_PFC_chat(message) await self.only_process_chat.process_message(message)
await self._create_PFC_chat(message)
else: else:
if groupinfo.group_id in global_config.talk_allowed_groups: if groupinfo.group_id in global_config.talk_allowed_groups:
# logger.debug(f"开始群聊模式{str(message_data)[:50]}...") # logger.debug(f"开始群聊模式{str(message_data)[:50]}...")
@@ -116,15 +117,16 @@ class ChatBot:
except Exception as e: except Exception as e:
logger.error(f"处理PFC消息失败: {e}") logger.error(f"处理PFC消息失败: {e}")
else: else:
if groupinfo is None and global_config.enable_friend_chat: if groupinfo is None:
# 私聊处理流程 if global_config.enable_friend_chat:
# await self._handle_private_chat(message) # 私聊处理流程
if global_config.response_mode == "heart_flow": # await self._handle_private_chat(message)
await self.think_flow_chat.process_message(message_data) if global_config.response_mode == "heart_flow":
elif global_config.response_mode == "reasoning": await self.think_flow_chat.process_message(message_data)
await self.reasoning_chat.process_message(message_data) elif global_config.response_mode == "reasoning":
else: await self.reasoning_chat.process_message(message_data)
logger.error(f"未知的回复模式，请检查配置文件！！: {global_config.response_mode}") else:
logger.error(f"未知的回复模式，请检查配置文件！！: {global_config.response_mode}")
else: # 群聊处理 else: # 群聊处理
if groupinfo.group_id in global_config.talk_allowed_groups: if groupinfo.group_id in global_config.talk_allowed_groups:
if global_config.response_mode == "heart_flow": if global_config.response_mode == "heart_flow":