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/hitokoto.py | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
(limited to 'ATRI/plugins/hitokoto.py')
diff --git a/ATRI/plugins/hitokoto.py b/ATRI/plugins/hitokoto.py
index 1078ca3..09ff2c4 100644
--- a/ATRI/plugins/hitokoto.py
+++ b/ATRI/plugins/hitokoto.py
@@ -4,14 +4,14 @@ from nonebot.adapters.cqhttp import Bot, MessageEvent
from ATRI.rule import is_in_service, to_bot
from ATRI.service import Service as sv
-from ATRI.exceptions import RequestTimeOut
+from ATRI.exceptions import RequestError
from ATRI.utils.list import count_list, del_list_aim
from ATRI.utils.request import get_bytes
URL = [
"https://cdn.jsdelivr.net/gh/hitokoto-osc/sentences-bundle@1.0.84/sentences/a.json",
"https://cdn.jsdelivr.net/gh/hitokoto-osc/sentences-bundle@1.0.84/sentences/b.json",
- "https://cdn.jsdelivr.net/gh/hitokoto-osc/sentences-bundle@1.0.84/sentences/c.json",
+ "https://cdn.jsdelivr.net/gh/hitokoto-osc/sentences-bundle@1.0.84/sentences/c.json"
]
sick_list = []
@@ -24,10 +24,12 @@ __doc__ = """
"""
hitokoto = sv.on_command(
- cmd="一言", aliases={"抑郁一下", "网抑云"}, docs=__doc__, rule=is_in_service("一言") & to_bot()
+ cmd='一言',
+ aliases={'抑郁一下', '网抑云'},
+ docs=__doc__,
+ rule=is_in_service('一言') & to_bot()
)
-
@hitokoto.handle()
async def _hitokoto(bot: Bot, event: MessageEvent) -> None:
global sick_list
@@ -39,13 +41,16 @@ async def _hitokoto(bot: Bot, event: MessageEvent) -> None:
await hitokoto.finish("额......需要咱安慰一下嘛~？")
elif count_list(sick_list, user) == 6:
sick_list = del_list_aim(sick_list, user)
- msg = "如果心里感到难受就赶快去睡觉！别再憋自己了！\n" "我...我会守在你身边的！...嗯..一定"
+ msg = (
+ "如果心里感到难受就赶快去睡觉！别再憋自己了！\n"
+ "我...我会守在你身边的！...嗯..一定"
+ )
await hitokoto.finish(msg)
else:
sick_list.append(user)
url = choice(URL)
try:
data = json.loads(await get_bytes(url))
- except RequestTimeOut:
- raise RequestTimeOut("Request failed!")
- await hitokoto.finish(data[randint(1, len(data) - 1)]["hitokoto"])
+ except RequestError:
+ raise RequestError("Request failed!")
+ await hitokoto.finish(data[randint(1, len(data) - 1)]['hitokoto'])
--
cgit v1.2.3