fix bug

plugins/draw_card/__init__.py

@@ -122,7 +122,6 @@ onmyoji_update = on_keyword({'更新阴阳师信息'}, permission=SUPERUSER, pri
 @prts.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State, reg: Tuple[Any, ...] = RegexGroup()):
     msg = str(event.get_message()).strip()
-    print(reg)
     if msg in ['方舟一井', '方舟1井']:
         num = 300
     else:

plugins/draw_card/util.py

@@ -182,7 +182,6 @@ def init_rst(
                     rst += f"第 {index} 抽获取UP {name}\n"
                 else:
                     rst += f"第 {index} 抽获取 {name}\n"
-    print(rst)
     return rst[:-1] if rst else ""
 
 

plugins/epic/__init__.py

@@ -72,6 +72,6 @@ async def _():
                 if msg_list and code == 200:
                     await bot.send_group_forward_msg(group_id=g, messages=msg_list)
                 else:
-                    bot.send_group_msg(group_id=g, messages=msg_list)
+                    await bot.send_group_msg(group_id=g)
             except Exception as e:
                 logger.error(f"GROUP {g} epic免费游戏推送错误 {type(e)}: {e}")

plugins/fudu.py

@@ -4,14 +4,11 @@ from utils.image_utils import get_img_hash
 import random
 from utils.message_builder import image
 from nonebot import on_message
-from utils.utils import get_message_img
-from nonebot.params import CommandArg, Command
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
+from utils.utils import get_message_img, get_message_text
+from nonebot.adapters.onebot.v11 import GroupMessageEvent
 from configs.config import Config
 from utils.http_utils import AsyncHttpx
-from utils.manager import group_manager
 from services.log import logger
-from typing import Tuple
 
 
 __zx_plugin_name__ = "复读"
@@ -81,18 +78,14 @@ fudu = on_message(permission=GROUP, priority=9)
 
 
 @fudu.handle()
-async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    if (
-        event.is_tome()
-        or cmd
-        or not await group_manager.check_group_task_status(event.group_id, "fudu")
-    ):
+async def _(event: GroupMessageEvent):
+    if event.is_tome():
         return
-    if arg.extract_plain_text().strip():
-        if arg.extract_plain_text().strip().find("@可爱的小真寻") != -1:
+    if get_message_text(event.json()):
+        if get_message_text(event.json()).find("@可爱的小真寻") != -1:
             await fudu.finish("复制粘贴的虚空艾特？", at_sender=True)
     img = get_message_img(event.json())
-    msg = arg.extract_plain_text().strip()
+    msg = get_message_text(event.json())
     if not img and not msg:
         return
     if img:
@@ -112,7 +105,7 @@ async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Mes
             "fudu", "FUDU_PROBABILITY"
         ) and not _fudu_list.is_repeater(event.group_id):
             if random.random() < 0.2:
-                await fudu.finish("打断施法！")
+                await fudu.finish("[[_task|fudu]]打断施法！")
             _fudu_list.set_repeater(event.group_id)
             if img and msg:
                 rst = msg + image(f"compare_{event.group_id}_img.jpg", "temp")
@@ -125,7 +118,7 @@ async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Mes
             if rst:
                 if rst.endswith("打断施法！"):
                     rst = "打断" + rst
-                await fudu.send(rst)
+                await fudu.send("[[_task|fudu]]" + rst)
 
 
 async def get_fudu_img_hash(url, group_id):

plugins/parse_bilibili_json.py

@@ -1,7 +1,7 @@
 from nonebot import on_message
 from services.log import logger
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
-from utils.utils import get_message_json, get_local_proxy, is_number
+from nonebot.adapters.onebot.v11 import GroupMessageEvent
+from utils.utils import get_message_json, get_local_proxy, is_number, get_message_text
 from nonebot.adapters.onebot.v11.permission import GROUP
 from bilibili_api import video
 from utils.message_builder import image
@@ -11,11 +11,11 @@ from utils.browser import get_browser
 from configs.path_config import IMAGE_PATH
 from utils.http_utils import AsyncHttpx
 from configs.config import Config
-from nonebot.params import CommandArg
+from utils.user_agent import get_user_agent
+import aiohttp
 import asyncio
 import time
 from bilibili_api import settings
-from utils.manager import group_manager
 import ujson as json
 
 
@@ -47,113 +47,123 @@ _tmp = {}
 
 
 @parse_bilibili_json.handle()
-async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
-    if await group_manager.check_group_task_status(event.group_id, "bilibili_parse"):
-        vd_info = None
-        url = None
-        if get_message_json(event.json()):
-            try:
-                data = json.loads(get_message_json(event.json())[0]["data"])
-            except (IndexError, KeyError):
-                data = None
-            if data:
-                # 转发视频
-                if data.get("desc") == "哔哩哔哩":
-                    response = await AsyncHttpx.get(
-                        data["meta"]["detail_1"]["qqdocurl"], timeout=7
-                    )
-                    url = str(response.url).split("?")[0]
-                    bvid = url.split("/")[-1]
-                    vd_info = await video.Video(bvid=bvid).get_info()
-                # 转发专栏
-                if (
-                    data.get("meta")
-                    and data["meta"].get("news")
-                    and data["meta"]["news"].get("desc") == "哔哩哔哩专栏"
-                ):
-                    url = data["meta"]["news"]["jumpUrl"]
-                    page = None
-                    try:
-                        browser = await get_browser()
-                        if not browser:
-                            return
-                        page = await browser.new_page(
-                            user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
-                            " (KHTML, like Gecko) Chrome/93.0.4530.0 Safari/537.36"
-                        )
-                        await page.goto(url, wait_until="networkidle", timeout=10000)
-                        await page.set_viewport_size({"width": 2560, "height": 1080})
-                        await page.click("#app > div")
-                        div = await page.query_selector("#app > div")
-                        await div.screenshot(
-                            path=f"{IMAGE_PATH}/temp/cv_{event.user_id}.png",
-                            timeout=100000,
-                        )
-                        await asyncio.get_event_loop().run_in_executor(
-                            None, resize, f"{IMAGE_PATH}/temp/cv_{event.user_id}.png"
-                        )
-                        await parse_bilibili_json.send(
-                            image(f"cv_{event.user_id}.png", "temp")
-                        )
-                        await page.close()
-                        logger.info(
-                            f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
-                        )
-                    except Exception as e:
-                        logger.error(f"尝试解析bilibili专栏 {url} 失败 {type(e)}：{e}")
-                        if page:
-                            await page.close()
-                    return
-        # BV
-        if arg.extract_plain_text().strip():
-            msg = arg.extract_plain_text().strip()
-            if "BV" in msg:
-                index = msg.find("BV")
-                if len(msg[index + 2 :]) >= 10:
-                    msg = msg[index : index + 12]
-                    url = f"https://www.bilibili.com/video/{msg}"
-                    vd_info = await video.Video(bvid=msg).get_info()
-            elif "av" in msg:
-                index = msg.find("av")
-                if len(msg[index + 2 :]) >= 9:
-                    msg = msg[index + 2 : index + 11]
-                    if is_number(msg):
-                        url = f"https://www.bilibili.com/video/{msg}"
-                        vd_info = await video.Video(aid=int(msg)).get_info()
-            elif "https://b23.tv" in msg:
-                url = "https://" + msg[msg.find("b23.tv") : msg.find("b23.tv") + 13]
-                res = await AsyncHttpx.get(url, timeout=7)
-                url = str(res.url).split("?")[0]
-                bvid = url.split("/")[-1]
-                vd_info = await video.Video(bvid=bvid).get_info()
-        if vd_info:
+async def _(event: GroupMessageEvent):
+    vd_info = None
+    url = None
+    if get_message_json(event.json()):
+        try:
+            data = json.loads(get_message_json(event.json())[0]["data"])
+        except (IndexError, KeyError):
+            data = None
+        if data:
+            # 转发视频
+            if data.get("desc") == "哔哩哔哩":
+                async with aiohttp.ClientSession(
+                    headers=get_user_agent()
+                ) as session:
+                    async with session.get(
+                            data["meta"]["detail_1"]["qqdocurl"],
+                            proxy=get_local_proxy(),
+                            timeout=7,
+                    ) as response:
+                        url = str(response.url).split("?")[0]
+                        bvid = url.split("/")[-1]
+                        vd_info = await video.Video(bvid=bvid).get_info()
+                # response = await AsyncHttpx.get(
+                #     data["meta"]["detail_1"]["qqdocurl"], timeout=7
+                # )
+                # url = str(response.url).split("?")[0]
+                # bvid = url.split("/")[-1]
+                # vd_info = await video.Video(bvid=bvid).get_info()
+            # 转发专栏
             if (
-                url in _tmp.keys() and time.time() - _tmp[url] > 30
-            ) or url not in _tmp.keys():
-                _tmp[url] = time.time()
-                aid = vd_info["aid"]
-                title = vd_info["title"]
-                author = vd_info["owner"]["name"]
-                reply = vd_info["stat"]["reply"]  # 回复
-                favorite = vd_info["stat"]["favorite"]  # 收藏
-                coin = vd_info["stat"]["coin"]  # 投币
-                # like = vd_info['stat']['like']      # 点赞
-                # danmu = vd_info['stat']['danmaku']  # 弹幕
-                date = time.strftime("%Y-%m-%d", time.localtime(vd_info["ctime"]))
+                data.get("meta")
+                and data["meta"].get("news")
+                and data["meta"]["news"].get("desc") == "哔哩哔哩专栏"
+            ):
+                url = data["meta"]["news"]["jumpUrl"]
+                page = None
                 try:
-                    await parse_bilibili_json.send(
-                        image(vd_info["pic"]) + f"\nav{aid}\n标题：{title}\n"
-                        f"UP：{author}\n"
-                        f"上传日期：{date}\n"
-                        f"回复：{reply}，收藏：{favorite}，投币：{coin}\n"
-                        f"{url}"
+                    browser = await get_browser()
+                    if not browser:
+                        return
+                    page = await browser.new_page(
+                        user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+                        " (KHTML, like Gecko) Chrome/93.0.4530.0 Safari/537.36"
                     )
-                except ActionFailed:
-                    logger.warning(f"{event.group_id} 发送bilibili解析失败")
-                else:
+                    await page.goto(url, wait_until="networkidle", timeout=10000)
+                    await page.set_viewport_size({"width": 2560, "height": 1080})
+                    await page.click("#app > div")
+                    div = await page.query_selector("#app > div")
+                    await div.screenshot(
+                        path=f"{IMAGE_PATH}/temp/cv_{event.user_id}.png",
+                        timeout=100000,
+                    )
+                    await asyncio.get_event_loop().run_in_executor(
+                        None, resize, f"{IMAGE_PATH}/temp/cv_{event.user_id}.png"
+                    )
+                    await parse_bilibili_json.send(
+                        "[[_task|bilibili_parse]]" + image(f"cv_{event.user_id}.png", "temp")
+                    )
+                    await page.close()
                     logger.info(
                         f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
                     )
+                except Exception as e:
+                    logger.error(f"尝试解析bilibili专栏 {url} 失败 {type(e)}：{e}")
+                    if page:
+                        await page.close()
+                return
+    # BV
+    if msg := get_message_text(event.json()):
+        if "BV" in msg:
+            index = msg.find("BV")
+            if len(msg[index + 2 :]) >= 10:
+                msg = msg[index : index + 12]
+                url = f"https://www.bilibili.com/video/{msg}"
+                vd_info = await video.Video(bvid=msg).get_info()
+        elif "av" in msg:
+            index = msg.find("av")
+            if len(msg[index + 2 :]) >= 9:
+                msg = msg[index + 2 : index + 11]
+                if is_number(msg):
+                    url = f"https://www.bilibili.com/video/{msg}"
+                    vd_info = await video.Video(aid=int(msg)).get_info()
+        elif "https://b23.tv" in msg:
+            url = "https://" + msg[msg.find("b23.tv") : msg.find("b23.tv") + 13]
+            res = await AsyncHttpx.get(url, timeout=7)
+            url = str(res.url).split("?")[0]
+            bvid = url.split("/")[-1]
+            vd_info = await video.Video(bvid=bvid).get_info()
+    if vd_info:
+        if (
+            url in _tmp.keys() and time.time() - _tmp[url] > 30
+        ) or url not in _tmp.keys():
+            _tmp[url] = time.time()
+            aid = vd_info["aid"]
+            title = vd_info["title"]
+            author = vd_info["owner"]["name"]
+            reply = vd_info["stat"]["reply"]  # 回复
+            favorite = vd_info["stat"]["favorite"]  # 收藏
+            coin = vd_info["stat"]["coin"]  # 投币
+            # like = vd_info['stat']['like']      # 点赞
+            # danmu = vd_info['stat']['danmaku']  # 弹幕
+            date = time.strftime("%Y-%m-%d", time.localtime(vd_info["ctime"]))
+            try:
+                await parse_bilibili_json.send(
+                    "[[_task|bilibili_parse]]" +
+                    image(vd_info["pic"]) + f"\nav{aid}\n标题：{title}\n"
+                    f"UP：{author}\n"
+                    f"上传日期：{date}\n"
+                    f"回复：{reply}，收藏：{favorite}，投币：{coin}\n"
+                    f"{url}"
+                )
+            except ActionFailed:
+                logger.warning(f"{event.group_id} 发送bilibili解析失败")
+            else:
+                logger.info(
+                    f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
+                )
 
 
 def resize(path: str):

plugins/send_setu_/send_setu/data_source.py

@@ -89,13 +89,13 @@ async def search_online_setu(
     ws_url = Config.get_config("pixiv", "PIXIV_NGINX_URL")
     if ws_url:
         url_ = url_.replace("i.pximg.net", ws_url).replace("i.pixiv.cat", ws_url)
+    index = random.randint(1, 100000) if id_ is None else id_
+    path_ = IMAGE_PATH / path_ if path_ else TEMP_PATH
+    file_name = f"{index}_temp_setu.jpg" if path_ == TEMP_PATH else f"{index}.jpg"
+    path_.mkdir(parents=True, exist_ok=True)
     for i in range(3):
         logger.info(f"search_online_setu --> {i}")
         try:
-            index = random.randint(1, 100000) if id_ is None else id_
-            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_,
                 path_ / file_name,
@@ -104,14 +104,14 @@ async def search_online_setu(
                 continue
             if id_ is not None:
                 if (
-                    os.path.getsize(f"{IMAGE_PATH}/{path_}/{index}.jpg")
+                    os.path.getsize(path_ / f"{index}.jpg")
                     > 1024 * 1024 * 1.5
                 ):
                     compressed_image(
-                        f"{IMAGE_PATH}/{path_}/{index}.jpg",
+                        path_ / f"{index}.jpg",
                     )
             logger.info(f"下载 lolicon 图片 {url_} 成功， id：{index}")
-            return image(abspath=path_ / file_name), index
+            return image(path_ / file_name), index
         except TimeoutError:
             pass
         except Exception as e: