From 109c645e6880d1175715b9f54866415fd22ce226 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Sun, 23 Oct 2022 11:49:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E8=AF=BB=E4=BF=AE=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ plugins/fudu.py | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d210f109..10980d06 100644 --- a/README.md +++ b/README.md @@ -293,6 +293,10 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能 ## 更新 +### 2022/10/23 + +* 复读修改回图片下载 + ### 2022/10/22 * 更新依赖注入 diff --git a/plugins/fudu.py b/plugins/fudu.py index b642ed50..95854205 100755 --- a/plugins/fudu.py +++ b/plugins/fudu.py @@ -1,6 +1,4 @@ -from io import BytesIO -import imagehash -from PIL import Image +from utils.image_utils import get_img_hash from nonebot.adapters.onebot.v11.permission import GROUP from configs.path_config import TEMP_PATH import random @@ -10,6 +8,7 @@ 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 services.log import logger from configs.config import NICKNAME @@ -124,5 +123,15 @@ async def _(event: GroupMessageEvent): await fudu.finish("[[_task|fudu]]" + rst) -async def get_fudu_img_hash(url): - return str(imagehash.average_hash(Image.open(BytesIO((await AsyncHttpx.get(url)).content)))) +async def get_fudu_img_hash(url, group_id): + try: + if await AsyncHttpx.download_file( + url, TEMP_PATH / f"compare_{group_id}_img.jpg" + ): + img_hash = get_img_hash(TEMP_PATH / f"compare_{group_id}_img.jpg") + return str(img_hash) + else: + logger.warning(f"复读下载图片失败...") + except Exception as e: + logger.warning(f"复读读取图片Hash出错 {type(e)}:{e}") + return ""