From aa76fae3861327bfd718a7dda42f4484fcd7415d Mon Sep 17 00:00:00 2001 From: yajiwa <839790708@qq.com> Date: Wed, 22 Feb 2023 17:51:51 +0800 Subject: [PATCH 1/2] update coser --- plugins/coser/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/coser/__init__.py b/plugins/coser/__init__.py index 6bf55eed..70d4e723 100755 --- a/plugins/coser/__init__.py +++ b/plugins/coser/__init__.py @@ -2,8 +2,10 @@ from typing import Tuple, Any from nonebot import on_regex from nonebot.params import RegexGroup -from nonebot.typing import T_State +from configs.path_config import TEMP_PATH from nonebot.adapters.onebot.v11 import Bot, MessageEvent +import time +from utils.http_utils import AsyncHttpx from utils.message_builder import image from services.log import logger from utils.manager import withdraw_message_manager @@ -36,19 +38,22 @@ __plugin_configs__ = { }, } +cos_img_path = TEMP_PATH / "cos" coser = on_regex(r"^(\d)?连?(cos|COS|coser|括丝)$", priority=5, block=True) # 纯cos,较慢:https://picture.yinux.workers.dev # 比较杂,有福利姬,较快:https://api.jrsgslb.cn/cos/url.php?return=img -url = "https://picture.yinux.workers.dev/" +url = "https://picture.yinux.workers.dev" @coser.handle() async def _(event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()): num = reg_group[0] or 1 for _ in range(int(num)): + path = cos_img_path / f'{int(time.time())}.jpeg' try: - msg_id = await coser.send(image(url)) + await AsyncHttpx.download_file(url, path) + msg_id = await coser.send(image(path)) withdraw_message_manager.withdraw_message( event, msg_id["message_id"], From 1ca6a67a24e1b64a86dcece8ab2b96a1a6dedd04 Mon Sep 17 00:00:00 2001 From: HibiKier <45528451+HibiKier@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:01:12 +0800 Subject: [PATCH 2/2] Update __init__.py --- plugins/coser/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/coser/__init__.py b/plugins/coser/__init__.py index 70d4e723..9e0eb42c 100755 --- a/plugins/coser/__init__.py +++ b/plugins/coser/__init__.py @@ -38,7 +38,6 @@ __plugin_configs__ = { }, } -cos_img_path = TEMP_PATH / "cos" coser = on_regex(r"^(\d)?连?(cos|COS|coser|括丝)$", priority=5, block=True) # 纯cos,较慢:https://picture.yinux.workers.dev @@ -50,7 +49,7 @@ url = "https://picture.yinux.workers.dev" async def _(event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()): num = reg_group[0] or 1 for _ in range(int(num)): - path = cos_img_path / f'{int(time.time())}.jpeg' + path = TEMP_PATH / f'cos_cc{int(time.time())}.jpeg' try: await AsyncHttpx.download_file(url, path) msg_id = await coser.send(image(path))