diff --git a/src/plugins/hk_reporter/platform/weibo.py b/src/plugins/hk_reporter/platform/weibo.py index 078c4e1..aa2bd12 100644 --- a/src/plugins/hk_reporter/platform/weibo.py +++ b/src/plugins/hk_reporter/platform/weibo.py @@ -68,7 +68,7 @@ class Weibo(Platform): def _get_text(self, raw_text: str) -> str: text = raw_text.replace('
', '\n') - return bs(text).text + return bs(text, 'html.parser').text async def parse(self, raw_post: RawPost) -> Post: info = raw_post['mblog'] diff --git a/src/plugins/hk_reporter/post.py b/src/plugins/hk_reporter/post.py index 255c7b6..4609e6c 100644 --- a/src/plugins/hk_reporter/post.py +++ b/src/plugins/hk_reporter/post.py @@ -2,6 +2,7 @@ import base64 from dataclasses import dataclass, field from io import BytesIO from typing import NoReturn, Optional +from nonebot import logger import httpx from PIL import Image from .plugin_config import plugin_config @@ -47,11 +48,12 @@ class Post: if len(images) == 6: matrix = (3, 2) self.pics = self.pics[6:] - elif len(images) == 9: + elif len(images) >= 9: matrix = (3, 3) self.pics = self.pics[9:] else: return + logger.info('trigger merge image') target = Image.new('RGB', (matrix[0] * pic_size, matrix[1] * pic_size)) for y in range(matrix[1]): for x in range(matrix[0]):