diff --git a/src/plugins/cave/__init__.py b/src/plugins/cave/__init__.py index 9613cbb..9e0b47c 100644 --- a/src/plugins/cave/__init__.py +++ b/src/plugins/cave/__init__.py @@ -1,19 +1,12 @@ import random import re import base64 -from nonebot import logger +from nonebot import get_driver, logger, on_command import requests -from nonebot.adapters.onebot.v11 import ( - Message, - Bot, - GroupMessageEvent, - PrivateMessageEvent, - MessageEvent, -) -from nonebot import on_command, get_driver -from nonebot.plugin import PluginMetadata -from nonebot.matcher import Matcher -from nonebot.params import CommandArg +from nonebot.adapters.onebot.v11 import Bot, Bot, GroupMessageEvent, GroupMessageEvent, Message, Message, MessageEvent, MessageEvent, PrivateMessageEvent, PrivateMessageEvent +from nonebot.plugin import PluginMetadata, PluginMetadata +from nonebot.matcher import Matcher, Matcher +from nonebot.params import CommandArg, CommandArg from .models import cave_models SUPERUSER = list(get_driver().config.superusers) diff --git a/src/plugins/ncm/data_source.py b/src/plugins/ncm/data_source.py index 5377a50..afa6f4f 100644 --- a/src/plugins/ncm/data_source.py +++ b/src/plugins/ncm/data_source.py @@ -13,6 +13,8 @@ import httpx import nonebot from nonebot.utils import run_sync +from nonebot.adapters.onebot.v11 import MessageSegment, Message, ActionFailed, NetworkError, Bot, GroupMessageEvent, PrivateMessageEvent +from nonebot.log import logger from pyncm import ( apis, @@ -23,17 +25,6 @@ ) from pyncm.apis.cloudsearch import SONG, USER, PLAYLIST -from nonebot.log import logger -from nonebot.adapters.onebot.v11 import ( - MessageSegment, - Message, - ActionFailed, - NetworkError, - Bot, - GroupMessageEvent, - PrivateMessageEvent, -) - from .config import ncm_config from tinydb import TinyDB, Query diff --git a/src/plugins/nonebot_plugin_setu_now/__init__.py b/src/plugins/nonebot_plugin_setu_now/__init__.py index 43c7b42..3db0d14 100755 --- a/src/plugins/nonebot_plugin_setu_now/__init__.py +++ b/src/plugins/nonebot_plugin_setu_now/__init__.py @@ -1,5 +1,11 @@ from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN from nonebot.permission import SUPERUSER +from nonebot import on_command, on_regex, require +from nonebot.adapters.onebot.v11 import GROUP, PRIVATE_FRIEND, Bot, Message, MessageEvent, MessageSegment, GroupMessageEvent, PrivateMessageEvent +from nonebot.exception import ActionFailed +from nonebot.log import logger +from nonebot.params import Depends, RegexGroup +from nonebot.plugin import PluginMetadata from .r18_whitelist import get_group_white_list_record from .data_source import SetuHandler from .perf_timer import PerfTimer @@ -20,27 +26,11 @@ autorevoke_send, ) from nonebot_plugin_tortoise_orm import add_model -from nonebot.adapters.onebot.v11 import ( - GROUP, - PRIVATE_FRIEND, - Bot, - Message, - MessageEvent, - MessageSegment, - GroupMessageEvent, - PrivateMessageEvent, -) -from nonebot.exception import ActionFailed -from nonebot.plugin import PluginMetadata -from nonebot.params import Depends, RegexGroup -from nonebot.log import logger -from nonebot import on_regex, on_command from PIL import UnidentifiedImageError from pathlib import Path from typing import Any, Union, Annotated from re import I, sub import asyncio -from nonebot import require require("nonebot_plugin_localstore") require("nonebot_plugin_tortoise_orm") diff --git a/src/plugins/nonebot_plugin_status/__init__.py b/src/plugins/nonebot_plugin_status/__init__.py index afff88b..72c9337 100644 --- a/src/plugins/nonebot_plugin_status/__init__.py +++ b/src/plugins/nonebot_plugin_status/__init__.py @@ -14,11 +14,11 @@ from typing import Any, Dict from jinja2 import Environment +from jinja2.meta import find_undeclared_variables from nonebot import get_driver from nonebot.matcher import Matcher from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata -from jinja2.meta import find_undeclared_variables from .config import Config from .helpers import humanize_date, relative_time, humanize_delta diff --git a/src/plugins/nonebot_plugin_wordcloud/__init__.py b/src/plugins/nonebot_plugin_wordcloud/__init__.py index e08a799..4d13e61 100644 --- a/src/plugins/nonebot_plugin_wordcloud/__init__.py +++ b/src/plugins/nonebot_plugin_wordcloud/__init__.py @@ -32,7 +32,7 @@ from nonebot.permission import SUPERUSER from nonebot.params import Arg, Depends from nonebot.adapters import Bot, Event, Message -from nonebot import get_driver +from nonebot import get_driver, require from arclet.alconna.arparma import Arparma from arclet.alconna import ArparmaBehavior import nonebot_plugin_saa as saa @@ -41,7 +41,6 @@ from io import BytesIO from datetime import datetime, timedelta import re -from nonebot import require require("nonebot_plugin_apscheduler") require("nonebot_plugin_alconna")