From 895f9756093329a0f99188096b3dd5bc11a18128 Mon Sep 17 00:00:00 2001 From: Kyomotoi <1172294279@qq.com> Date: Sat, 24 Apr 2021 16:26:57 +0800 Subject: =?UTF-8?q?=F0=9F=8E=A8=20=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/manage/__init__.py | 6 +++--- ATRI/plugins/manage/modules/debug.py | 1 - ATRI/plugins/manage/modules/dormant.py | 4 ++-- ATRI/plugins/manage/modules/request.py | 13 ++++++------- 4 files changed, 11 insertions(+), 13 deletions(-) (limited to 'ATRI/plugins/manage') diff --git a/ATRI/plugins/manage/__init__.py b/ATRI/plugins/manage/__init__.py index c60171e..d9f1ffe 100644 --- a/ATRI/plugins/manage/__init__.py +++ b/ATRI/plugins/manage/__init__.py @@ -1,8 +1,8 @@ -import nonebot as nb +import nonebot from pathlib import Path _sub_plugins = set() -_sub_plugins |= nb.load_plugins( - str((Path(__file__).parent / 'modules').resolve())) +_sub_plugins |= nonebot.load_plugins( + str((Path(__file__).parent / 'modules').resolve())) diff --git a/ATRI/plugins/manage/modules/debug.py b/ATRI/plugins/manage/modules/debug.py index 66a84cf..53b75b7 100644 --- a/ATRI/plugins/manage/modules/debug.py +++ b/ATRI/plugins/manage/modules/debug.py @@ -3,7 +3,6 @@ from aiohttp import FormData from nonebot.typing import T_State from nonebot.permission import SUPERUSER from nonebot.adapters.cqhttp import Bot, MessageEvent -from nonebot.adapters.cqhttp.message import MessageSegment from ATRI.service import Service as sv from ATRI.log import LOGGER_DIR, NOW_TIME diff --git a/ATRI/plugins/manage/modules/dormant.py b/ATRI/plugins/manage/modules/dormant.py index 5274eaa..68d14f9 100644 --- a/ATRI/plugins/manage/modules/dormant.py +++ b/ATRI/plugins/manage/modules/dormant.py @@ -22,7 +22,7 @@ async def _dormant_enabled(bot: Bot, event: MessageEvent) -> None: sv.Dormant.control_dormant(True) msg = "已进入休眠状态...期间咱不会回应任何人的消息哦..." await dormant_enabled.finish(msg) - + __doc__ = """ 苏醒，开始处理信息 @@ -41,4 +41,4 @@ dormant_disabled = sv.on_command( async def _dormant_disabled(bot: Bot, event: MessageEvent) -> None: sv.Dormant.control_dormant(False) msg = "唔...早上好...——哇哈哈" - await dormant_disabled.finish(msg) \ No newline at end of file + await dormant_disabled.finish(msg) diff --git a/ATRI/plugins/manage/modules/request.py b/ATRI/plugins/manage/modules/request.py index c90ed66..843a94e 100644 --- a/ATRI/plugins/manage/modules/request.py +++ b/ATRI/plugins/manage/modules/request.py @@ -2,7 +2,6 @@ import re import json from pathlib import Path -from nonebot.typing import T_State from nonebot.permission import SUPERUSER from nonebot.adapters.cqhttp import Bot, MessageEvent @@ -27,7 +26,7 @@ req_list = sv.on_command( ) @req_list.handle() -async def _req_list(bot: Bot, event: MessageEvent, state: T_State) -> None: +async def _req_list(bot: Bot, event: MessageEvent) -> None: path_f = ESSENTIAL_DIR / 'request_friend.json' path_g = ESSENTIAL_DIR / 'request_group.json' data_f, data_g = dict() @@ -64,7 +63,7 @@ req_deal = sv.on_regex( ) @req_deal.handle() -async def _req_deal(bot: Bot, event: MessageEvent, state: T_State) -> None: +async def _req_deal(bot: Bot, event: MessageEvent) -> None: msg = str(event.message).split(' ') arg = re.findall(r'[同意|拒绝][好友|群]申请', msg[0]) app = arg[0] @@ -86,7 +85,7 @@ async def _req_deal(bot: Bot, event: MessageEvent, state: T_State) -> None: try: await bot.set_friend_add_request(flag=reqid, approve=True) - await req_deal.finish(f"完成~！已同意申请") + await req_deal.finish('完成~！已同意申请') except FormatError: await req_deal.finish('请检查输入的值是否正确——！') elif _type == "群": @@ -94,7 +93,7 @@ async def _req_deal(bot: Bot, event: MessageEvent, state: T_State) -> None: await bot.set_group_add_request(flag=reqid, sub_type=data_g[reqid]['sub_type'], approve=True) - await req_deal.finish(f"完成~！已同意申请") + await req_deal.finish('完成~！已同意申请') except FormatError: await req_deal.finish('请检查输入的值是否正确——！') else: @@ -104,7 +103,7 @@ async def _req_deal(bot: Bot, event: MessageEvent, state: T_State) -> None: try: await bot.set_friend_add_request(flag=reqid, approve=False) - await req_deal.finish(f"完成~！已拒绝申请") + await req_deal.finish('完成~！已拒绝申请') except FormatError: await req_deal.finish('请检查输入的值是否正确——！') elif _type == "群": @@ -112,7 +111,7 @@ async def _req_deal(bot: Bot, event: MessageEvent, state: T_State) -> None: await bot.set_group_add_request(flag=reqid, sub_type=data_g[reqid]['sub_type'], approve=False) - await req_deal.finish(f"完成~！已拒绝申请") + await req_deal.finish('完成~！已拒绝申请') except FormatError: await req_deal.finish('请检查输入的值是否正确——！') else: -- cgit v1.2.3