fit nonebot.beta2

plugins/send_setu_/send_setu/__init__.py

@@ -8,11 +8,10 @@ from typing import Optional, Type
 from gino.exceptions import UninitializedError
 from utils.utils import (
     is_number,
-    get_message_text,
     get_message_img,
 )
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import (
+from nonebot.adapters.onebot.v11 import (
     Bot,
     MessageEvent,
     GroupMessageEvent,
@@ -31,9 +30,11 @@ from .data_source import (
     add_data_to_database,
     get_setu_count,
 )
-from nonebot.adapters.cqhttp.exception import ActionFailed
+from nonebot.adapters.onebot.v11.exception import ActionFailed
 from configs.config import Config, NICKNAME
 from utils.manager import withdraw_message_manager
+from nonebot.params import CommandArg, Command
+from typing import Tuple
 import re
 
 try:
@@ -87,30 +88,17 @@ __plugin_configs__ = {
     "INITIAL_SETU_PROBABILITY": {
         "value": 0.7,
         "help": "初始色图概率，总概率 = 初始色图概率 + 好感度",
-        "default_value": 0.7
+        "default_value": 0.7,
     },
     "DOWNLOAD_SETU": {
         "value": True,
         "help": "是否存储下载的色图，使用本地色图可以加快图片发送速度",
-        "default_value": True
+        "default_value": True,
     },
-    "TIMEOUT": {
-        "value": 10,
-        "help": "色图下载超时限制(秒)",
-        "default_value": 10
-    },
-    "SHOW_INFO": {
-        "value": True,
-        "help": "是否显示色图的基本信息，如PID等",
-        "default_value": True
-    }
+    "TIMEOUT": {"value": 10, "help": "色图下载超时限制(秒)", "default_value": 10},
+    "SHOW_INFO": {"value": True, "help": "是否显示色图的基本信息，如PID等", "default_value": True},
 }
-Config.add_plugin_config(
-    "pixiv",
-    "PIXIV_NGINX_URL",
-    "i.pixiv.re",
-    help_="Pixiv反向代理"
-)
+Config.add_plugin_config("pixiv", "PIXIV_NGINX_URL", "i.pixiv.re", help_="Pixiv反向代理")
 
 setu_data_list = []
 
@@ -125,7 +113,7 @@ async def do_something(
 ):
     global setu_data_list
     if isinstance(event, MessageEvent):
-        if matcher.module == "send_setu":
+        if matcher.plugin_name == "send_setu":
             # 添加数据至数据库
             try:
                 await add_data_to_database(setu_data_list)
@@ -141,12 +129,12 @@ setu = on_command(
 
 setu_reg = on_regex("(.*)[份|发|张|个|次|点](.*)[瑟|色|涩]图$", priority=5, block=True)
 
-find_setu = on_command("查色图", priority=5, block=True)
-
 
 @setu.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    msg = get_message_text(event.json())
+async def _(
+    event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()
+):
+    msg = arg.extract_plain_text().strip()
     if isinstance(event, GroupMessageEvent):
         impression = (
             await SignGroupUser.ensure(event.user_id, event.group_id)
@@ -157,14 +145,10 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     r18 = 0
     num = 1
     # 是否看r18
-    if state["_prefix"]["raw_command"] == "色图r" and isinstance(
-        event, PrivateMessageEvent
-    ):
+    if cmd[0] == "色图r" and isinstance(event, PrivateMessageEvent):
         r18 = 1
         num = 10
-    elif state["_prefix"]["raw_command"] == "色图r" and isinstance(
-        event, GroupMessageEvent
-    ):
+    elif cmd[0] == "色图r" and isinstance(event, GroupMessageEvent):
         await setu.finish(
             random.choice(["这种不好意思的东西怎么可能给这么多人看啦", "羞羞脸！给我滚出克私聊！", "变态变态变态变态大变态！"])
         )
@@ -187,7 +171,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
                 Config.get_config("send_setu", "WITHDRAW_SETU_MESSAGE"),
             )
         return
-    await send_setu_handle(setu, event, state["_prefix"]["raw_command"], msg, num, r18)
+    await send_setu_handle(setu, event, cmd[0], msg, num, r18)
 
 
 num_key = {
@@ -206,7 +190,7 @@ num_key = {
 
 
 @setu_reg.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
+async def _(event: MessageEvent, arg: Message = CommandArg()):
     if isinstance(event, GroupMessageEvent):
         impression = (
             await SignGroupUser.ensure(event.user_id, event.group_id)
@@ -214,7 +198,7 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
         luox = get_luoxiang(impression)
         if luox:
             await setu.finish(luox, at_sender=True)
-    msg = get_message_text(event.json())
+    msg = arg.extract_plain_text().strip()
     num = 1
     msg = re.search(r"(.*)[份发张个次点](.*)[瑟涩色]图", msg)
     # 解析 tags 以及 num
@@ -239,31 +223,6 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     await send_setu_handle(setu_reg, event, "色图", tags, num, 0)
 
 
-@find_setu.args_parser
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    if str(event.message) == "取消":
-        await find_setu.finish("取消了操作", at_sender=True)
-    imgs = get_message_img(event.json())
-    if not imgs:
-        await find_setu.reject("不搞错了，俺要图！")
-    state["img"] = imgs[0]
-
-
-@find_setu.handle()
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    if get_message_text(event.json()) in ["帮助"]:
-        await find_setu.finish("通过图片获取本地色图id\n\t示例：查色图(图片)")
-    imgs = get_message_img(event.json())
-    if imgs:
-        state["img"] = imgs[0]
-
-
-@find_setu.got("img", prompt="速速来图！")
-async def _(bot: Bot, event: MessageEvent, state: T_State):
-    img = state["img"]
-    await find_setu.send(await find_img_index(img, event.user_id), at_sender=True)
-
-
 async def send_setu_handle(
     matcher: Type[Matcher],
     event: MessageEvent,

plugins/send_setu_/send_setu/data_source.py

@@ -1,4 +1,4 @@
-from configs.path_config import IMAGE_PATH
+from configs.path_config import IMAGE_PATH, TEMP_PATH
 from utils.message_builder import image
 from services.log import logger
 from utils.image_utils import get_img_hash, compressed_image
@@ -7,7 +7,7 @@ from asyncio.exceptions import TimeoutError
 from typing import List, Optional
 from configs.config import NICKNAME, Config
 from utils.http_utils import AsyncHttpx
-from ..model import Setu
+from .._model import Setu
 import asyncio
 import os
 import random
@@ -19,8 +19,8 @@ except ModuleNotFoundError:
 
 
 url = "https://api.lolicon.app/setu/v2"
-path = "_setu/"
-r18_path = "_r18/"
+path = "_setu"
+r18_path = "_r18"
 
 
 # 获取url
@@ -93,13 +93,12 @@ async def search_online_setu(
         logger.info(f"search_online_setu --> {i}")
         try:
             index = random.randint(1, 100000) if id_ is None else id_
-            path_ = "temp" if not path_ else path_
-            file = f"{index}_temp_setu.jpg" if not path_ else f"{index}.jpg"
-            if not os.path.exists(f"{IMAGE_PATH}/{path_}"):
-                os.mkdir(f"{IMAGE_PATH}/{path_}")
+            path_ = IMAGE_PATH / path_ if path_ else TEMP_PATH
+            file_name = f"{index}_temp_setu.jpg" if not path_ == TEMP_PATH else f"{index}.jpg"
+            path_.mkdir(parents=True, exist_ok=True)
             if not await AsyncHttpx.download_file(
                 url_,
-                f"{IMAGE_PATH}/{path_}/{file}",
+                path_ / file_name,
                 timeout=Config.get_config("send_setu", "TIMEOUT"),
             ):
                 continue
@@ -111,8 +110,8 @@ async def search_online_setu(
                     compressed_image(
                         f"{IMAGE_PATH}/{path_}/{index}.jpg",
                     )
-            logger.info(f"下载 lolicon图片 {url_} 成功， id：{index}")
-            return image(file, path_), index
+            logger.info(f"下载 lolicon 图片 {url_} 成功， id：{index}")
+            return image(abspath=path_ / file_name), index
         except TimeoutError:
             pass
         except Exception as e:
@@ -126,11 +125,9 @@ async def check_local_exists_or_download(setu_image: Setu) -> "MessageSegment, i
     id_ = None
     if Config.get_config("send_setu", "DOWNLOAD_SETU"):
         id_ = setu_image.local_id
-        if setu_image.is_r18:
-            path_ = "_r18"
-        else:
-            path_ = path
-        if os.path.exists(f"{IMAGE_PATH}/{path_}/{setu_image.local_id}.jpg"):
+        path_ = r18_path if setu_image.is_r18 else path
+        file = IMAGE_PATH / path_ / f"{setu_image.local_id}.jpg"
+        if file.exists():
             return image(f"{setu_image.local_id}.jpg", path_), 200
     return await search_online_setu(setu_image.img_url, id_, path_)
 
@@ -202,7 +199,7 @@ def get_luoxiang(impression):
     if probability < random.randint(1, 101):
         return (
             "我为什么要给你发这个？"
-            + image(random.choice(os.listdir(IMAGE_PATH + "luoxiang/")), "luoxiang")
+            + image(random.choice(os.listdir(IMAGE_PATH / "luoxiang")), "luoxiang")
             + f"\n(快向{NICKNAME}签到提升好感度吧！)"
         )
     return None
@@ -219,11 +216,11 @@ async def get_setu_count(r18: int) -> int:
 async def find_img_index(img_url, user_id):
     if not await AsyncHttpx.download_file(
         img_url,
-        IMAGE_PATH + f"temp/{user_id}_find_setu_index.jpg",
+        TEMP_PATH / f"{user_id}_find_setu_index.jpg",
         timeout=Config.get_config("send_setu", "TIMEOUT"),
     ):
         return "检索图片下载上失败..."
-    img_hash = str(get_img_hash(IMAGE_PATH + f"temp/{user_id}_find_setu_index.jpg"))
+    img_hash = str(get_img_hash(TEMP_PATH / f"{user_id}_find_setu_index.jpg"))
     setu_img = await Setu.get_image_in_hash(img_hash)
     if setu_img:
         return (