♻️ 使用更纯粹的Post

Author: AzideCupric

nonebot_bison/__init__.py

@@ -1,13 +1,15 @@
 from nonebot.plugin import PluginMetadata, require
 
+from .delivery import send
+
 require("nonebot_plugin_apscheduler")
 require("nonebot_plugin_datastore")
 require("nonebot_plugin_saa")
 
 import nonebot_plugin_saa
 
 from .plugin_config import PlugConfig, plugin_config
-from . import post, send, theme, types, utils, config, platform, bootstrap, scheduler, admin_page, sub_manager
+from . import post, theme, types, utils, config, platform, bootstrap, scheduler, admin_page, sub_manager
 
 __help__version__ = "0.8.2"
 nonebot_plugin_saa.enable_auto_select_bot()

nonebot_bison/delivery/__init__.py

@@ -0,0 +1,2 @@
+from .send import send_msgs as send_msgs
+from .render import render_dispatch as render_dispatch

nonebot_bison/delivery/render.py

@@ -0,0 +1,103 @@
+from nonebot import logger
+from nonebot_plugin_saa import Text, MessageFactory, PlatformTarget, MessageSegmentFactory
+
+from nonebot_bison.utils import text_to_image
+from nonebot_bison.post import Post, PostHeader
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.theme import (
+    Parcel,
+    ParcelHeader,
+    ParcelPayload,
+    ThemeRenderError,
+    ThemeRenderUnsupportError,
+    theme_manager,
+)
+
+
+def get_config_theme(platform_code: str) -> str | None:
+    """获取用户指定的theme"""
+    return plugin_config.bison_platform_theme.get(platform_code)
+
+
+def get_theme_priority_list(header: PostHeader):
+    """获取渲染所使用的theme名列表，按照优先级排序"""
+    themes_by_priority: list[str] = []
+    # 最先使用用户指定的theme
+    if user_theme := get_config_theme(header.platform_code):
+        themes_by_priority.append(user_theme)
+    # 然后使用平台默认的theme
+    if header.recommend_theme not in themes_by_priority:
+        themes_by_priority.append(header.recommend_theme)
+    # 最后使用最基础的theme
+    if "basic" not in themes_by_priority:
+        themes_by_priority.append("basic")
+    return themes_by_priority
+
+
+async def theme_render(post: Post, theme_priority_list: list[str]) -> list[MessageSegmentFactory]:
+    """按照 Theme 优先级列表渲染 Post，返回 MessageSegmentFactory 列表"""
+    for theme_name in theme_priority_list:
+        if theme := theme_manager[theme_name]:
+            try:
+                logger.debug(f"rendering post with theme {theme_name}")
+                return await theme.do_render(post)
+            except ThemeRenderUnsupportError as e:
+                logger.warning(f"Theme {theme_name} does not support Post of {post.header.platform_code}: {e}")
+                continue
+            except ThemeRenderError as e:
+                logger.exception(f"Theme {theme_name} render error: {e}")
+                continue
+        else:
+            logger.error(f"Theme {theme_name} not found")
+            continue
+    else:
+        raise ThemeRenderError(f"No theme can render Post of {post.header.platform_code}")
+
+
+async def render_post_process(
+    post_header: PostHeader, msg_segments: list[MessageSegmentFactory]
+) -> list[MessageFactory]:
+    """对渲染后的 MessageSegmentFactory 列表进行处理"""
+
+    async def convert(msg: MessageSegmentFactory) -> MessageSegmentFactory:
+        if isinstance(msg, Text):
+            return await text_to_image(msg)
+        else:
+            return msg
+
+    if plugin_config.bison_use_pic:
+        msg_segments = [await convert(msg) for msg in msg_segments]
+
+    if post_header.compress:
+        msgs = [MessageFactory(msg_segments)]
+    else:
+        msgs = [MessageFactory(msg_segment) for msg_segment in msg_segments]
+
+    return msgs
+
+
+async def render_dispatch(to_send: list[tuple[PlatformTarget, list[Post]]]):
+    """分发 Post 渲染任务"""
+    parcels: list[Parcel] = []
+    for target, posts in to_send:
+        for post in posts:
+            post_header = post.header
+
+            themes_by_priority = get_theme_priority_list(post_header)
+            logger.debug(f"themes_by_priority: {themes_by_priority}")
+
+            unprocessed_payload = await theme_render(post, themes_by_priority)
+            processed_payload = await render_post_process(post_header, unprocessed_payload)
+
+            logger.info(f"send to {target}: {processed_payload}")  # TODO: post 的 __str__ 方法，避免 bytes 刷屏
+            parcels.append(
+                Parcel(
+                    ParcelHeader(
+                        target=target,
+                    ),
+                    ParcelPayload(
+                        content=processed_payload,
+                    ),
+                )
+            )
+    return parcels

nonebot_bison/send.py nonebot_bison/delivery/send.py

@@ -6,7 +6,7 @@
 from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot_plugin_saa import MessageFactory, PlatformTarget, AggregatedMessageFactory
 
-from .plugin_config import plugin_config
+from ..plugin_config import plugin_config
 
 Sendable = MessageFactory | AggregatedMessageFactory
 

nonebot_bison/platform/arknights.py

@@ -1,13 +1,12 @@
 from typing import Any
-from functools import partial
 
 from httpx import AsyncClient
 from bs4 import BeautifulSoup as bs
 from pydantic import Field, BaseModel
 
-from ..post import Post
 from ..types import Target, RawPost, Category
 from .platform import NewMessage, StatusChange
+from ..post import Post, PostHeader, PostPayload
 from ..utils.scheduler_config import SchedulerConfig
 
 
@@ -106,14 +105,20 @@ def title_escape(text: str) -> str:
             title = title_escape(data.title)
 
         return Post(
-            self,
-            content=data.content,
-            title=title,
-            nickname="明日方舟游戏内公告",
-            images=[data.banner_image_url] if data.banner_image_url else None,
-            url=data.jump_link or None,
-            timestamp=data.updated_at,
-            compress=True,
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content=data.content,
+                title=title,
+                author="明日方舟游戏内公告",
+                images=[data.banner_image_url] if data.banner_image_url else None,
+                url=data.jump_link or None,
+                timestamp=data.updated_at,
+            ),
         )
 
 
@@ -143,15 +148,30 @@ async def get_status(self, _):
 
     def compare_status(self, _, old_status, new_status):
         res = []
-        ArkUpdatePost = partial(Post, self, "", nickname="明日方舟更新信息")
+
+        def make_ark_update_post(title: str):
+            return Post(
+                PostHeader(
+                    platform_code=self.platform_name,
+                    http_client=self.client,
+                    recommend_theme=self.default_theme,
+                    compress=True,
+                ),
+                PostPayload(
+                    content="",
+                    title=title,
+                    author="明日方舟游戏信息",
+                ),
+            )
+
         if old_status.get("preAnnounceType") == 2 and new_status.get("preAnnounceType") == 0:
-            res.append(ArkUpdatePost(title="登录界面维护公告上线（大概是开始维护了)"))
+            res.append(make_ark_update_post(title="登录界面维护公告上线（大概是开始维护了)"))
         elif old_status.get("preAnnounceType") == 0 and new_status.get("preAnnounceType") == 2:
-            res.append(ArkUpdatePost(title="登录界面维护公告下线（大概是开服了，冲！）"))
+            res.append(make_ark_update_post(title="登录界面维护公告下线（大概是开服了，冲！）"))
         if old_status.get("clientVersion") != new_status.get("clientVersion"):
-            res.append(ArkUpdatePost(title="游戏本体更新（大更新）"))
+            res.append(make_ark_update_post(title="游戏本体更新（大更新）"))
         if old_status.get("resVersion") != new_status.get("resVersion"):
-            res.append(ArkUpdatePost(title="游戏资源更新（小更新）"))
+            res.append(make_ark_update_post(title="游戏资源更新（小更新）"))
         return res
 
     def get_category(self, _):
@@ -198,12 +218,18 @@ async def parse(self, raw_post: RawPost) -> Post:
         imgs = [x["src"] for x in soup("img")]
         text = f'{raw_post["title"]}\n{soup.text.strip()}'
         return Post(
-            self,
-            text,
-            images=imgs,
-            url=url,
-            nickname="塞壬唱片新闻",
-            compress=True,
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content=text,
+                images=imgs,
+                url=url,
+                author="塞壬唱片新闻",
+            ),
         )
 
 
@@ -238,11 +264,17 @@ def get_category(self, _) -> Category:
     async def parse(self, raw_post: RawPost) -> Post:
         url = f'https://terra-historicus.hypergryph.com/comic/{raw_post["comicCid"]}/episode/{raw_post["episodeCid"]}'
         return Post(
-            self,
-            raw_post["subtitle"],
-            title=f'{raw_post["title"]} - {raw_post["episodeShortTitle"]}',
-            images=[raw_post["coverUrl"]],
-            url=url,
-            nickname="泰拉记事社漫画",
-            compress=True,
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content=raw_post["subtitle"],
+                title=f'{raw_post["title"]} - {raw_post["episodeShortTitle"]}',
+                images=[raw_post["coverUrl"]],
+                url=url,
+                author="泰拉记事社漫画",
+            ),
         )

nonebot_bison/platform/bilibili.py

@@ -10,7 +10,7 @@
 from nonebot.log import logger
 from pydantic import Field, BaseModel
 
-from ..post import Post
+from ..post import Post, PostHeader, PostPayload
 from ..utils import SchedulerConfig, text_similarity
 from ..types import Tag, Target, RawPost, ApiError, Category
 from .platform import NewMessage, StatusChange, CategoryNotSupport, CategoryNotRecognize
@@ -193,7 +193,21 @@ async def parse(self, raw_post: RawPost) -> Post:
             text += orig_text
         else:
             raise CategoryNotSupport(post_type)
-        return Post(self, text, url=url, images=pic, nickname=target_name)
+
+        return Post(
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content=text,
+                images=pic,
+                url=url,
+                author=target_name,
+            ),
+        )
 
 
 class Bilibililive(StatusChange):
@@ -335,13 +349,19 @@ async def parse(self, raw_post: Info) -> Post:
         title = f"[{self.categories[raw_post.category].rstrip('提醒')}] {raw_post.title}"
         target_name = f"{raw_post.uname} {raw_post.area_name}"
         return Post(
-            self,
-            "",
-            title=title,
-            url=url,
-            images=list(pic),
-            nickname=target_name,
-            compress=True,
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content="",
+                title=title,
+                url=url,
+                images=list(pic),
+                author=target_name,
+            ),
         )
 
 
@@ -418,13 +438,19 @@ async def parse(self, raw_post: RawPost) -> Post:
         content = raw_post["index_show"]
         title = lastest_episode["share_copy"]
         return Post(
-            self,
-            content,
-            title=title,
-            url=url,
-            images=list(pic),
-            nickname=target_name,
-            compress=True,
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content=content,
+                title=title,
+                url=url,
+                images=list(pic),
+                author=target_name,
+            ),
         )
 
 

nonebot_bison/platform/ff14.py

@@ -2,10 +2,10 @@
 
 from httpx import AsyncClient
 
-from ..post import Post
 from ..utils import scheduler
 from .platform import NewMessage
 from ..types import Target, RawPost
+from ..post import Post, PostHeader, PostPayload
 
 
 class FF14(NewMessage):
@@ -43,4 +43,17 @@ async def parse(self, raw_post: RawPost) -> Post:
         title = raw_post["Title"]
         text = raw_post["Summary"]
         url = raw_post["Author"]
-        return Post(self, text, title=title, url=url, nickname="最终幻想XIV官方公告")
+        return Post(
+            PostHeader(
+                platform_code=self.platform_name,
+                http_client=self.client,
+                recommend_theme=self.default_theme,
+                compress=True,
+            ),
+            PostPayload(
+                content=text,
+                title=title,
+                url=url,
+                author="最终幻想XIV官方公告",
+            ),
+        )