fit nonebot.beta2

utils/manager/__init__.py

@@ -1,6 +1,5 @@
 from typing import Optional
 from .group_manager import GroupManager
-from pathlib import Path
 from .data_class import StaticData
 from .withdraw_message_manager import WithdrawMessageManager
 from .plugins2cd_manager import Plugins2cdManager
@@ -17,7 +16,7 @@ from configs.path_config import DATA_PATH
 
 # 群功能开关 | 群被动技能 | 群权限  管理
 group_manager: Optional[GroupManager] = GroupManager(
-    Path(DATA_PATH) / "manager" / "group_manager.json"
+    DATA_PATH / "manager" / "group_manager.json"
 )
 
 # 撤回消息管理
@@ -25,42 +24,42 @@ withdraw_message_manager: Optional[WithdrawMessageManager] = WithdrawMessageMana
 
 # 插件管理
 plugins_manager: Optional[PluginsManager] = PluginsManager(
-    Path(DATA_PATH) / "manager" / "plugins_manager.json"
+    DATA_PATH / "manager" / "plugins_manager.json"
 )
 
 # 插件基本设置管理
 plugins2settings_manager: Optional[Plugins2settingsManager] = Plugins2settingsManager(
-    Path(DATA_PATH) / "configs" / "plugins2settings.yaml"
+    DATA_PATH / "configs" / "plugins2settings.yaml"
 )
 
 # 插件命令 cd 管理
 plugins2cd_manager: Optional[Plugins2cdManager] = Plugins2cdManager(
-    Path(DATA_PATH) / "configs" / "plugins2cd.yaml"
+    DATA_PATH / "configs" / "plugins2cd.yaml"
 )
 
 # 插件命令 阻塞 管理
 plugins2block_manager: Optional[Plugins2blockManager] = Plugins2blockManager(
-    Path(DATA_PATH) / "configs" / "plugins2block.yaml"
+    DATA_PATH / "configs" / "plugins2block.yaml"
 )
 
 # 插件命令 每次次数限制 管理
 plugins2count_manager: Optional[Plugins2countManager] = Plugins2countManager(
-    Path(DATA_PATH) / "configs" / "plugins2count.yaml"
+    DATA_PATH / "configs" / "plugins2count.yaml"
 )
 
 # 资源管理
 resources_manager: Optional[ResourcesManager] = ResourcesManager(
-    Path(DATA_PATH) / "manager" / "resources_manager.json"
+    DATA_PATH / "manager" / "resources_manager.json"
 )
 
 # 插件加载容忍管理
 none_plugin_count_manager: Optional[NonePluginCountManager] = NonePluginCountManager(
-    Path(DATA_PATH) / "manager" / "none_plugin_count_manager.json"
+    DATA_PATH / "manager" / "none_plugin_count_manager.json"
 )
 
 # 好友请求/群聊邀请 管理
 requests_manager: Optional[RequestManager] = RequestManager(
-    Path(DATA_PATH) / "manager" / "requests_manager.json"
+    DATA_PATH / "manager" / "requests_manager.json"
 )
 
 

utils/manager/group_manager.py

@@ -262,7 +262,7 @@ class GroupManager(StaticData):
         """
         if not self._task:
             for matcher in get_matchers():
-                _plugin = nonebot.plugin.get_plugin(matcher.module)
+                _plugin = nonebot.plugin.get_plugin(matcher.plugin_name)
                 try:
                     _module = _plugin.module
                     plugin_task = _module.__getattribute__("__plugin_task__")
@@ -292,7 +292,6 @@ class GroupManager(StaticData):
                         self._data["group_manager"][group_id]["group_task_status"][
                             task
                         ] = Config.get_config('_task', f'DEFAULT_{task}', default=True)
-                        print(task, Config.get_config('_task', f'DEFAULT_{task}'))
                 for task in list(
                     self._data["group_manager"][group_id]["group_task_status"]
                 ):

utils/manager/requests_manager.py

@@ -1,6 +1,6 @@
 from utils.manager.data_class import StaticData
-from nonebot.adapters.cqhttp import Bot
-from nonebot.adapters.cqhttp.exception import ActionFailed
+from nonebot.adapters.onebot.v11 import Bot
+from nonebot.adapters.onebot.v11.exception import ActionFailed
 from services.log import logger
 from typing import Optional
 from utils.image_utils import BuildImage

utils/manager/resources_manager.py

@@ -31,7 +31,7 @@ class ResourcesManager(StaticData):
         if isinstance(source_file, Path):
             source_file = str(source_file.absolute())
         if isinstance(move_file, Path):
-            move_file = move_file.absolute()
+            move_file = str(move_file.absolute())
         if module not in self._data.keys():
             self._data[module] = {source_file: move_file}
         else:
@@ -97,6 +97,7 @@ class ResourcesManager(StaticData):
         """
         添加临时清理文件夹
         :param path: 路径
+        :param recursive: 是否将该目录下的所有目录也添加为临时文件夹
         """
         if isinstance(path, str):
             path = Path(path)

utils/manager/withdraw_message_manager.py

@@ -1,5 +1,5 @@
 from typing import Tuple, Union, Dict
-from nonebot.adapters.cqhttp import MessageEvent, PrivateMessageEvent, GroupMessageEvent
+from nonebot.adapters.onebot.v11 import MessageEvent, PrivateMessageEvent, GroupMessageEvent
 
 
 class WithdrawMessageManager: