From 016391c97669bc224ebb11185aabbae0ef7d4bb3 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Fri, 21 Apr 2023 17:15:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=B8=8D=E5=86=8D=E5=90=91QQBotMan?=
 =?UTF-8?q?ager=E4=B8=AD=E4=BC=A0=E9=80=92config=E4=B8=AD=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py                        |  4 +---
 pkg/qqbot/manager.py           | 12 ++++++------
 pkg/qqbot/sources/yirimirai.py |  1 +
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index aa997148..bd9c71ea 100644
--- a/main.py
+++ b/main.py
@@ -193,9 +193,7 @@ def start(first_time_init=False):
         pkg.openai.session.load_sessions()
 
         # 初始化qq机器人
-        qqbot = pkg.qqbot.manager.QQBotManager(mirai_http_api_config=config.mirai_http_api_config,
-                                               timeout=config.process_message_timeout, retry=config.retry_times,
-                                               first_time_init=first_time_init)
+        qqbot = pkg.qqbot.manager.QQBotManager(first_time_init=first_time_init)
 
         # 加载插件
         import pkg.plugin.host
diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py
index b8b9a71f..d1c38756 100644
--- a/pkg/qqbot/manager.py
+++ b/pkg/qqbot/manager.py
@@ -73,9 +73,12 @@ class QQBotManager:
     ban_person = []
     ban_group = []
 
-    def __init__(self, mirai_http_api_config: dict, timeout: int = 60, retry: int = 3, first_time_init=True):
-        self.timeout = timeout
-        self.retry = retry
+    def __init__(self, first_time_init=True):
+        import config
+
+        mirai_http_api_config = config.mirai_http_api_config
+        self.timeout = config.process_message_timeout
+        self.retry = config.retry_times
 
         # 加载禁用列表
         if os.path.exists("banlist.py"):
@@ -195,9 +198,6 @@ class QQBotManager:
 
         self.unsubscribe_all = unsubscribe_all
 
-    def go(self, func, *args, **kwargs):
-        self.pool.submit(func, *args, **kwargs)
-
     def first_time_init(self, mirai_http_api_config: dict):
         """热重载后不再运行此函数"""
         if 'adapter' not in mirai_http_api_config or mirai_http_api_config['adapter'] == "WebSocketAdapter":
diff --git a/pkg/qqbot/sources/yirimirai.py b/pkg/qqbot/sources/yirimirai.py
index dcc3b8d4..111e8f8e 100644
--- a/pkg/qqbot/sources/yirimirai.py
+++ b/pkg/qqbot/sources/yirimirai.py
@@ -5,6 +5,7 @@ import mirai.models.bus
 import asyncio
 import typing
 
+
 class YiriMiraiAdapter(MessageSourceAdapter):
     """YiriMirai适配器"""
     bot: mirai.Mirai