typing and plugins

src/chat/message_receive/bot.py

@@ -13,8 +13,8 @@ from src.chat.message_receive.message import MessageRecv, MessageRecvS4U
 from src.chat.message_receive.storage import MessageStorage
 from src.chat.heart_flow.heartflow_message_processor import HeartFCMessageReceiver
 from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
-from src.plugin_system.core.component_registry import component_registry  # 导入新插件系统
-from src.plugin_system.base.base_command import BaseCommand
+from src.plugin_system.core import component_registry, events_manager  # 导入新插件系统
+from src.plugin_system.base import BaseCommand, EventType
 from src.mais4u.mais4u_chat.s4u_msg_processor import S4UMessageProcessor
 
 
@@ -140,24 +140,22 @@ class ChatBot:
         message = MessageRecvS4U(message_data)
         group_info = message.message_info.group_info
         user_info = message.message_info.user_info
-        
-        
+
         get_chat_manager().register_message(message)
         chat = await get_chat_manager().get_or_create_stream(
             platform=message.message_info.platform,  # type: ignore
             user_info=user_info,  # type: ignore
             group_info=group_info,
         )
-        
+
         message.update_chat_stream(chat)
 
         # 处理消息内容
         await message.process()
-        
-        await self.s4u_message_processor.process_message(message)
-        
-        return
 
+        await self.s4u_message_processor.process_message(message)
+
+        return
 
     async def message_process(self, message_data: Dict[str, Any]) -> None:
         """处理转化后的统一格式消息
@@ -176,9 +174,9 @@ class ChatBot:
         try:
             # 确保所有任务已启动
             await self._ensure_started()
-            
+
             platform = message_data["message_info"].get("platform")
-            
+
             if platform == "amaidesu_default":
                 await self.do_s4u(message_data)
                 return
@@ -202,6 +200,9 @@ class ChatBot:
                     await MessageStorage.update_message(message)
                     return
 
+            if not await events_manager.handle_mai_events(EventType.ON_MESSAGE, message):
+                return
+
             get_chat_manager().register_message(message)
 
             chat = await get_chat_manager().get_or_create_stream(