From 2926a46ae87fc5e02777140e0c9ec1e7c4f94989 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Sun, 4 Aug 2024 23:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BC=98=E5=8C=96=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/scheduler/auto_update_group.py | 3 --- zhenxun/builtin_plugins/scheduler/morning.py | 1 - zhenxun/builtin_plugins/shop/_data_source.py | 6 +++--- zhenxun/builtin_plugins/sign_in/__init__.py | 1 - zhenxun/builtin_plugins/sign_in/_data_source.py | 1 - zhenxun/builtin_plugins/sign_in/goods_register.py | 1 - zhenxun/builtin_plugins/superuser/fg_manage.py | 5 +---- zhenxun/builtin_plugins/superuser/group_manage.py | 2 +- 8 files changed, 5 insertions(+), 15 deletions(-) diff --git a/zhenxun/builtin_plugins/scheduler/auto_update_group.py b/zhenxun/builtin_plugins/scheduler/auto_update_group.py index 2a8c5fe2..8e62bc69 100644 --- a/zhenxun/builtin_plugins/scheduler/auto_update_group.py +++ b/zhenxun/builtin_plugins/scheduler/auto_update_group.py @@ -1,8 +1,6 @@ import nonebot from nonebot_plugin_apscheduler import scheduler -from zhenxun.models.friend_user import FriendUser -from zhenxun.models.group_console import GroupConsole from zhenxun.services.log import logger from zhenxun.utils.platform import PlatformUtils @@ -15,7 +13,6 @@ from zhenxun.utils.platform import PlatformUtils ) async def _(): bots = nonebot.get_bots() - _used_group = [] for bot in bots.values(): try: await PlatformUtils.update_group(bot) diff --git a/zhenxun/builtin_plugins/scheduler/morning.py b/zhenxun/builtin_plugins/scheduler/morning.py index 1a7aac6a..c254d5e8 100644 --- a/zhenxun/builtin_plugins/scheduler/morning.py +++ b/zhenxun/builtin_plugins/scheduler/morning.py @@ -6,7 +6,6 @@ from nonebot_plugin_saa import Image from zhenxun.configs.config import NICKNAME from zhenxun.configs.path_config import IMAGE_PATH from zhenxun.configs.utils import PluginExtraData, Task -from zhenxun.models.group_console import GroupConsole from zhenxun.models.task_info import TaskInfo from zhenxun.services.log import logger from zhenxun.utils.enum import PluginType diff --git a/zhenxun/builtin_plugins/shop/_data_source.py b/zhenxun/builtin_plugins/shop/_data_source.py index e6e0d9cc..94f92433 100644 --- a/zhenxun/builtin_plugins/shop/_data_source.py +++ b/zhenxun/builtin_plugins/shop/_data_source.py @@ -2,7 +2,7 @@ import asyncio import inspect import time from types import MappingProxyType -from typing import Any, Callable, Dict, Literal +from typing import Any, Callable, Literal from nonebot.adapters import Bot, Event from nonebot_plugin_alconna import UniMsg @@ -70,7 +70,7 @@ class ShopParam(BaseModel): class ShopManage: - uuid2goods: Dict[str, Goods] = {} + uuid2goods: dict[str, Goods] = {} @classmethod def __build_params( @@ -82,7 +82,7 @@ class ShopManage: goods: Goods, num: int, text: str, - ) -> tuple[ShopParam, Dict[str, Any]]: + ) -> tuple[ShopParam, dict[str, Any]]: """构造参数 参数: diff --git a/zhenxun/builtin_plugins/sign_in/__init__.py b/zhenxun/builtin_plugins/sign_in/__init__.py index 5818852f..3eabb3f4 100644 --- a/zhenxun/builtin_plugins/sign_in/__init__.py +++ b/zhenxun/builtin_plugins/sign_in/__init__.py @@ -10,7 +10,6 @@ from nonebot_plugin_alconna import ( from nonebot_plugin_apscheduler import scheduler from nonebot_plugin_saa import Image, Text from nonebot_plugin_session import EventSession -from nonebot_plugin_userinfo import EventUserInfo, UserInfo from zhenxun.configs.utils import PluginCdBlock, PluginExtraData, RegisterConfig from zhenxun.services.log import logger diff --git a/zhenxun/builtin_plugins/sign_in/_data_source.py b/zhenxun/builtin_plugins/sign_in/_data_source.py index 0607619c..3fdf38f2 100644 --- a/zhenxun/builtin_plugins/sign_in/_data_source.py +++ b/zhenxun/builtin_plugins/sign_in/_data_source.py @@ -5,7 +5,6 @@ from pathlib import Path import pytz from nonebot_plugin_session import EventSession -from tortoise.functions import Count from zhenxun.configs.path_config import IMAGE_PATH from zhenxun.models.friend_user import FriendUser diff --git a/zhenxun/builtin_plugins/sign_in/goods_register.py b/zhenxun/builtin_plugins/sign_in/goods_register.py index 80beafec..b73cffc0 100644 --- a/zhenxun/builtin_plugins/sign_in/goods_register.py +++ b/zhenxun/builtin_plugins/sign_in/goods_register.py @@ -4,7 +4,6 @@ import nonebot from nonebot.drivers import Driver from nonebot_plugin_session import EventSession -from zhenxun.configs.config import Config from zhenxun.models.sign_user import SignUser from zhenxun.models.user_console import UserConsole from zhenxun.utils.decorator.shop import NotMeetUseConditionsException, shop_register diff --git a/zhenxun/builtin_plugins/superuser/fg_manage.py b/zhenxun/builtin_plugins/superuser/fg_manage.py index fe17f8f3..e2d30344 100644 --- a/zhenxun/builtin_plugins/superuser/fg_manage.py +++ b/zhenxun/builtin_plugins/superuser/fg_manage.py @@ -4,13 +4,10 @@ from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata from nonebot.rule import to_me from nonebot_plugin_alconna import Alconna, on_alconna -from nonebot_plugin_alconna.matcher import AlconnaMatcher from nonebot_plugin_saa import Text from nonebot_plugin_session import EventSession -from zhenxun.configs.config import Config -from zhenxun.configs.path_config import DATA_PATH -from zhenxun.configs.utils import ConfigModel, PluginExtraData +from zhenxun.configs.utils import PluginExtraData from zhenxun.services.log import logger from zhenxun.utils.enum import PluginType from zhenxun.utils.rules import admin_check, ensure_group diff --git a/zhenxun/builtin_plugins/superuser/group_manage.py b/zhenxun/builtin_plugins/superuser/group_manage.py index fe3d2ce9..1b207c58 100644 --- a/zhenxun/builtin_plugins/superuser/group_manage.py +++ b/zhenxun/builtin_plugins/superuser/group_manage.py @@ -44,7 +44,7 @@ __plugin_meta__ = PluginMetadata( 示例: 修改群权限 7 : 在群组中修改当前群组权限为7 - group-manage modify-level 7 1234556 : 修改 123456 群组的权限等级为7 + 修改群权限 7 1234556 : 修改 123456 群组的权限等级为7 添加/删除群白名单 1234567 : 添加/删除 1234567 为群白名单 添加/删除群认证 1234567 : 添加/删除 1234567 为群认证 退群 12344566 : 退出指定群组