From 4c61105311af1ee74bdbe7eb3ff095336ec02a49 Mon Sep 17 00:00:00 2001 From: Kyomotoi <0w0@imki.moe> Date: Thu, 6 Apr 2023 14:57:57 +0800 Subject: =?UTF-8?q?=F0=9F=8E=A8=E2=9C=A8=20=E4=BC=98=E5=8C=96=E6=B6=A9?= =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81,=20=E5=9C=A8?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E6=97=B6=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/setu/__init__.py | 42 ++++++++++++++++++---------------------- ATRI/plugins/setu/data_source.py | 35 +++++++++++++++------------------ ATRI/plugins/setu/models.py | 29 ++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 43 deletions(-) diff --git a/ATRI/plugins/setu/__init__.py b/ATRI/plugins/setu/__init__.py index e92c293..3cc2327 100644 --- a/ATRI/plugins/setu/__init__.py +++ b/ATRI/plugins/setu/__init__.py @@ -1,11 +1,14 @@ import re -import asyncio from random import choice from nonebot.matcher import Matcher from nonebot.params import CommandArg, ArgPlainText from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message, MessageSegment -from nonebot.adapters.onebot.v11.helpers import extract_image_urls, Cooldown +from nonebot.adapters.onebot.v11.helpers import ( + extract_image_urls, + Cooldown, + autorevoke_send, +) from ATRI import conf from ATRI.service import Service @@ -28,20 +31,16 @@ async def _(): @random_setu.handle() -async def _random_setu(bot: Bot, event: MessageEvent): - loop = asyncio.get_running_loop() - +async def _(bot: Bot, event: MessageEvent): setu, setu_data = await Setu.new() setu_info = f"Title: {setu_data.title}\nPid: {setu_data.pid}" await bot.send(event, setu_info) try: - msg_1 = await bot.send(event, setu) + await autorevoke_send(bot, event, setu) except Exception: - await random_setu.finish("hso (发不出") - - msg_id = msg_1["message_id"] - loop.call_later(60, lambda: loop.create_task(bot.delete_msg(message_id=msg_id))) + await random_setu.send("hso (发不出") + await random_setu.send(f"自己动手: {setu_data.url}") @random_setu.got("r_rush_after_think", prompt="看完不来点感想么-w-") @@ -56,10 +55,8 @@ async def _(think: str = ArgPlainText("r_rush_after_think")): tag_setu = plugin.on_regex(r"来[张点丶份](.*?)的?[涩色🐍]图", "根据提供的tag查找涩图，冷却2分钟", priority=6) -@tag_setu.handle([Cooldown(120, prompt="")]) -async def _tag_setu(bot: Bot, event: MessageEvent): - loop = asyncio.get_running_loop() - +@tag_setu.handle([Cooldown(120)]) +async def _(bot: Bot, event: MessageEvent): msg = str(event.get_message()).strip() pattern = r"来[张点丶份](.*?)的?[涩色🐍]图" tag = re.findall(pattern, msg)[0] @@ -68,12 +65,11 @@ async def _tag_setu(bot: Bot, event: MessageEvent): await bot.send(event, setu_info) try: - msg_1 = await bot.send(event, setu) + await autorevoke_send(bot, event, setu) except Exception: - await random_setu.finish("hso (发不出") - - msg_id = msg_1["message_id"] - loop.call_later(60, lambda: loop.create_task(bot.delete_msg(message_id=msg_id))) + await random_setu.send("hso (发不出") + await random_setu.send(f"自己动手: {setu_data.url}") + return @tag_setu.got("t_rush_after_think", prompt="看完不来点感想么-w-") @@ -93,7 +89,7 @@ setu_catcher = plugin.on_message("涩图嗅探", "涩图嗅探器", block=False) @setu_catcher.handle() -async def _setu_catcher(bot: Bot, event: MessageEvent): +async def _(bot: Bot, event: MessageEvent): args = extract_image_urls(event.message) if not args: return @@ -137,7 +133,7 @@ nsfw_checker = plugin.cmd_as_group("nsfw", "涩值检测") @nsfw_checker.got("nsfw_img", "图呢？") -async def _deal_check(bot: Bot, event: MessageEvent): +async def _(bot: Bot, event: MessageEvent): args = extract_image_urls(event.message) if not args: await nsfw_checker.reject("请发送图片而不是其他东西！！") @@ -165,14 +161,14 @@ catcher_setting = plugin.cmd_as_group("nsfw.size", "涩图检测图片文件大 @catcher_setting.handle() -async def _catcher_setting(matcher: Matcher, args: Message = CommandArg()): +async def _(matcher: Matcher, args: Message = CommandArg()): msg = args.extract_plain_text() if msg: matcher.set_arg("catcher_set", args) @catcher_setting.got("catcher_set", "数值呢? (1对应1kb, 默认128)") -async def _deal_setting(msg: str = ArgPlainText("catcher_set")): +async def _(msg: str = ArgPlainText("catcher_set")): global _catcher_max_file_size try: _catcher_max_file_size = int(msg) diff --git a/ATRI/plugins/setu/data_source.py b/ATRI/plugins/setu/data_source.py index abf6281..03f19a4 100644 --- a/ATRI/plugins/setu/data_source.py +++ b/ATRI/plugins/setu/data_source.py @@ -1,3 +1,4 @@ +import re from typing import Tuple from nonebot.adapters.onebot.v11 import MessageSegment @@ -5,7 +6,7 @@ from ATRI import conf from ATRI.utils import request from ATRI.exceptions import RequestError -from .models import SetuInfo +from .models import LoliconResponse, SetuInfo from .nsfw_checker import detect_image, init_model @@ -29,31 +30,27 @@ class Setu: Returns: Tuple[MessageSegment, dict]: 涩图本体, 涩图信息 """ - url = _LOLICON_URL - if tag: - url = _LOLICON_URL + f"?tag={tag}" + url = _LOLICON_URL + (f"?tag={tag}" if tag else str()) try: req = await request.get(url) except Exception: raise RequestError("setu: 请求失败") - data = req.json() - cache_data = data.get("data") - if not cache_data: - raise RequestError("今天不可以涩") - - data = cache_data[0] - title = data["title"] - pid = data["pid"] - setu = data["urls"].get("original", "ignore") + data = LoliconResponse.parse_obj(req.json()).data[0] + title = data.title + pid = data.pid + url = data.urls.original if conf.Setu.reverse_proxy: - setu = MessageSegment.image( - file=setu.replace("i.pixiv.cat", conf.Setu.reverse_proxy_domain), - timeout=114514, - ) - - setu_data = SetuInfo(title=title, pid=pid) + patt = "://(.*?)/" + domain = re.findall(patt, url)[0] + setu = url.replace(domain, conf.Setu.reverse_proxy_domain) + + setu_data = SetuInfo(title=title, pid=pid, url=url) + setu = MessageSegment.image( + file=url, + timeout=114514, + ) return setu, setu_data diff --git a/ATRI/plugins/setu/models.py b/ATRI/plugins/setu/models.py index 7144f27..48459f0 100644 --- a/ATRI/plugins/setu/models.py +++ b/ATRI/plugins/setu/models.py @@ -1,6 +1,33 @@ +from typing import List from pydantic import BaseModel +class Urls(BaseModel): + original: str + + +class Datum(BaseModel): + pid: int + p: int + uid: int + title: str + author: str + r18: bool + width: int + height: int + tags: List[str] + ext: str + aiType: int + uploadDate: int + urls: Urls + + +class LoliconResponse(BaseModel): + error: str + data: List[Datum] + + class SetuInfo(BaseModel): title: str - pid: str + pid: int + url: str -- cgit v1.2.3