nonebot-plugin-parser 2.6.5__tar.gz → 2.6.7__tar.gz

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.5
+Version: 2.6.7
 Summary: NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA
 Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
 Author-email: fllesser <fllessive@gmail.com>
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: AsyncIO
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -28,7 +27,7 @@ Requires-Dist: nonebot2>=2.5.0,<3.0.0
 Requires-Dist: apilmoji[rich]>=0.3.1,<1.0.0
 Requires-Dist: beautifulsoup4>=4.12.0,<5.0.0
 Requires-Dist: curl-cffi>=0.13.0,!=0.14.0,<1.0.0
-Requires-Dist: bilibili-api-python>=17.4.1,<18.0.0
+Requires-Dist: bilibili-api-python>=17.4.2,<18.0.0
 Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.60.4,<1.0.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
@@ -316,6 +315,10 @@ parser_emoji_cdn="https://emojicdn.elk.sh"
 
 # [可选] emoji 渲染样式 "apple", "google", "twitter", "facebook"(默认)
 parser_emoji_style="facebook"
+
+# [可选] 是否启用群组黑名单模式(默认启用，即所有群聊的解析都是开启的)
+parser_group_blacklist_enabled=True
+
 ```
 
 </details>

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/README.md

@@ -262,6 +262,10 @@ parser_emoji_cdn="https://emojicdn.elk.sh"
 
 # [可选] emoji 渲染样式 "apple", "google", "twitter", "facebook"(默认)
 parser_emoji_style="facebook"
+
+# [可选] 是否启用群组黑名单模式(默认启用，即所有群聊的解析都是开启的)
+parser_group_blacklist_enabled=True
+
 ```
 
 </details>

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.6.5"
+version = "2.6.7"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -24,7 +24,6 @@ keywords = [
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Framework :: AsyncIO",
-  "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
@@ -48,7 +47,7 @@ dependencies = [
   "apilmoji[rich]>=0.3.1,<1.0.0",
   "beautifulsoup4>=4.12.0,<5.0.0",
   "curl_cffi>=0.13.0,<1.0.0,!=0.14.0",
-  "bilibili-api-python>=17.4.1,<18.0.0",
+  "bilibili-api-python>=17.4.2,<18.0.0",
   "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
   "nonebot-plugin-alconna>=0.60.4,<1.0.0",
   "nonebot-plugin-localstore>=0.7.4,<1.0.0",
@@ -100,7 +99,7 @@ pydantic-v2 = ["pydantic>=2.0.0"]
 telegram = ["nonebot-adapter-telegram>=0.1.0b20"]
 
 [build-system]
-requires = ["uv_build>=0.10.0,<0.11.0"]
+requires = ["uv_build>=0.11.0,<0.12.0"]
 build-backend = "uv_build"
 
 [tool.uv]
@@ -116,7 +115,7 @@ conflicts = [
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.6.5"
+current_version = "2.6.7"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/config.py

@@ -56,6 +56,8 @@ class Config(BaseModel):
     """Pilmoji 表情 CDN"""
     parser_emoji_style: EmojiStyle = EmojiStyle.FACEBOOK
     """Pilmoji 表情样式"""
+    parser_group_blacklist_enabled: bool = True
+    """是否启用群组黑名单模式(默认启用，即所有群聊的解析都是开启的)"""
 
     @property
     def nickname(self) -> str:
@@ -182,6 +184,11 @@ class Config(BaseModel):
         """Pilmoji 表情样式"""
         return self.parser_emoji_style
 
+    @property
+    def group_blacklist_enabled(self) -> bool:
+        """是否启用群组黑名单模式"""
+        return self.parser_group_blacklist_enabled
+
 
 pconfig: Config = get_plugin_config(Config)
 """插件配置"""

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/matchers/filter.py

@@ -0,0 +1,82 @@
+import json
+from pathlib import Path
+
+from nonebot import on_command
+from nonebot.rule import to_me
+from nonebot.matcher import Matcher
+from nonebot.permission import SUPERUSER
+from nonebot_plugin_uninfo import ADMIN, Session, UniSession
+
+from ..config import pconfig
+
+_DISABLED_GROUPS_PATH: Path = pconfig.data_dir / "disabled_groups.json"
+_GROUP_SET_PATH: Path = pconfig.data_dir / "group_set.json"
+
+
+def _load_or_initialize_set() -> set[str]:
+    """加载群配置"""
+    # 判断是否存在
+    if not _GROUP_SET_PATH.exists():
+        if _DISABLED_GROUPS_PATH.exists():
+            # 迁移旧的关闭解析名单
+            _DISABLED_GROUPS_PATH.rename(_GROUP_SET_PATH)
+        else:
+            _GROUP_SET_PATH.write_text(json.dumps([]))
+
+    return set(json.loads(_GROUP_SET_PATH.read_text()))
+
+
+_GROUP_SET: set[str] = _load_or_initialize_set()
+
+
+def _save_group_set():
+    _GROUP_SET_PATH.write_text(json.dumps(list(_GROUP_SET)))
+
+
+def _add_group(group_key: str):
+    _GROUP_SET.add(group_key)
+    _save_group_set()
+
+
+def _remove_group(group_key: str):
+    _GROUP_SET.discard(group_key)
+    _save_group_set()
+
+
+def _get_group_key(session: Session) -> str:
+    """获取群组的唯一标识符 由平台名称和会话场景 ID 组成，例如 `QQClient_123456789`"""
+    return f"{session.scope}_{session.scene_path}"
+
+
+def is_enabled(session: Session = UniSession()) -> bool:
+    """判断当前会话是否在关闭解析的名单中"""
+    if session.scene.is_private:
+        return True
+
+    group_key = _get_group_key(session)
+    if pconfig.group_blacklist_enabled:
+        return group_key not in _GROUP_SET
+    else:
+        return group_key in _GROUP_SET
+
+
+@on_command("开启解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
+async def _(matcher: Matcher, session: Session = UniSession()):
+    """开启解析"""
+    group_key = _get_group_key(session)
+    if pconfig.group_blacklist_enabled:
+        _remove_group(group_key)
+    else:
+        _add_group(group_key)
+    await matcher.finish("解析已开启")
+
+
+@on_command("关闭解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
+async def _(matcher: Matcher, session: Session = UniSession()):
+    """关闭解析"""
+    group_key = _get_group_key(session)
+    if pconfig.group_blacklist_enabled:
+        _add_group(group_key)
+    else:
+        _remove_group(group_key)
+    await matcher.finish("解析已关闭")

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/parsers/bilibili/opus.py

@@ -11,7 +11,7 @@ class Author(Struct):
     face: str
     mid: int
     pub_time: str
-    pub_ts: int
+    pub_ts: str
 
 
 class Image(Struct):
@@ -115,7 +115,7 @@ class OpusItem(Struct):
         """获取发布时间戳"""
         for module in self.item.modules:
             if module.module_type == "MODULE_TYPE_AUTHOR" and module.module_author:
-                return module.module_author.pub_ts
+                return int(module.module_author.pub_ts)
         return None
 
     def extract_nodes(self):

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/parsers/task.py

@@ -3,6 +3,10 @@ from asyncio import Task, create_task
 from pathlib import Path
 from collections.abc import Callable, Coroutine
 
+from nonebot import logger
+
+from ..exception import ParseException
+
 
 class PathTask:
     __slots__ = ("_path", "_task")
@@ -31,6 +35,8 @@ class PathTask:
         try:
             return await self.get()
         except Exception as e:
+            if not isinstance(e, ParseException):
+                logger.opt(exception=e).error(f"task({self._task.get_name()}) failed")
             if on_error is not None:
                 on_error(e)
             return None

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/parsers/xiaohongshu/__init__.py

@@ -33,7 +33,7 @@ class XiaoHongShuParser(BaseParser):
             self.headers["cookie"] = pconfig.xhs_ck
             self.ios_headers["cookie"] = pconfig.xhs_ck
 
-    @handle("xhslink.com", r"xhslink\.com/[A-Za-z0-9._?%&+=/#@-]+")
+    @handle("xhslink", r"xhslink\.(com|cn)/[A-Za-z0-9._?%&+=/#@-]+")
     async def _parse_short_link(self, searched: re.Match[str]):
         url = f"https://{searched.group(0)}"
         return await self.parse_with_redirect(url, self.ios_headers)

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/renders/__init__.py

@@ -1,6 +1,6 @@
 import importlib
 
-from nonebot import logger, get_driver
+from nonebot import logger
 
 from .base import BaseRenderer
 from .common import CommonRenderer
@@ -37,8 +37,3 @@ def get_renderer(platform: str) -> type[BaseRenderer]:
 
     module = importlib.import_module("." + platform, package=__name__)
     return getattr(module, "Renderer")
-
-
-@get_driver().on_startup
-async def load_resources():
-    CommonRenderer.load_resources()

{nonebot_plugin_parser-2.6.5 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/renders/base.py

@@ -11,7 +11,7 @@ import aiofiles
 from ..config import pconfig
 from ..helper import UniHelper, UniMessage, ForwardNodeInner
 from ..parsers import ParseResult, AudioContent, ImageContent, VideoContent
-from ..exception import DownloadException
+from ..exception import IgnoreException, DownloadException
 
 
 class BaseRenderer(ABC):
@@ -39,7 +39,7 @@ class BaseRenderer(ABC):
         other_segs: list[ForwardNodeInner] = []
 
         def on_error(e: Exception):
-            if isinstance(e, DownloadException):
+            if not isinstance(e, IgnoreException):
                 nonlocal failed_count
                 failed_count += 1
 

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/renders/common/__init__.py

@@ -0,0 +1,4 @@
+from .assets import load_resources, ensure_resources
+from .renderer import CommonRenderer
+
+__all__ = ["CommonRenderer", "ensure_resources", "load_resources"]

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/renders/common/assets.py

@@ -0,0 +1,103 @@
+from __future__ import annotations
+
+from PIL import Image
+from nonebot import logger, get_driver
+from apilmoji import EmojiCDNSource
+
+from .. import resources
+from .font import CardFonts, CardTheme
+from ...config import pconfig
+
+PILImage = Image.Image
+
+# apilmoji emoji 源
+EMOJI_SOURCE = EmojiCDNSource(
+    base_url=pconfig.emoji_cdn,
+    style=pconfig.emoji_style,
+    cache_dir=pconfig.cache_dir / "emojis",
+    show_progress=True,
+)
+
+DEFAULT_THEME = CardTheme(
+    name=(0, 122, 255),
+    title=(102, 51, 153),
+    body=(51, 51, 51),
+    muted=(136, 136, 136),
+)
+
+AVATAR_SIZE = 80
+FONTS: CardFonts
+PLATFORM_LOGOS: dict[str, PILImage]
+AVATAR_IMAGE: PILImage
+VIDEO_BUTTON_IMAGE: PILImage
+
+_resources_loaded = False
+
+
+@get_driver().on_startup
+async def load_common_renderer_resources():
+    load_resources()
+
+
+def ensure_resources() -> None:
+    if _resources_loaded:
+        return
+    load_resources()
+
+
+def load_resources() -> None:
+    """加载渲染资源（幂等）"""
+    global _resources_loaded, FONTS, PLATFORM_LOGOS, AVATAR_IMAGE, VIDEO_BUTTON_IMAGE
+
+    if _resources_loaded:
+        return
+
+    FONTS = _load_fonts()
+    PLATFORM_LOGOS = _load_platform_logos()
+    AVATAR_IMAGE = _load_default_avatar()
+    VIDEO_BUTTON_IMAGE = _load_video_button()
+
+    _resources_loaded = True
+
+
+def _load_fonts() -> CardFonts:
+    """字体（昵称 / 标题 / 正文 / 辅助文案）"""
+    font_path = pconfig.custom_font or resources.DEFAULT_FONT_PATH
+    loaded = CardFonts.load(font_path, DEFAULT_THEME)
+    logger.success(f"加载字体「{font_path.name}」成功")
+    return loaded
+
+
+def _load_platform_logos() -> dict[str, PILImage]:
+    """平台 Logo"""
+    from ...constants import PlatformEnum
+
+    logos: dict[str, PILImage] = {}
+    loaded_platforms = []
+    for platform_name in PlatformEnum:
+        logo_path = resources.RESOURCES_DIR / f"{platform_name}.png"
+        if logo_path.exists():
+            with Image.open(logo_path) as img:
+                logos[str(platform_name)] = img.convert("RGBA")
+                loaded_platforms.append(platform_name)
+    logger.debug(f"加载 Logo「{', '.join(loaded_platforms)}」成功")
+    return logos
+
+
+def _load_default_avatar() -> PILImage:
+    """默认头像（作者无头像或加载失败时回退）"""
+    with Image.open(resources.DEFAULT_AVATAR_PATH) as img:
+        loaded = img.convert("RGBA").resize((AVATAR_SIZE, AVATAR_SIZE))
+    logger.debug(f"加载头像「{resources.DEFAULT_AVATAR_PATH.name}」成功")
+    return loaded
+
+
+def _load_video_button() -> PILImage:
+    """视频播放按钮（封面居中叠加，半透明）"""
+    with Image.open(resources.DEFAULT_VIDEO_BUTTON_PATH) as img:
+        button = img.convert("RGBA").resize((100, 100))
+    alpha = button.split()[-1]
+    alpha = alpha.point(lambda x: int(x * 0.6))
+    button.putalpha(alpha)
+    logger.debug(f"加载视频播放按钮「{resources.DEFAULT_VIDEO_BUTTON_PATH.name}」成功")
+    return button

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/renders/common/font.py

@@ -0,0 +1,86 @@
+from __future__ import annotations
+
+from pathlib import Path
+from functools import lru_cache
+from dataclasses import dataclass
+
+from PIL import ImageFont
+from apilmoji.core import get_font_height
+
+Color = tuple[int, int, int]
+
+
+@dataclass(eq=False, frozen=True, slots=True)
+class FontMetrics:
+    """字体度量（换行、估高）"""
+
+    font: ImageFont.FreeTypeFont
+    line_height: int
+    cjk_width: int
+
+    def __hash__(self) -> int:
+        return hash((id(self.font), self.line_height, self.cjk_width))
+
+    @lru_cache(maxsize=500)
+    def get_char_width(self, char: str) -> int:
+        bbox = self.font.getbbox(char)
+        return int(bbox[2] - bbox[0])
+
+    def get_char_width_fast(self, char: str) -> int:
+        if "\u4e00" <= char <= "\u9fff":
+            return self.cjk_width
+        return self.get_char_width(char)
+
+    def get_text_width(self, text: str) -> int:
+        if not text:
+            return 0
+        return sum(self.get_char_width_fast(char) for char in text)
+
+
+@dataclass(frozen=True, slots=True)
+class CardTheme:
+    """卡片颜色"""
+
+    name: Color
+    title: Color
+    body: Color
+    muted: Color
+
+
+@dataclass(frozen=True, slots=True)
+class StyledFont:
+    """度量 + 颜色"""
+
+    metrics: FontMetrics
+    fill: Color
+
+
+def _load_styled(font_path: Path, size: int, fill: Color) -> StyledFont:
+    font = ImageFont.truetype(font_path, size)
+    return StyledFont(
+        metrics=FontMetrics(
+            font=font,
+            line_height=get_font_height(font),
+            cjk_width=size,
+        ),
+        fill=fill,
+    )
+
+
+@dataclass(frozen=True, slots=True)
+class CardFonts:
+    """卡片各区块字体（加载时组合 theme)"""
+
+    name: StyledFont
+    title: StyledFont
+    body: StyledFont
+    muted: StyledFont
+
+    @classmethod
+    def load(cls, font_path: Path, theme: CardTheme) -> CardFonts:
+        return cls(
+            name=_load_styled(font_path, 28, theme.name),
+            title=_load_styled(font_path, 30, theme.title),
+            body=_load_styled(font_path, 24, theme.body),
+            muted=_load_styled(font_path, 24, theme.muted),
+        )

nonebot_plugin_parser-2.6.5/src/nonebot_plugin_parser/renders/common.py → nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/renders/common/renderer.py

@@ -1,19 +1,17 @@
 from io import BytesIO
 from typing import ClassVar
 from pathlib import Path
-from functools import lru_cache
-from dataclasses import dataclass
 from typing_extensions import override
 
 import emoji
 from PIL import Image, ImageDraw, ImageFont
 from nonebot import logger
-from apilmoji import Apilmoji, EmojiCDNSource
-from apilmoji.core import get_font_height
+from apilmoji import Apilmoji
 
-from . import resources
-from .base import ParseResult, ImageContent, ImageRenderer
-from ..config import pconfig
+from . import assets
+from .. import resources
+from .font import StyledFont, FontMetrics
+from ..base import ParseResult, ImageContent, ImageRenderer
 
 Color = tuple[int, int, int]
 PILImage = Image.Image
@@ -28,71 +26,11 @@ except OSError:
     emosvg = None
 
 
-@dataclass(eq=False, frozen=True, slots=True)
-class FontInfo:
-    """字体信息数据类"""
-
-    font: ImageFont.FreeTypeFont
-    fill: Color
-    line_height: int
-    cjk_width: int
-
-    def __hash__(self) -> int:
-        return hash((id(self.font), self.line_height, self.cjk_width, self.fill))
-
-    @lru_cache(maxsize=500)
-    def get_char_width(self, char: str) -> int:
-        bbox = self.font.getbbox(char)
-        return int(bbox[2] - bbox[0])
-
-    def get_char_width_fast(self, char: str) -> int:
-        if "\u4e00" <= char <= "\u9fff":
-            return self.cjk_width
-        return self.get_char_width(char)
-
-    def get_text_width(self, text: str) -> int:
-        if not text:
-            return 0
-        return sum(self.get_char_width_fast(char) for char in text)
-
-
-@dataclass(eq=False, frozen=True, slots=True)
-class FontSet:
-    """字体集数据类"""
-
-    _FONT_INFOS = (
-        ("name", 28, (0, 122, 255)),
-        ("title", 30, (102, 51, 153)),
-        ("text", 24, (51, 51, 51)),
-        ("extra", 24, (136, 136, 136)),
-    )
-
-    name: FontInfo
-    title: FontInfo
-    text: FontInfo
-    extra: FontInfo
-
-    @classmethod
-    def new(cls, font_path: Path):
-        font_infos: dict[str, FontInfo] = {}
-        for name, size, fill in cls._FONT_INFOS:
-            font = ImageFont.truetype(font_path, size)
-            height = get_font_height(font)
-            font_infos[name] = FontInfo(
-                font=font,
-                fill=fill,
-                line_height=height,
-                cjk_width=size,
-            )
-        return FontSet(**font_infos)
-
-
 class CommonRenderer(ImageRenderer):
     """统一渲染器"""
 
     # 布局常量
     PADDING = 25
-    AVATAR_SIZE = 80
     AVATAR_TEXT_GAP = 15
     SECTION_SPACING = 15
     NAME_TIME_GAP = 5
@@ -116,16 +54,9 @@ class CommonRenderer(ImageRenderer):
     REPOST_BG_COLOR: ClassVar[Color] = (247, 247, 247)
     REPOST_BORDER_COLOR: ClassVar[Color] = (230, 230, 230)
 
-    # apilmoji emoji 源
-    EMOJI_SOURCE: ClassVar[EmojiCDNSource] = EmojiCDNSource(
-        base_url=pconfig.emoji_cdn,
-        style=pconfig.emoji_style,
-        cache_dir=pconfig.cache_dir / "emojis",
-        show_progress=True,
-    )
-
     def __init__(self, result: ParseResult, not_repost: bool = True):
         super().__init__(result, not_repost)
+        assets.ensure_resources()
 
         self.card_width: int = self.DEFAULT_CARD_WIDTH
         self.content_width: int = self.card_width - 2 * self.PADDING
@@ -140,49 +71,6 @@ class CommonRenderer(ImageRenderer):
                 False,
             )
 
-    @classmethod
-    def load_resources(cls):
-        """加载资源"""
-        cls._load_fonts()
-        cls._load_platform_logos()
-        cls._load_other_resources()
-
-    @classmethod
-    def _load_fonts(cls):
-        font_path = pconfig.custom_font or resources.DEFAULT_FONT_PATH
-        cls.fontset = FontSet.new(font_path)
-        logger.success(f"加载字体「{font_path.name}」成功")
-
-    @classmethod
-    def _load_platform_logos(cls):
-        from ..constants import PlatformEnum
-
-        cls.platform_logos: dict[str, PILImage] = {}
-        loaded_platforms = []
-        for platform_name in PlatformEnum:
-            logo_path = resources.RESOURCES_DIR / f"{platform_name}.png"
-
-            if logo_path.exists():
-                with Image.open(logo_path) as img:
-                    cls.platform_logos[str(platform_name)] = img.convert("RGBA")
-                    loaded_platforms.append(platform_name)
-        logger.debug(f"加载 Logo「{', '.join(loaded_platforms)}」成功")
-
-    @classmethod
-    def _load_other_resources(cls):
-        # avatar
-        with Image.open(resources.DEFAULT_AVATAR_PATH) as img:
-            cls.avatar_image: PILImage = img.convert("RGBA").resize((cls.AVATAR_SIZE, cls.AVATAR_SIZE))
-        logger.debug(f"加载头像「{resources.DEFAULT_AVATAR_PATH.name}」成功")
-
-        # video button
-        with Image.open(resources.DEFAULT_VIDEO_BUTTON_PATH) as img:
-            cls.video_button_image: PILImage = img.convert("RGBA").resize((100, 100))
-        alpha = cls.video_button_image.split()[-1]
-        alpha = alpha.point(lambda x: int(x * 0.6))
-        cls.video_button_image.putalpha(alpha)
-        logger.debug(f"加载视频播放按钮「{resources.DEFAULT_VIDEO_BUTTON_PATH.name}」成功")
-
     @override
     async def render_image(self) -> bytes:
         image = await self._render_image()
@@ -214,11 +102,11 @@ class CommonRenderer(ImageRenderer):
     def _estimate_text_height(
         self,
         text: str,
-        font: FontInfo,
+        metrics: FontMetrics,
         content_width: int,
     ) -> int:
         """估算文本高度（考虑换行符）"""
-        return (text.count("\n") + 1 + len(text) * font.cjk_width // content_width) * font.line_height
+        return (text.count("\n") + 1 + len(text) * metrics.cjk_width // content_width) * metrics.line_height
 
     def _estimate_height(self) -> int:
         """估算画布高度"""
@@ -227,13 +115,13 @@ class CommonRenderer(ImageRenderer):
 
         # 头部（头像 + 名称 + 时间）
         if self.result.author:
-            height += self.AVATAR_SIZE + self.SECTION_SPACING
+            height += assets.AVATAR_SIZE + self.SECTION_SPACING
 
         # 标题
         if self.result.title:
             height += self._estimate_text_height(
                 self.result.title,
-                self.fontset.title,
+                assets.FONTS.title.metrics,
                 self.content_width,
             )
             height += self.SECTION_SPACING
@@ -244,7 +132,7 @@ class CommonRenderer(ImageRenderer):
                 if isinstance(item, str):
                     height += self._estimate_text_height(
                         item,
-                        self.fontset.text,
+                        assets.FONTS.body.metrics,
                         self.content_width,
                     )
                 else:
@@ -258,14 +146,19 @@ class CommonRenderer(ImageRenderer):
         if self.result.text:
             height += self._estimate_text_height(
                 self.result.text,
-                self.fontset.text,
+                assets.FONTS.body.metrics,
                 self.content_width,
             )
             height += self.SECTION_SPACING
 
         # 额外信息
         if self.result.extra_info:
-            height += self.fontset.extra.line_height * 3 + self.SECTION_SPACING
+            height += self._estimate_text_height(
+                self.result.extra_info,
+                assets.FONTS.muted.metrics,
+                self.content_width,
+            )
+            height += self.SECTION_SPACING
 
         # 转发内容
         if self.result.repost:
@@ -288,21 +181,21 @@ class CommonRenderer(ImageRenderer):
             self._image.paste(avatar, (x_pos, self.y_pos), avatar)
 
         # 文字区域
-        text_x = self.PADDING + self.AVATAR_SIZE + self.AVATAR_TEXT_GAP
-        name_height = self.fontset.name.line_height
+        text_x = self.PADDING + assets.AVATAR_SIZE + self.AVATAR_TEXT_GAP
+        name_height = assets.FONTS.name.metrics.line_height
         time_str = self.result.formartted_datetime
-        time_height = (self.NAME_TIME_GAP + self.fontset.extra.line_height) if time_str else 0
+        time_height = (self.NAME_TIME_GAP + assets.FONTS.muted.metrics.line_height) if time_str else 0
         text_height = name_height + time_height
 
         # 垂直居中
-        text_y = self.y_pos + (self.AVATAR_SIZE - text_height) // 2
+        text_y = self.y_pos + (assets.AVATAR_SIZE - text_height) // 2
 
         # 名称
         self._draw.text(
             (text_x, text_y),
             self.result.author.name,
-            font=self.fontset.name.font,
-            fill=self.fontset.name.fill,
+            font=assets.FONTS.name.metrics.font,
+            fill=assets.FONTS.name.fill,
         )
         text_y += name_height
 
@@ -312,39 +205,39 @@ class CommonRenderer(ImageRenderer):
             self._draw.text(
                 (text_x, text_y),
                 time_str,
-                font=self.fontset.extra.font,
-                fill=self.fontset.extra.fill,
+                font=assets.FONTS.muted.metrics.font,
+                fill=assets.FONTS.muted.fill,
             )
 
         # 平台 Logo
         if self.not_repost:
             platform_name = self.result.platform.name
-            if platform_name in self.platform_logos:
-                logo = self.platform_logos[platform_name]
+            if platform_name in assets.PLATFORM_LOGOS:
+                logo = assets.PLATFORM_LOGOS[platform_name]
                 logo_x = self._image.width - self.PADDING - logo.width
-                logo_y = self.y_pos + (self.AVATAR_SIZE - logo.height) // 2
+                logo_y = self.y_pos + (assets.AVATAR_SIZE - logo.height) // 2
                 self._image.paste(logo, (logo_x, logo_y), logo)
 
-        self.y_pos += self.AVATAR_SIZE + self.SECTION_SPACING
+        self.y_pos += assets.AVATAR_SIZE + self.SECTION_SPACING
 
     def _load_avatar(self, avatar_path: Path | None) -> PILImage:
         """加载头像（带圆形裁剪）"""
         if avatar_path is None or not avatar_path.exists():
-            return self.avatar_image
+            return assets.AVATAR_IMAGE
 
         try:
             with Image.open(avatar_path) as img:
                 avatar = img.convert("RGBA")
                 avatar = avatar.resize(
-                    (self.AVATAR_SIZE, self.AVATAR_SIZE),
+                    (assets.AVATAR_SIZE, assets.AVATAR_SIZE),
                     Image.Resampling.LANCZOS,
                 )
         except Exception:
-            return self.avatar_image
+            return assets.AVATAR_IMAGE
 
         # 圆形遮罩
-        mask = Image.new("L", (self.AVATAR_SIZE, self.AVATAR_SIZE), 0)
-        ImageDraw.Draw(mask).ellipse((0, 0, self.AVATAR_SIZE - 1, self.AVATAR_SIZE - 1), fill=255)
+        mask = Image.new("L", (assets.AVATAR_SIZE, assets.AVATAR_SIZE), 0)
+        ImageDraw.Draw(mask).ellipse((0, 0, assets.AVATAR_SIZE - 1, assets.AVATAR_SIZE - 1), fill=255)
         avatar.putalpha(mask)
         return avatar
 
@@ -356,9 +249,9 @@ class CommonRenderer(ImageRenderer):
         lines = self._wrap_text(
             self.result.title,
             self.content_width,
-            self.fontset.title,
+            assets.FONTS.title.metrics,
         )
-        self.y_pos += await self._draw_text(lines, self.fontset.title)
+        self.y_pos += await self._draw_text(lines, assets.FONTS.title)
         self.y_pos += self.SECTION_SPACING
 
     async def _render_main_content(self) -> None:
@@ -416,15 +309,15 @@ class CommonRenderer(ImageRenderer):
             btn_size = 100
             btn_x, btn_y = (img.width - btn_size) // 2, (img.height - btn_size) // 2
             img.paste(
-                self.video_button_image,
+                assets.VIDEO_BUTTON_IMAGE,
                 (btn_x, btn_y),
-                self.video_button_image,
+                assets.VIDEO_BUTTON_IMAGE,
             )
 
             # 视频时长
             # display_duration = video_content.display_duration
 
-            # font = self.fontset.extra
+            # paint = assets.FONTS.muted
             # text_width = font.get_text_width(display_duration)
             # # 计算文本绘制位置
             # text_x = img.width - text_width - 20
@@ -450,8 +343,8 @@ class CommonRenderer(ImageRenderer):
             # ImageDraw.Draw(img).text(
             #     (text_x, text_y),
             #     display_duration,
-            #     font=self.fontset.extra.font,
-            #     fill=self.fontset.extra.fill,
+            #     font=paint.metrics.font,
+            #     fill=paint.fill,
             # )
 
             return img.copy()
@@ -594,15 +487,16 @@ class CommonRenderer(ImageRenderer):
         # Alt 文本
         if image_content.alt:
             self.y_pos += self.SECTION_SPACING
-            text_w = self.fontset.extra.get_text_width(image_content.alt)
+            paint = assets.FONTS.muted
+            text_w = paint.metrics.get_text_width(image_content.alt)
             text_x = self.PADDING + (self.content_width - text_w) // 2
             self._draw.text(
                 (text_x, self.y_pos),
                 image_content.alt,
-                font=self.fontset.extra.font,
-                fill=self.fontset.extra.fill,
+                font=paint.metrics.font,
+                fill=paint.fill,
             )
-            self.y_pos += self.fontset.extra.line_height
+            self.y_pos += paint.metrics.line_height
 
         self.y_pos += self.SECTION_SPACING
 
@@ -615,9 +509,9 @@ class CommonRenderer(ImageRenderer):
         lines = self._wrap_text(
             text,
             self.content_width,
-            self.fontset.text,
+            assets.FONTS.body.metrics,
         )
-        self.y_pos += await self._draw_text(lines, self.fontset.text)
+        self.y_pos += await self._draw_text(lines, assets.FONTS.body)
         self.y_pos += self.SECTION_SPACING
 
     async def _render_extra(self) -> None:
@@ -628,9 +522,9 @@ class CommonRenderer(ImageRenderer):
         lines = self._wrap_text(
             self.result.extra_info,
             self.content_width,
-            self.fontset.extra,
+            assets.FONTS.muted.metrics,
         )
-        self.y_pos += await self._draw_text(lines, self.fontset.extra)
+        self.y_pos += await self._draw_text(lines, assets.FONTS.muted)
 
     async def _render_repost(self) -> None:
         """渲染转发内容"""
@@ -664,34 +558,35 @@ class CommonRenderer(ImageRenderer):
         self._image.paste(repost_img, (card_x, card_y))
         self.y_pos += container_h + self.SECTION_SPACING
 
-    async def _draw_text(self, lines: list[str], font: FontInfo) -> int:
+    async def _draw_text(self, lines: list[str], styled: StyledFont) -> int:
         """绘制多行文本"""
         if not lines:
             return 0
 
+        metrics = styled.metrics
         xy = (self.PADDING, self.y_pos)
         if emosvg is not None:
             emosvg.text(
                 self._image,
                 xy,
                 lines,
-                font.font,
-                fill=font.fill,
-                line_height=font.line_height,
+                metrics.font,
+                fill=styled.fill,
+                line_height=metrics.line_height,
             )
         else:
             await Apilmoji.text(
                 self._image,
                 xy,
                 lines,
-                font.font,
-                fill=font.fill,
-                line_height=font.line_height,
-                source=self.EMOJI_SOURCE,
+                metrics.font,
+                fill=styled.fill,
+                line_height=metrics.line_height,
+                source=assets.EMOJI_SOURCE,
             )
-        return font.line_height * len(lines)
+        return metrics.line_height * len(lines)
 
-    def _wrap_text(self, text: str, max_width: int, font: FontInfo) -> list[str]:
+    def _wrap_text(self, text: str, max_width: int, metrics: FontMetrics) -> list[str]:
         """文本自动换行"""
         if not text:
             return []
@@ -718,12 +613,12 @@ class CommonRenderer(ImageRenderer):
                     if ed["match_start"] == idx:
                         char = ed["emoji"]
                         idx = ed["match_end"]
-                        char_width = font.font.size
+                        char_width = metrics.font.size
                         break
                 else:
                     char = paragraph[idx]
                     idx += 1
-                    char_width = font.get_char_width_fast(char)
+                    char_width = metrics.get_char_width_fast(char)
 
                 if not current_line:
                     current_line = char

nonebot_plugin_parser-2.6.5/src/nonebot_plugin_parser/matchers/filter.py

@@ -1,72 +0,0 @@
-import json
-from pathlib import Path
-
-from nonebot import on_command
-from nonebot.rule import to_me
-from nonebot.matcher import Matcher
-from nonebot.permission import SUPERUSER
-from nonebot_plugin_uninfo import ADMIN, Session, UniSession
-
-from ..config import pconfig
-
-_DISABLED_GROUPS_PATH: Path = pconfig.data_dir / "disabled_groups.json"
-
-
-def load_or_initialize_set() -> set[str]:
-    """加载或初始化关闭解析的名单"""
-    # 判断是否存在
-    if not _DISABLED_GROUPS_PATH.exists():
-        _DISABLED_GROUPS_PATH.write_text(json.dumps([]))
-    return set(json.loads(_DISABLED_GROUPS_PATH.read_text()))
-
-
-def save_disabled_groups():
-    """保存关闭解析的名单"""
-    _DISABLED_GROUPS_PATH.write_text(json.dumps(list(_DISABLED_GROUPS_SET)))
-
-
-# 内存中关闭解析的名单，第一次先进行初始化
-_DISABLED_GROUPS_SET: set[str] = load_or_initialize_set()
-
-
-def get_group_key(session: Session) -> str:
-    """获取群组的唯一标识符
-
-    由平台名称和会话场景 ID 组成，例如 `QQClient_123456789`。
-    """
-    return f"{session.scope}_{session.scene_path}"
-
-
-def is_enabled(session: Session = UniSession()) -> bool:
-    """判断当前会话是否在关闭解析的名单中"""
-    if session.scene.is_private:
-        return True
-
-    group_key = get_group_key(session)
-    if group_key in _DISABLED_GROUPS_SET:
-        return False
-    return True
-
-
-@on_command("开启解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
-async def _(matcher: Matcher, session: Session = UniSession()):
-    """开启解析"""
-    group_key = get_group_key(session)
-    if group_key in _DISABLED_GROUPS_SET:
-        _DISABLED_GROUPS_SET.remove(group_key)
-        save_disabled_groups()
-        await matcher.finish("解析已开启")
-    else:
-        await matcher.finish("解析已开启，无需重复开启")
-
-
-@on_command("关闭解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
-async def _(matcher: Matcher, session: Session = UniSession()):
-    """关闭解析"""
-    group_key = get_group_key(session)
-    if group_key not in _DISABLED_GROUPS_SET:
-        _DISABLED_GROUPS_SET.add(group_key)
-        save_disabled_groups()
-        await matcher.finish("解析已关闭")
-    else:
-        await matcher.finish("解析已关闭，无需重复关闭")