From a975718a647d3b33913528f81944db909e918810 Mon Sep 17 00:00:00 2001 From: RockChinQ <1010553892@qq.com> Date: Wed, 24 Jan 2024 22:29:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9A=82=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=AF=B9=E7=83=AD=E9=87=8D=E8=BD=BD=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/qqbot/manager.py | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py index 3ac877c1..e8cf6b6e 100644 --- a/pkg/qqbot/manager.py +++ b/pkg/qqbot/manager.py @@ -48,24 +48,17 @@ class QQBotManager: self.timeout = config['process_message_timeout'] self.retry = config['retry_times'] - # 由于YiriMirai的bot对象是单例的，且shutdown方法暂时无法使用 - # 故只在第一次初始化时创建bot对象，重载之后使用原bot对象 - # 因此，bot的配置不支持热重载 - if first_time_init: - logging.debug("Use adapter:" + config['msg_source_adapter']) - if config['msg_source_adapter'] == 'yirimirai': - from pkg.qqbot.sources.yirimirai import YiriMiraiAdapter + logging.debug("Use adapter:" + config['msg_source_adapter']) + if config['msg_source_adapter'] == 'yirimirai': + from pkg.qqbot.sources.yirimirai import YiriMiraiAdapter - mirai_http_api_config = config['mirai_http_api_config'] - self.bot_account_id = config['mirai_http_api_config']['qq'] - self.adapter = YiriMiraiAdapter(mirai_http_api_config) - elif config['msg_source_adapter'] == 'nakuru': - from pkg.qqbot.sources.nakuru import NakuruProjectAdapter - self.adapter = NakuruProjectAdapter(config['nakuru_config']) - self.bot_account_id = self.adapter.bot_account_id - else: - self.adapter = context.get_qqbot_manager().adapter - self.bot_account_id = context.get_qqbot_manager().bot_account_id + mirai_http_api_config = config['mirai_http_api_config'] + self.bot_account_id = config['mirai_http_api_config']['qq'] + self.adapter = YiriMiraiAdapter(mirai_http_api_config) + elif config['msg_source_adapter'] == 'nakuru': + from pkg.qqbot.sources.nakuru import NakuruProjectAdapter + self.adapter = NakuruProjectAdapter(config['nakuru_config']) + self.bot_account_id = self.adapter.bot_account_id # 保存 account_id 到审计模块 from ..utils.center import apigroup @@ -260,8 +253,6 @@ class QQBotManager: async def on_person_message(self, event: MessageEvent): reply = '' - config = context.get_config_manager().data - if not self.enable_private: logging.debug("已在banlist.py中禁用所有私聊")