diff --git a/addons/plugins/helloworld/main.py b/addons/plugins/helloworld/main.py index 3bf301b6d..54586aa4e 100644 --- a/addons/plugins/helloworld/main.py +++ b/addons/plugins/helloworld/main.py @@ -25,11 +25,6 @@ class HelloWorldPlugin: def __init__(self, context: Context) -> None: self.context = context self.context.register_commands("helloworld", "helloworld", "内置测试指令。", 1, self.helloworld) - self.context.register_middleware("audio_to_text", self.audio_to_text) - - async def audio_to_text(self, message: AstrMessageEvent, context: Context): - print(message) - """ 指令处理函数。 diff --git a/astrbot/message/handler.py b/astrbot/message/handler.py index 3e2212b1e..5e862ce1d 100644 --- a/astrbot/message/handler.py +++ b/astrbot/message/handler.py @@ -158,7 +158,8 @@ class MessageHandler(): # middlewares for middleware in self.context.middlewares: try: - await middleware.func(message) + logger.info(f"执行中间件 {middleware.origin}/{middleware.name}...") + await middleware.func(message, self.context) except BaseException as e: logger.error(f"中间件 {middleware.origin}/{middleware.name} 处理消息时发生异常:{e},跳过。") logger.error(traceback.format_exc()) diff --git a/model/command/internal_handler.py b/model/command/internal_handler.py index 058987e4b..c7e8e19bf 100644 --- a/model/command/internal_handler.py +++ b/model/command/internal_handler.py @@ -181,18 +181,18 @@ class InternalCommandHandler: except BaseException as e: logger.warning("An error occurred while fetching astrbot notice. Never mind, it's not important.") - msg = "# Help Center\n## 指令列表\n" + msg = "# 帮助中心\n## 指令\n" for key, value in self.manager.commands_handler.items(): if value.plugin_metadata: msg += f"- `{key}` ({value.plugin_metadata.plugin_name}): {value.description}\n" else: msg += f"- `{key}`: {value.description}\n" # plugins - if context.cached_plugins != None: + if context.cached_plugins: plugin_list_info = "" for plugin in context.cached_plugins: plugin_list_info += f"- `{plugin.metadata.plugin_name}` {plugin.metadata.desc}\n" if plugin_list_info.strip() != "": - msg += "\n## 插件列表\n> 使用plugin v 插件名 查看插件帮助\n" + msg += "\n## 插件\n> 使用plugin v 插件名 查看插件帮助\n" msg += plugin_list_info msg += notice diff --git a/type/middleware.py b/type/middleware.py index 3c473c6fd..dc1b1cc8e 100644 --- a/type/middleware.py +++ b/type/middleware.py @@ -4,5 +4,5 @@ from dataclasses import dataclass class Middleware(): name: str = "" description: str = "" - func: callable = None - origin: str # 注册来源 \ No newline at end of file + origin: str = "" # 注册来源 + func: callable = None \ No newline at end of file