Develop: 完全使用 ruff 替代 isort 与 black (#1757)

* 🚨 完全使用 ruff 替代 isort 与 black

* 🚨 ruff lint&format

zhenxun/builtin_plugins/admin/admin_help/__init__.py

@@ -1,18 +1,18 @@
 from nonebot.plugin import PluginMetadata
-from nonebot_plugin_session import EventSession
 from nonebot_plugin_alconna import Alconna, Arparma, on_alconna
+from nonebot_plugin_session import EventSession
 
-from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
+from zhenxun.configs.utils import PluginExtraData, RegisterConfig
+from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.exception import EmptyError
 from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.rules import admin_check, ensure_group
-from zhenxun.configs.utils import RegisterConfig, PluginExtraData
 
-from .normal_help import build_help
 from .config import ADMIN_HELP_IMAGE
 from .html_help import build_html_help
+from .normal_help import build_help
 
 __plugin_meta__ = PluginMetadata(
     name="群组管理员帮助",

zhenxun/builtin_plugins/admin/admin_help/config.py

@@ -1,8 +1,8 @@
-from pydantic import BaseModel
 from nonebot.plugin import PluginMetadata
+from pydantic import BaseModel
 
-from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.configs.path_config import IMAGE_PATH
+from zhenxun.models.plugin_info import PluginInfo
 
 ADMIN_HELP_IMAGE = IMAGE_PATH / "ADMIN_HELP.png"
 if ADMIN_HELP_IMAGE.exists():

zhenxun/builtin_plugins/admin/admin_help/html_help.py

@@ -1,10 +1,10 @@
 from nonebot_plugin_htmlrender import template_to_pic
 
+from zhenxun.builtin_plugins.admin.admin_help.config import ADMIN_HELP_IMAGE
 from zhenxun.configs.config import BotConfig
+from zhenxun.configs.path_config import TEMPLATE_PATH
 from zhenxun.models.task_info import TaskInfo
 from zhenxun.utils._build_image import BuildImage
-from zhenxun.configs.path_config import TEMPLATE_PATH
-from zhenxun.builtin_plugins.admin.admin_help.config import ADMIN_HELP_IMAGE
 
 from .utils import get_plugins
 

zhenxun/builtin_plugins/admin/admin_help/normal_help.py

@@ -1,14 +1,14 @@
-from PIL.ImageFont import FreeTypeFont
 from nonebot.plugin import PluginMetadata
+from PIL.ImageFont import FreeTypeFont
 
-from zhenxun.services.log import logger
-from zhenxun.models.task_info import TaskInfo
 from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.task_info import TaskInfo
+from zhenxun.services.log import logger
 from zhenxun.utils._build_image import BuildImage
-from zhenxun.utils.image_utils import text2image, group_image, build_sort_image
+from zhenxun.utils.image_utils import build_sort_image, group_image, text2image
 
-from .utils import get_plugins
 from .config import ADMIN_HELP_IMAGE
+from .utils import get_plugins
 
 
 async def build_usage_des_image(

zhenxun/builtin_plugins/admin/admin_help/utils.py

@@ -1,8 +1,8 @@
 import nonebot
 
+from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.exception import EmptyError
-from zhenxun.models.plugin_info import PluginInfo
 
 from .config import PluginData
 

zhenxun/builtin_plugins/admin/admin_watch.py

@@ -1,13 +1,13 @@
 from nonebot import on_notice
-from nonebot.plugin import PluginMetadata
 from nonebot.adapters.onebot.v11 import GroupAdminNoticeEvent
+from nonebot.plugin import PluginMetadata
 
-from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
+from zhenxun.configs.utils import PluginExtraData, RegisterConfig
+from zhenxun.models.level_user import LevelUser
+from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.rules import notice_rule
-from zhenxun.models.level_user import LevelUser
-from zhenxun.configs.utils import RegisterConfig, PluginExtraData
 
 __plugin_meta__ = PluginMetadata(
     name="群管理员变动监测",

zhenxun/builtin_plugins/admin/ban/__init__.py

@@ -2,23 +2,23 @@ from arclet.alconna import Args
 from nonebot.adapters import Bot
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
-from nonebot_plugin_session import EventSession
 from nonebot_plugin_alconna import (
+    Alconna,
+    Arparma,
     At,
     Match,
     Option,
-    Alconna,
-    Arparma,
     on_alconna,
     store_true,
 )
+from nonebot_plugin_session import EventSession
 
+from zhenxun.configs.config import BotConfig, Config
+from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
-from zhenxun.utils.rules import admin_check
 from zhenxun.utils.message import MessageUtils
-from zhenxun.configs.config import Config, BotConfig
-from zhenxun.configs.utils import RegisterConfig, PluginExtraData
+from zhenxun.utils.rules import admin_check
 
 from ._data_source import BanManage
 
@@ -175,10 +175,8 @@ async def _(
     _duration = duration.result * 60 if duration.available else -1
     _duration_text = f"{duration.result} 分钟" if duration.available else " 到世界湮灭"
     if (gid := session.id3 or session.id2) and not group_id.available:
-        if (
-            not user_id
-            or user_id == bot.self_id
-            and session.id1 not in bot.config.superusers
+        if not user_id or (
+            user_id == bot.self_id and session.id1 not in bot.config.superusers
         ):
             _duration = 0.5
             await MessageUtils.build_message("倒反天罡，小小管理速速退下！").send()

zhenxun/builtin_plugins/admin/ban/_data_source.py

@@ -3,8 +3,8 @@ from typing import Literal
 
 from nonebot_plugin_session import EventSession
 
-from zhenxun.models.level_user import LevelUser
 from zhenxun.models.ban_console import BanConsole
+from zhenxun.models.level_user import LevelUser
 from zhenxun.utils.image_utils import BuildImage, ImageTemplate
 
 

zhenxun/builtin_plugins/admin/group_member_update/__init__.py

@@ -1,19 +1,19 @@
 import nonebot
 from nonebot import on_notice
 from nonebot.adapters import Bot
-from nonebot.plugin import PluginMetadata
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_apscheduler import scheduler
-from nonebot_plugin_alconna import Alconna, Arparma, on_alconna
 from nonebot.adapters.onebot.v11 import GroupIncreaseNoticeEvent
+from nonebot.plugin import PluginMetadata
+from nonebot_plugin_alconna import Alconna, Arparma, on_alconna
+from nonebot_plugin_apscheduler import scheduler
+from nonebot_plugin_session import EventSession
 
+from zhenxun.configs.config import BotConfig
+from zhenxun.configs.utils import PluginExtraData
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
-from zhenxun.configs.config import BotConfig
 from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.platform import PlatformUtils
-from zhenxun.configs.utils import PluginExtraData
-from zhenxun.utils.rules import admin_check, notice_rule, ensure_group
+from zhenxun.utils.rules import admin_check, ensure_group, notice_rule
 
 from ._data_source import MemberUpdateManage
 

zhenxun/builtin_plugins/admin/group_member_update/_data_source.py

@@ -4,11 +4,11 @@ import nonebot
 from nonebot.adapters import Bot
 from nonebot_plugin_uninfo import Member, SceneType, get_interface
 
-from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
-from zhenxun.models.level_user import LevelUser
-from zhenxun.utils.platform import PlatformUtils
 from zhenxun.models.group_member_info import GroupInfoUser
+from zhenxun.models.level_user import LevelUser
+from zhenxun.services.log import logger
+from zhenxun.utils.platform import PlatformUtils
 
 
 class MemberUpdateManage:

zhenxun/builtin_plugins/admin/group_update.py

@@ -41,5 +41,5 @@ async def _(bot: Bot, session: EventSession, arparma: Arparma):
     try:
         await PlatformUtils.update_group(bot)
         await MessageUtils.build_message("已经成功更新了群组信息!").send(reply_to=True)
-    except Exception as e:
+    except Exception:
         await MessageUtils.build_message("更新群组信息失败!").finish(reply_to=True)

zhenxun/builtin_plugins/admin/plugin_switch/__init__.py

@@ -1,16 +1,16 @@
 from nonebot.adapters import Bot
 from nonebot.plugin import PluginMetadata
+from nonebot_plugin_alconna import AlconnaQuery, Arparma, Match, Query
 from nonebot_plugin_session import EventSession
-from nonebot_plugin_alconna import Match, Query, Arparma, AlconnaQuery
 
-from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
-from zhenxun.utils.message import MessageUtils
+from zhenxun.configs.utils import PluginExtraData, RegisterConfig
+from zhenxun.services.log import logger
 from zhenxun.utils.enum import BlockType, PluginType
-from zhenxun.configs.utils import RegisterConfig, PluginExtraData
+from zhenxun.utils.message import MessageUtils
 
-from .command import _status_matcher, _group_status_matcher
-from ._data_source import PluginManage, build_task, build_plugin, delete_help_image
+from ._data_source import PluginManage, build_plugin, build_task, delete_help_image
+from .command import _group_status_matcher, _status_matcher
 
 base_config = Config.get("plugin_switch")
 

zhenxun/builtin_plugins/admin/plugin_switch/_data_source.py

@@ -1,10 +1,10 @@
-from zhenxun.models.task_info import TaskInfo
-from zhenxun.models.plugin_info import PluginInfo
-from zhenxun.utils.enum import BlockType, PluginType
-from zhenxun.models.group_console import GroupConsole
-from zhenxun.utils.exception import GroupInfoNotFound
 from zhenxun.configs.path_config import DATA_PATH, IMAGE_PATH
-from zhenxun.utils.image_utils import RowStyle, BuildImage, ImageTemplate
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.task_info import TaskInfo
+from zhenxun.utils.enum import BlockType, PluginType
+from zhenxun.utils.exception import GroupInfoNotFound
+from zhenxun.utils.image_utils import BuildImage, ImageTemplate, RowStyle
 
 HELP_FILE = IMAGE_PATH / "SIMPLE_HELP.png"
 
@@ -35,12 +35,8 @@ def plugin_row_style(column: str, text: str) -> RowStyle:
         RowStyle: RowStyle
     """
     style = RowStyle()
-    if (
-        column == "全局状态"
-        and text == "开启"
-        or column != "全局状态"
-        and column == "加载状态"
-        and text == "SUCCESS"
+    if (column == "全局状态" and text == "开启") or (
+        column != "全局状态" and column == "加载状态" and text == "SUCCESS"
     ):
         style.font_color = "#67C23A"
     elif column in {"全局状态", "加载状态"}:

zhenxun/builtin_plugins/admin/welcome_message.py

@@ -1,21 +1,21 @@
-import shutil
 from pathlib import Path
+import shutil
 from typing import Annotated
 
-import ujson as json
 from nonebot import on_command
 from nonebot.params import Command
 from nonebot.plugin import PluginMetadata
+from nonebot_plugin_alconna import Image, Text, UniMsg
 from nonebot_plugin_session import EventSession
-from nonebot_plugin_alconna import Text, Image, UniMsg
+import ujson as json
 
-from zhenxun.services.log import logger
 from zhenxun.configs.config import Config
+from zhenxun.configs.path_config import DATA_PATH
+from zhenxun.configs.utils import PluginExtraData, RegisterConfig
+from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.http_utils import AsyncHttpx
-from zhenxun.configs.path_config import DATA_PATH
 from zhenxun.utils.rules import admin_check, ensure_group
-from zhenxun.configs.utils import RegisterConfig, PluginExtraData
 
 base_config = Config.get("admin_bot_manage")