✨🐛 更新

新增：老婆！
新增：涩图

修复：manage中出现的bug

优化：nsfw不再用float，换为int

1 files changed, 13 insertions, 8 deletions

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/[email protected]/sentences/a.json",
     "https://cdn.jsdelivr.net/gh/hitokoto-osc/[email protected]/sentences/b.json",
-    "https://cdn.jsdelivr.net/gh/hitokoto-osc/[email protected]/sentences/c.json",
+    "https://cdn.jsdelivr.net/gh/hitokoto-osc/[email protected]/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'])