From ea7f48011c34fdaec7e91af7eb373c8174e439e6 Mon Sep 17 00:00:00 2001 From: Kyomotoi <1172294279@qq.com> Date: Tue, 4 May 2021 14:27:56 +0800 Subject: =?UTF-8?q?=E2=9C=A8=F0=9F=90=9B=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增：老婆！ 新增：涩图 修复：manage中出现的bug 优化：nsfw不再用float，换为int --- ATRI/plugins/curse/__init__.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'ATRI/plugins/curse/__init__.py') diff --git a/ATRI/plugins/curse/__init__.py b/ATRI/plugins/curse/__init__.py index acfaa9b..a646eaa 100644 --- a/ATRI/plugins/curse/__init__.py +++ b/ATRI/plugins/curse/__init__.py @@ -4,7 +4,7 @@ from ATRI.service import Service as sv from ATRI.rule import is_in_service from ATRI.utils.list import count_list, del_list_aim from ATRI.utils.request import get_text -from ATRI.exceptions import RequestTimeOut +from ATRI.exceptions import RequestError URL = "https://zuanbot.com/api.php?level=min&lang=zh_cn" @@ -19,17 +19,23 @@ __doc__ = """ """ curse = sv.on_command( - cmd="口臭", docs=__doc__, aliases={"口臭一下，骂我"}, rule=is_in_service("口臭") + cmd='口臭', + docs=__doc__, + aliases={'口臭一下，骂我'}, + rule=is_in_service('口臭') ) - @curse.handle() async def _curse(bot: Bot, event: MessageEvent) -> None: global sick_list user = event.get_user_id() if count_list(sick_list, user) == 3: sick_list.append(user) - repo = "不是？？你这么想被咱骂的嘛？？" "被咱骂就这么舒服的吗？！" "该......你该不会是.....M吧！" + repo = ( + "不是？？你这么想被咱骂的嘛？？" + "被咱骂就这么舒服的吗？！" + "该......你该不会是.....M吧！" + ) await curse.finish(repo) elif count_list(sick_list, user) == 6: sick_list = del_list_aim(sick_list, user) @@ -38,5 +44,5 @@ async def _curse(bot: Bot, event: MessageEvent) -> None: sick_list.append(user) try: await curse.finish(await get_text(URL)) - except RequestTimeOut: - raise RequestTimeOut("Time out!") + except RequestError: + raise RequestError("Time out!") -- cgit v1.2.3