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

refactor：重构聊天状态切换模式，移除限额，精简切换逻辑

Browse Source
This commit is contained in:
SengokuCola
2025-05-18 18:15:38 +08:00
parent a1809d347b
commit 49c2bc854c
24 changed files with 541 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,25 +78,6 @@ class ChatBot:
group_info = message.message_info.group_info
user_info = message.message_info.user_info
# 用户黑名单拦截
# if userinfo.user_id in global_config.chat_target.ban_user_id:
# logger.debug(f"用户{userinfo.user_id}被禁止回复")
# return
# if groupinfo is None:
# logger.trace("检测到私聊消息，检查")
# # 好友黑名单拦截
# if userinfo.user_id not in global_config.experimental.talk_allowed_private:
# # logger.debug(f"用户{userinfo.user_id}没有私聊权限")
# return
# 群聊黑名单拦截
# print(groupinfo.group_id)
# print(global_config.chat_target.talk_allowed_groups)
# if groupinfo is not None and groupinfo.group_id not in global_config.chat_target.talk_allowed_groups:
# logger.debug(f"群{groupinfo.group_id}被禁止回复")
# return
# 确认从接口发来的message是否有自定义的prompt模板信息
if message.message_info.template_info and not message.message_info.template_info.template_default:
template_group_name = message.message_info.template_info.template_name
@@ -114,28 +95,6 @@ class ChatBot:
# 如果在私聊中
if group_info is None:
logger.trace("检测到私聊消息")
# 是否在配置信息中开启私聊模式
# if global_config.experimental.enable_friend_chat:
# logger.trace("私聊模式已启用")
# # 是否进入PFC
# if global_config.enable_pfc_chatting:
# logger.trace("进入PFC私聊处理流程")
# userinfo = message.message_info.user_info
# messageinfo = message.message_info
# # 创建聊天流
# logger.trace(f"为{userinfo.user_id}创建/获取聊天流")
# chat = await chat_manager.get_or_create_stream(
# platform=messageinfo.platform,
# user_info=userinfo,
# group_info=groupinfo,
# )
# message.update_chat_stream(chat)
# await self.only_process_chat.process_message(message)
# await self._create_pfc_chat(message)
# # 禁止PFC，进入普通的心流消息处理逻辑
# else:
# logger.trace("进入普通心流私聊处理")
# await self.heartflow_processor.process_message(message_data)
if global_config.experimental.pfc_chatting:
logger.trace("进入PFC私聊处理流程")
# 创建聊天流