suyiiyii/nonebot-bison
1
0
Fork 0
mirror of https://github.com/suyiiyii/nonebot-bison.git synced 2026-05-09 10:17:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 补充主题渲染时遗漏的转发推文中的图片 (#554)

Browse Source
This commit is contained in:
Azide
2024-06-12 23:12:01 +08:00
committed by GitHub
parent d4f4868a79
commit 83bea507ab
6 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nonebot_bison/theme/themes/basic/build.py
+9 -1
View File
@@ -1,3 +1,5 @@
from io import BytesIO
from pathlib import Path
from typing import TYPE_CHECKING, Literal
from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
@@ -44,8 +46,14 @@ class BasicTheme(Theme):
client = await post.platform.ctx.get_client_for_static()
msgs: list[MessageSegmentFactory] = [Text(text)]
pics_group: list[list[str | bytes | Path | BytesIO]] = []
if post.images:
pics = post.images
pics_group.append(post.images)
if rp and rp.images:
pics_group.append(rp.images)
for pics in pics_group:
if is_pics_mergable(pics):
pics = await pic_merge(list(pics), client)
msgs.extend(map(Image, pics))
nonebot_bison/theme/themes/ceobe_canteen/build.py
+13 -1
View File
@@ -1,3 +1,4 @@
from io import BytesIO
from pathlib import Path
from datetime import datetime
from typing import TYPE_CHECKING, Literal
@@ -8,6 +9,7 @@ from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
from nonebot_bison.compat import model_validator
from nonebot_bison.theme.utils import convert_to_qr
from nonebot_bison.utils.image import pic_merge, is_pics_mergable
from nonebot_bison.theme import Theme, ThemeRenderError, ThemeRenderUnsupportError
if TYPE_CHECKING:
@@ -109,6 +111,16 @@ class CeobeCanteenTheme(Theme):
text += f"详情: {post.url}"
msgs.append(Text(text))
pics_group: list[list[str | bytes | Path | BytesIO]] = []
if post.images:
msgs.extend(map(Image, post.images))
pics_group.append(post.images)
if post.repost and post.repost.images:
pics_group.append(post.repost.images)
client = await post.platform.ctx.get_client_for_static()
for pics in pics_group:
if is_pics_mergable(pics):
pics = await pic_merge(list(pics), client)
msgs.extend(map(Image, pics))
return msgs
nonebot_bison/theme/themes/ht2i/build.py
+10 -2
View File
@@ -1,3 +1,5 @@
from io import BytesIO
from pathlib import Path
from typing import TYPE_CHECKING, Literal
from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
@@ -53,9 +55,15 @@ class Ht2iTheme(Theme):
if urls:
msgs.append(Text("\n".join(urls)))
pics_group: list[list[str | bytes | Path | BytesIO]] = []
if post.images:
client = await post.platform.ctx.get_client_for_static()
pics = post.images
pics_group.append(post.images)
if rp and rp.images:
pics_group.append(rp.images)
client = await post.platform.ctx.get_client_for_static()
for pics in pics_group:
if is_pics_mergable(pics):
pics = await pic_merge(list(pics), client)
msgs.extend(map(Image, pics))