Merge branch 'main' of https://github.com/Kyomotoi/ATRI into main

2 files changed, 24 insertions, 29 deletions

diff --git a/ATRI/plugins/setu/__init__.py b/ATRI/plugins/setu/__init__.py
index 7eb2c61..d67d75b 100644
--- a/ATRI/plugins/setu/__init__.py
+++ b/ATRI/plugins/setu/__init__.py
@@ -12,7 +12,10 @@ _setu_flmt = FreqLimiter(120)
 _setu_dlmt = DailyLimiter(5)
 
 
-random_setu = Setu().on_command("来张涩图", "来张随机涩图，冷却2分钟，每天限5张", aliases={"涩图来", "来点涩图", "来份涩图"})
+random_setu = Setu().on_command(
+    "来张涩图", "来张随机涩图，冷却2分钟，每天限5张", aliases={"涩图来", "来点涩图", "来份涩图"}
+)
+
 
 @random_setu.handle()
 async def _random_setu(bot: Bot, event: MessageEvent):
@@ -21,12 +24,9 @@ async def _random_setu(bot: Bot, event: MessageEvent):
         await random_setu.finish()
     if not _setu_dlmt.check(user_id):
         await random_setu.finish()
-    
+
     setu, title, p_id = await Setu().random_setu()
-    repo = (
-        f"Title: {title}\n"
-        f"Pid: {p_id}"
-    )
+    repo = f"Title: {title}\n" f"Pid: {p_id}"
     await bot.send(event, repo)
     msg_1 = await bot.send(event, Message(setu))
     event_id = msg_1["message_id"]
@@ -38,6 +38,7 @@ async def _random_setu(bot: Bot, event: MessageEvent):
 
 tag_setu = Setu().on_regex(r"来[张点丶份](.*?)的[涩色🐍]图", "根据提供的tag查找涩图")
 
+
 @tag_setu.handle()
 async def _tag_setu(bot: Bot, event: MessageEvent):
     user_id = event.get_user_id()
@@ -45,18 +46,15 @@ async def _tag_setu(bot: Bot, event: MessageEvent):
         await random_setu.finish()
     if not _setu_dlmt.check(user_id):
         await random_setu.finish()
-    
+
     msg = str(event.message).strip()
     pattern = r"来[张点丶份](.*?)的[涩色🐍]图"
     tag = re.findall(pattern, msg)[0]
     setu, title, p_id, is_ok = await Setu().tag_setu(tag)
     if not is_ok:
         await tag_setu.finish(f"没有 {tag} 的涩图呢...")
-    repo_0 = (
-        f"Title: {title}\n"
-        f"Pid: {p_id}"
-    )
-    
+    repo_0 = f"Title: {title}\n" f"Pid: {p_id}"
+
     await bot.send(event, repo_0)
     msg_1 = await bot.send(event, Message(setu))
     event_id = msg_1["message_id"]
@@ -77,6 +75,6 @@ async def _scheduler_setu(bot):
         message_id = msg_0["message_id"]
         await asyncio.sleep(60)
         await bot.delete_msg(message_id=message_id)
-        
+
     except BaseException:
         pass
diff --git a/ATRI/plugins/setu/data_source.py b/ATRI/plugins/setu/data_source.py
index 22fa69f..47f76b6 100644
--- a/ATRI/plugins/setu/data_source.py
+++ b/ATRI/plugins/setu/data_source.py
@@ -1,4 +1,5 @@
 import base64
+
 # from pathlib import Path
 from random import choice
 from nonebot.adapters.cqhttp import MessageSegment
@@ -16,10 +17,9 @@ SCHEDULER_FORMAT = """
 
 
 class Setu(Service):
-    
     def __init__(self):
         Service.__init__(self, "涩图", "hso!", rule=is_in_service("涩图"))
-    
+
     @staticmethod
     async def random_setu() -> tuple:
         """
@@ -28,14 +28,14 @@ class Setu(Service):
         res = await request.get(LOLICON_URL)
         data: dict = await res.json()
         temp_data: dict = data.get("data", list())[0]
-        
-        title = temp_data.get("title", "木陰のねこ")        
+
+        title = temp_data.get("title", "木陰のねこ")
         p_id = temp_data.get("pid", 88124144)
         url = temp_data["urls"].get("original", "ignore")
-        
+
         setu = MessageSegment.image(url, timeout=114514)
         return setu, title, p_id
-    
+
     @staticmethod
     async def tag_setu(tag: str) -> tuple:
         """
@@ -44,18 +44,18 @@ class Setu(Service):
         url = LOLICON_URL + f"?tag={tag}"
         res = await request.get(url)
         data: dict = await res.json()
-        
+
         temp_data: dict = data.get("data", list())[0]
         if not temp_data:
             is_ok = False
         is_ok = True
-        
-        title = temp_data.get("title", "木陰のねこ")  
+
+        title = temp_data.get("title", "木陰のねこ")
         p_id = temp_data.get("pid", 88124144)
         url = temp_data["urls"].get("original", "ignore")
         setu = MessageSegment.image(url, timeout=114514)
         return setu, title, p_id, is_ok
-    
+
     @staticmethod
     async def scheduler() -> str:
         """
@@ -67,13 +67,10 @@ class Setu(Service):
         res = await request.get(LOLICON_URL)
         data: dict = await res.json()
         temp_data: dict = data.get("data", list())[0]
-        
+
         tag = choice(temp_data.get("tags", ["女孩子"]))
-        
+
         url = temp_data["urls"].get("original", "ignore")
         setu = MessageSegment.image(url, timeout=114514)
-        repo = SCHEDULER_FORMAT.format(
-            tag=tag,
-            setu=setu
-        )
+        repo = SCHEDULER_FORMAT.format(tag=tag, setu=setu)
         return repo