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

src/chat/message_receive/bot.py

@@ -41,7 +41,7 @@ class ChatBot:
             chat_id = str(message.chat_stream.stream_id)
             private_name = str(message.message_info.user_info.user_nickname)
 
-            if global_config.enable_pfc_chatting:
+            if global_config.experimental.enable_pfc_chatting:
                 await self.pfc_manager.get_or_create_conversation(chat_id, private_name)
 
         except Exception as e:
@@ -78,19 +78,19 @@ class ChatBot:
             userinfo = message.message_info.user_info
 
             # 用户黑名单拦截
-            if userinfo.user_id in global_config.ban_user_id:
+            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.talk_allowed_private:
+                if userinfo.user_id not in global_config.experimental.talk_allowed_private:
                     logger.debug(f"用户{userinfo.user_id}没有私聊权限")
                     return
 
             # 群聊黑名单拦截
-            if groupinfo is not None and groupinfo.group_id not in global_config.talk_allowed_groups:
+            if groupinfo is not None and groupinfo.group_id not in global_config.chat_target.talk_allowed_groups:
                 logger.trace(f"群{groupinfo.group_id}被禁止回复")
                 return
 
@@ -112,7 +112,7 @@ class ChatBot:
                 if groupinfo is None:
                     logger.trace("检测到私聊消息")
                     # 是否在配置信息中开启私聊模式
-                    if global_config.enable_friend_chat:
+                    if global_config.experimental.enable_friend_chat:
                         logger.trace("私聊模式已启用")
                         # 是否进入PFC
                         if global_config.enable_pfc_chatting:

src/chat/message_receive/message_buffer.py

@@ -38,7 +38,7 @@ class MessageBuffer:
 
     async def start_caching_messages(self, message: MessageRecv):
         """添加消息，启动缓冲"""
-        if not global_config.message_buffer:
+        if not global_config.chat.message_buffer:
             person_id = person_info_manager.get_person_id(
                 message.message_info.user_info.platform, message.message_info.user_info.user_id
             )
@@ -107,7 +107,7 @@ class MessageBuffer:
 
     async def query_buffer_result(self, message: MessageRecv) -> bool:
         """查询缓冲结果，并清理"""
-        if not global_config.message_buffer:
+        if not global_config.chat.message_buffer:
             return True
         person_id_ = self.get_person_id_(
             message.message_info.platform, message.message_info.user_info.user_id, message.message_info.group_info

src/chat/message_receive/message_sender.py

@@ -279,7 +279,7 @@ class MessageManager:
                     )
 
                 # 检查是否超时
-                if thinking_time > global_config.thinking_timeout:
+                if thinking_time > global_config.normal_chat.thinking_timeout:
                     logger.warning(
                         f"[{chat_id}] 消息思考超时 ({thinking_time:.1f}秒)，移除消息 {message_earliest.message_info.message_id}"
                     )