🧑‍💻 使用 Ruff 包办所有格式化和检查 (#663)

nonebot_bison/sub_manager/__init__.py

@@ -2,23 +2,25 @@ import asyncio
 from datetime import datetime
 
 from nonebot import on_command
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.rule import Rule, to_me
-from nonebot.permission import SUPERUSER
-from nonebot_plugin_saa import TargetQQGroup
-from nonebot.params import ArgStr, ArgPlainText
 from nonebot.adapters import Bot, MessageTemplate
 from nonebot.adapters.onebot.v11.event import PrivateMessageEvent
+from nonebot.matcher import Matcher
+from nonebot.params import ArgPlainText, ArgStr
+from nonebot.permission import SUPERUSER
+from nonebot.rule import Rule, to_me
+from nonebot.typing import T_State
+from nonebot_plugin_saa import TargetQQGroup
 
+from .add_cookie import do_add_cookie
+from .add_cookie_target import do_add_cookie_target
 from .add_sub import do_add_sub
+from .del_cookie import do_del_cookie
+from .del_cookie_target import do_del_cookie_target
 from .del_sub import do_del_sub
 from .query_sub import do_query_sub
-from .add_cookie import do_add_cookie
-from .del_cookie import do_del_cookie
-from .add_cookie_target import do_add_cookie_target
-from .del_cookie_target import do_del_cookie_target
-from .utils import common_platform, admin_permission, gen_handle_cancel, configurable_to_me, set_target_user_info
+from .utils import admin_permission, common_platform, configurable_to_me, gen_handle_cancel, set_target_user_info
+
+_COMMAND_DISPATCH_TASKS: set[asyncio.Task] = set()
 
 add_sub_matcher = on_command(
     "添加订阅",
@@ -149,7 +151,10 @@ async def do_dispatch_command(
     else:
         do_del_sub(new_matcher)
     new_matcher_ins = new_matcher()
-    asyncio.create_task(new_matcher_ins.run(bot, event, state))
+
+    task = asyncio.create_task(new_matcher_ins.run(bot, event, state))
+    _COMMAND_DISPATCH_TASKS.add(task)
+    task.add_done_callback(_COMMAND_DISPATCH_TASKS.discard)
 
 
 no_permission_matcher = on_command(
@@ -167,14 +172,14 @@ async def send_no_permission():
 
 
 __all__ = [
-    "common_platform",
+    "add_cookie_matcher",
+    "add_cookie_target_matcher",
     "add_sub_matcher",
-    "query_sub_matcher",
+    "common_platform",
+    "del_cookie_matcher",
+    "del_cookie_target_matcher",
     "del_sub_matcher",
     "group_manage_matcher",
     "no_permission_matcher",
-    "add_cookie_matcher",
-    "add_cookie_target_matcher",
-    "del_cookie_target_matcher",
-    "del_cookie_matcher",
+    "query_sub_matcher",
 ]

nonebot_bison/sub_manager/add_cookie.py

@@ -1,16 +1,17 @@
-from typing import cast
 from json import JSONDecodeError
+from typing import cast
 
+from nonebot.adapters import Message, MessageTemplate
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.log import logger
-from nonebot.typing import T_State
 from nonebot.matcher import Matcher
 from nonebot.params import Arg, ArgPlainText
-from nonebot.adapters.onebot.v11 import MessageEvent
-from nonebot.adapters import Message, MessageTemplate
+from nonebot.typing import T_State
+
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.scheduler import scheduler_dict
+from nonebot_bison.utils.site import CookieClientManager, is_cookie_client_manager
 
-from ..scheduler import scheduler_dict
-from ..platform import platform_manager
-from ..utils.site import CookieClientManager, is_cookie_client_manager
 from .utils import common_platform, gen_handle_cancel, only_allow_private
 
 

nonebot_bison/sub_manager/add_cookie_target.py

@@ -1,14 +1,15 @@
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.params import ArgPlainText
-from nonebot_plugin_saa import MessageFactory
 from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.internal.adapter import MessageTemplate
+from nonebot.matcher import Matcher
+from nonebot.params import ArgPlainText
+from nonebot.typing import T_State
+from nonebot_plugin_saa import MessageFactory
 
-from ..config import config
-from ..utils import parse_text
-from ..platform import platform_manager
-from .utils import gen_handle_cancel, only_allow_private, generate_sub_list_text
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.utils import parse_text
+
+from .utils import gen_handle_cancel, generate_sub_list_text, only_allow_private
 
 
 def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
@@ -33,7 +34,6 @@ def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
 
     @add_cookie_target_matcher.handle()
     async def init_promote_cookie(state: T_State):
-
         # 获取 site 的所有用户 cookie，再排除掉已经关联的 cookie，剩下的就是可以关联的 cookie
         cookies = await config.get_cookie(site_name=state["site"].name, is_anonymous=False)
         associated_cookies = await config.get_cookie(

nonebot_bison/sub_manager/add_sub.py

@@ -1,17 +1,18 @@
 import contextlib
 
-from nonebot.typing import T_State
+from nonebot.adapters import Message, MessageTemplate
 from nonebot.matcher import Matcher
 from nonebot.params import Arg, ArgPlainText
-from nonebot.adapters import Message, MessageTemplate
-from nonebot_plugin_saa import Text, PlatformTarget, SupportedAdapters
+from nonebot.typing import T_State
+from nonebot_plugin_saa import PlatformTarget, SupportedAdapters, Text
+
+from nonebot_bison.apis import check_sub_target
+from nonebot_bison.config import config
+from nonebot_bison.config.db_config import SubscribeDupException
+from nonebot_bison.platform import Platform, platform_manager, unavailable_paltforms
+from nonebot_bison.types import Target
 
-from ..types import Target
-from ..config import config
-from ..apis import check_sub_target
-from ..config.db_config import SubscribeDupException
 from .utils import common_platform, ensure_user_info, gen_handle_cancel
-from ..platform import Platform, platform_manager, unavailable_paltforms
 
 
 def do_add_sub(add_sub: type[Matcher]):

nonebot_bison/sub_manager/del_cookie.py

@@ -1,11 +1,12 @@
-from nonebot.typing import T_State
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.matcher import Matcher
 from nonebot.params import EventPlainText
+from nonebot.typing import T_State
 from nonebot_plugin_saa import MessageFactory
-from nonebot.adapters.onebot.v11 import MessageEvent
 
-from ..config import config
-from ..utils import parse_text
+from nonebot_bison.config import config
+from nonebot_bison.utils import parse_text
+
 from .utils import gen_handle_cancel, only_allow_private
 
 

nonebot_bison/sub_manager/del_cookie_target.py

@@ -1,11 +1,12 @@
-from nonebot.typing import T_State
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.matcher import Matcher
 from nonebot.params import EventPlainText
+from nonebot.typing import T_State
 from nonebot_plugin_saa import MessageFactory
-from nonebot.adapters.onebot.v11 import MessageEvent
 
-from ..config import config
-from ..utils import parse_text
+from nonebot_bison.config import config
+from nonebot_bison.utils import parse_text
+
 from .utils import gen_handle_cancel, only_allow_private
 
 

nonebot_bison/sub_manager/del_sub.py

@@ -1,12 +1,13 @@
-from nonebot.typing import T_State
 from nonebot.matcher import Matcher
 from nonebot.params import Arg, EventPlainText
+from nonebot.typing import T_State
 from nonebot_plugin_saa import MessageFactory, PlatformTarget
 
-from ..config import config
-from ..types import Category
-from ..utils import parse_text
-from ..platform import platform_manager
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.types import Category
+from nonebot_bison.utils import parse_text
+
 from .utils import ensure_user_info, gen_handle_cancel
 
 

nonebot_bison/sub_manager/query_sub.py

@@ -1,12 +1,13 @@
-from nonebot.params import Arg
 from nonebot.matcher import Matcher
+from nonebot.params import Arg
 from nonebot_plugin_saa import MessageFactory, PlatformTarget
 
-from ..config import config
-from ..types import Category
-from ..utils import parse_text
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.types import Category
+from nonebot_bison.utils import parse_text
+
 from .utils import ensure_user_info
-from ..platform import platform_manager
 
 
 def do_query_sub(query_sub: type[Matcher]):

nonebot_bison/sub_manager/utils.py

@@ -1,22 +1,22 @@
 import contextlib
-from typing import Annotated
 from itertools import groupby
 from operator import attrgetter
+from typing import Annotated
 
-from nonebot.rule import Rule
 from nonebot.adapters import Event
-from nonebot.typing import T_State
 from nonebot.matcher import Matcher
+from nonebot.params import Depends, EventPlainText, EventToMe
 from nonebot.permission import SUPERUSER
-from nonebot.params import Depends, EventToMe, EventPlainText
+from nonebot.rule import Rule
+from nonebot.typing import T_State
 from nonebot_plugin_saa import PlatformTarget, extract_target
 
-from ..config import config
-from ..types import Category
-from ..types import Target as T_Target
-from ..platform import platform_manager
-from ..plugin_config import plugin_config
-from ..utils.site import is_cookie_client_manager
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.types import Category
+from nonebot_bison.types import Target as T_Target
+from nonebot_bison.utils.site import is_cookie_client_manager
 
 
 def _configurable_to_me(to_me: bool = EventToMe()):