nonebot-plugin-parser 2.6.1__tar.gz → 2.6.2__tar.gz

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.1
+Version: 2.6.2
 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
@@ -24,7 +24,7 @@ Requires-Dist: pillow>=11.0.0
 Requires-Dist: aiofiles>=25.1.0
 Requires-Dist: httpx>=0.27.2,<1.0.0
 Requires-Dist: msgspec>=0.20.0,<1.0.0
-Requires-Dist: nonebot2>=2.4.3,<3.0.0
+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
@@ -65,7 +65,7 @@ Description-Content-Type: text/markdown
 [![uv](https://img.shields.io/badge/package%20manager-uv-black?style=flat-square&logo=uv)](https://github.com/astral-sh/uv)
 [![ruff](https://img.shields.io/badge/code%20style-ruff-black?style=flat-square&logo=ruff)](https://github.com/astral-sh/ruff)
 <br/>
-[![pre-commit](https://results.pre-commit.ci/badge/github/fllesser/nonebot-plugin-parser/master.svg)](https://results.pre-commit.ci/latest/github/fllesser/nonebot-plugin-parser/master)
+[![prek](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/j178/prek/master/docs/assets/badge-v0.json)](https://github.com/j178/prek)
 [![codecov](https://codecov.io/gh/fllesser/nonebot-plugin-parser/graph/badge.svg?token=VCS8IHSO7U)](https://codecov.io/gh/fllesser/nonebot-plugin-parser)
 [![qqgroup](https://img.shields.io/badge/QQ%E7%BE%A4-820082006-orange?style=flat-square)](https://qm.qq.com/q/y4T4CjHimc)
 

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/README.md

@@ -11,7 +11,7 @@
 [![uv](https://img.shields.io/badge/package%20manager-uv-black?style=flat-square&logo=uv)](https://github.com/astral-sh/uv)
 [![ruff](https://img.shields.io/badge/code%20style-ruff-black?style=flat-square&logo=ruff)](https://github.com/astral-sh/ruff)
 <br/>
-[![pre-commit](https://results.pre-commit.ci/badge/github/fllesser/nonebot-plugin-parser/master.svg)](https://results.pre-commit.ci/latest/github/fllesser/nonebot-plugin-parser/master)
+[![prek](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/j178/prek/master/docs/assets/badge-v0.json)](https://github.com/j178/prek)
 [![codecov](https://codecov.io/gh/fllesser/nonebot-plugin-parser/graph/badge.svg?token=VCS8IHSO7U)](https://codecov.io/gh/fllesser/nonebot-plugin-parser)
 [![qqgroup](https://img.shields.io/badge/QQ%E7%BE%A4-820082006-orange?style=flat-square)](https://qm.qq.com/q/y4T4CjHimc)
 

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.6.1"
+version = "2.6.2"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -44,7 +44,7 @@ dependencies = [
   "aiofiles>=25.1.0",
   "httpx>=0.27.2,<1.0.0",
   "msgspec>=0.20.0,<1.0.0",
-  "nonebot2>=2.4.3,<3.0.0",
+  "nonebot2>=2.5.0,<3.0.0",
   "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",
@@ -74,7 +74,7 @@ all = [
 
 [dependency-groups]
 dev = [
-  "nonebot2[fastapi]>=2.4.3,<3.0.0",
+  "nonebot2[fastapi]>=2.5.0,<3.0.0",
   "nonebot-adapter-onebot>=2.4.6",
   "ruff>=0.15.6,<1.0.0",
   { include-group = "extras" },
@@ -88,8 +88,8 @@ extras = [
   "types-yt-dlp>=2026.3.13.20260314",
 ]
 test = [
-  "nonebug>=0.4.3,<1.0.0",
-  "poethepoet>=0.42.1",
+  "nonebug>=0.4.4,<1.0.0",
+  "poethepoet>=0.42.1,<1.0.0",
   "pytest-asyncio>=1.3.0,<1.4.0",
   "pytest-cov>=7.0.0",
   "pytest-xdist>=3.8.0,<4.0.0",
@@ -112,13 +112,11 @@ conflicts = [
   ],
 ]
 
-[tool.uv.sources]
-nonebug = { git = "https://github.com/nonebot/nonebug", rev = "master" }
 
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.6.1"
+current_version = "2.6.2"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/acfun/__init__.py

@@ -50,7 +50,7 @@ class AcfunParser(BaseParser):
             text=video_info.text,
             author=author,
             timestamp=video_info.timestamp,
-            video=video_content,
+            contents=[video_content],
         )
 
     async def parse_video_info(self, url: str):

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/base.py

@@ -179,31 +179,48 @@ class BaseParser:
         url_or_task: str | Task[Path],
         cover_url: str | None = None,
         duration: float | None = None,
+        is_gif: bool = False,
     ):
-        """创建视频内容"""
+        """创建视频内容, 未指定封面时会尝试从视频中提取封面"""
         from .data import VideoContent
-        from ..utils import extract_video_cover
+        from ..utils import convert_video_to_gif, extract_video_first_frame
 
         if isinstance(url_or_task, str):
             path_task = downloader.download_video(url_or_task, ext_headers=self.headers)
         elif isinstance(url_or_task, Task):
             path_task = url_or_task
 
+        video_content = VideoContent(PathTask(path_task), duration=duration, is_gif=is_gif)
+
         if cover_url:
             cover_task = downloader.download_img(cover_url, ext_headers=self.headers)
         else:
             # 如果没有封面 URL，尝试从视频中提取封面
             async def extract_cover():
                 video_path = await path_task
-                return await extract_video_cover(video_path)
+                return await extract_video_first_frame(video_path)
 
             cover_task = extract_cover()
 
-        return VideoContent(
-            PathTask(path_task),
-            cover=PathTask(cover_task),
-            duration=duration,
-        )
+        video_content.cover = PathTask(cover_task)
+
+        if is_gif:
+            # 需要转换为 GIF
+            async def convert_to_gif():
+                video_path = await path_task
+                return await convert_video_to_gif(video_path)
+
+            video_content.gif_path = PathTask(convert_to_gif())
+
+        return video_content
+
+    def create_gif(
+        self,
+        url_or_task: str | Task[Path],
+        cover_url: str | None = None,
+    ):
+        """创建 GIF 内容"""
+        return self.create_video(url_or_task, cover_url=cover_url, is_gif=True)
 
     def create_images(
         self,

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/bilibili/__init__.py

@@ -39,15 +39,15 @@ class BilibiliParser(BaseParser):
         self._credential: Credential | None = None
         self._cookies_file = pconfig.config_dir / "bilibili_cookies.json"
 
-    @handle("b23.tv", r"b23\.tv/[A-Za-z\d\._?%&+\-=/#]+")
-    @handle("bili2233", r"bili2233\.cn/[A-Za-z\d\._?%&+\-=/#]+")
+    @handle("b23.tv", r"b23\.tv/[0-9a-zA-Z._?%&+-=/#]+")
+    @handle("bili2233", r"bili2233\.cn/[0-9a-zA-Z._?%&+-=/#]+")
     async def _parse_short_link(self, searched: Match[str]):
         """解析短链"""
         url = f"https://{searched.group(0)}"
         return await self.parse_with_redirect(url)
 
     @handle("BV", r"^(?P<bvid>BV[0-9a-zA-Z]{10})(?:\s)?(?P<page_num>\d{1,3})?$")
-    @handle("/BV", r"bilibili\.com(?:/video)?/(?P<bvid>BV[0-9a-zA-Z]{10})(?:\?p=(?P<page_num>\d{1,3}))?")
+    @handle("/BV", r"bilibili\.com(?:/video)?/(?P<bvid>BV[0-9A-Za-z]{10})(?:.*?[?&]p=(?P<page_num>\d{1,3}))?")
     async def _parse_bv(self, searched: Match[str]):
         """解析视频信息"""
         bvid = str(searched.group("bvid"))
@@ -56,7 +56,7 @@ class BilibiliParser(BaseParser):
         return await self.parse_video(bvid=bvid, page_num=page_num)
 
     @handle("av", r"^av(?P<avid>\d{6,})(?:\s)?(?P<page_num>\d{1,3})?$")
-    @handle("/av", r"bilibili\.com(?:/video)?/av(?P<avid>\d{6,})(?:\?p=(?P<page_num>\d{1,3}))?")
+    @handle("/av", r"bilibili\.com(?:/video)?/av(?P<avid>\d{6,})(?:.*?[?&]p=(?P<page_num>\d{1,3}))?")
     async def _parse_av(self, searched: Match[str]):
         """解析视频信息"""
         avid = int(searched.group("avid"))
@@ -65,8 +65,8 @@ class BilibiliParser(BaseParser):
         return await self.parse_video(avid=avid, page_num=page_num)
 
     @handle("/dynamic/", r"bilibili\.com/dynamic/(?P<dynamic_id>\d+)")
-    @handle("t.bili", r"t\.bilibili\.com/(?P<dynamic_id>\d+)")
     @handle("/opus/", r"bilibili\.com/opus/(?P<dynamic_id>\d+)")
+    @handle("t.bili", r"t\.bilibili\.com/(?P<dynamic_id>\d+)")
     async def _parse_dynamic(self, searched: Match[str]):
         """解析动态信息"""
         dynamic_id = int(searched.group("dynamic_id"))
@@ -105,7 +105,7 @@ class BilibiliParser(BaseParser):
 
         from .video import VideoInfo, AIConclusion
 
-        video = await self._get_video(bvid=bvid, avid=avid)
+        video = Video(bvid=bvid, aid=avid, credential=await self.credential)
         video_info = convert(await video.get_info(), VideoInfo)
         # UP
         author = self.create_author(video_info.owner.name, video_info.owner.face)
@@ -160,7 +160,7 @@ class BilibiliParser(BaseParser):
             timestamp=page_info.timestamp,
             text=video_info.desc,
             author=author,
-            video=video_content,
+            contents=[video_content],
             extra={"info": ai_summary},
         )
 
@@ -298,15 +298,6 @@ class BilibiliParser(BaseParser):
             graphics=graphics,
         )
 
-    async def _get_video(self, *, bvid: str | None = None, avid: int | None = None) -> Video:
-        """解析视频"""
-        if avid:
-            return Video(aid=avid, credential=await self.credential)
-        elif bvid:
-            return Video(bvid=bvid, credential=await self.credential)
-        else:
-            raise ParseException("avid 和 bvid 至少指定一项")
-
     async def extract_download_urls(
         self,
         video: Video | None = None,
@@ -324,7 +315,7 @@ class BilibiliParser(BaseParser):
         )
 
         if video is None:
-            video = await self._get_video(bvid=bvid, avid=avid)
+            video = Video(bvid=bvid, aid=avid, credential=await self.credential)
 
         # 获取下载数据
         download_url_data = await video.get_download_url(page_index=page_index)

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/data.py

@@ -39,8 +39,10 @@ class VideoContent(MediaContent):
     """视频封面"""
     duration: float | None = None
     """时长 单位: 秒"""
-    gif_path: Path | None = None
-    """视频转 GIF """
+    is_gif: bool = False
+    """是否是 GIF"""
+    gif_path: PathTask | None = None
+    """视频转为 GIF 的路径"""
 
     @property
     def display_duration(self) -> str | None:
@@ -110,10 +112,8 @@ class ParseResult:
     url: str | None = None
     """来源链接"""
 
-    video: VideoContent | None = None
-    """视频内容"""
     contents: list[MediaContent] = field(default_factory=list)
-    """其他媒体内容"""
+    """媒体内容"""
     graphics: list[str | ImageContent] = field(default_factory=list)
     """图文内容"""
 
@@ -146,9 +146,22 @@ class ParseResult:
     def extra_info(self) -> str | None:
         return self.extra.get("info")
 
+    @property
+    def video(self) -> VideoContent | None:
+        """主视频 (只有 contents 首项为视频的时候才返回 否则为 None)"""
+        if len(self.contents) != 1:
+            return None
+        cont = self.contents[0]
+        return cont if isinstance(cont, VideoContent) and not cont.is_gif else None
+
+    @video.setter
+    def video(self, video: VideoContent | None):
+        if video is not None and len(self.contents) == 0:
+            self.contents.append(video)
+
     @property
     def video_contents(self) -> list[VideoContent]:
-        """获取视频内容（如果有）"""
+        """获取所有视频内容（如果有）"""
         return [cont for cont in self.contents if isinstance(cont, VideoContent)]
 
     @property
@@ -171,6 +184,11 @@ class ParseResult:
                 covers.append(cont.path_task)
         return covers
 
+    @property
+    def grid_medias(self) -> list[VideoContent | ImageContent]:
+        """获取所有用于渲染图片网格的媒体内容（视频封面 + 图片）"""
+        return [cont for cont in self.contents if isinstance(cont, (VideoContent, ImageContent))]
+
     @property
     def formartted_datetime(self, fmt: str = "%Y-%m-%d %H:%M:%S") -> str | None:
         """格式化时间戳"""
@@ -184,11 +202,6 @@ class ParseResult:
             if author.avatar:
                 yield author.avatar.get()
 
-        if self.video:
-            if self.video.cover:
-                yield self.video.cover.get()
-            yield self.video.path_task.get()
-
         for cont in self.contents:
             if not img_only or isinstance(cont, ImageContent):
                 yield cont.path_task.get()
@@ -248,7 +261,6 @@ class ParseResult:
 class ParseResultKwargs(TypedDict, total=False):
     title: str | None
     text: str | None
-    video: VideoContent | None
     contents: list[MediaContent]
     graphics: list[str | ImageContent]
     timestamp: int | None

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -130,7 +130,7 @@ class DouyinParser(BaseParser):
         # 优先取动图
         if dynamic_urls := slides_data.dynamic_urls:
             for dynamic_url in dynamic_urls:
-                result.contents.append(self.create_video(dynamic_url))
+                result.contents.append(self.create_gif(dynamic_url))
         elif image_urls := slides_data.image_urls:
             result.contents.extend(self.create_images(image_urls))
 

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/tiktok.py

@@ -31,6 +31,6 @@ class TikTokParser(BaseParser):
         return self.result(
             title=video_info.title,
             author=Author(name=video_info.channel),
-            video=video_content,
+            contents=[video_content],
             timestamp=video_info.timestamp,
         )

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/twitter.py

@@ -81,23 +81,16 @@ class TwitterParser(BaseParser):
         )
 
         for media in data.media_extended:
-            if media.type == "video":
-                result.video = self.create_video(
+            if media.type in ["video", "gif"]:
+                video = self.create_video(
                     media.url,
                     media.thumbnail_url,
                     duration=media.duration,
+                    is_gif=media.type == "gif",
                 )
-                break
+                result.contents.append(video)
             elif media.type == "image":
                 result.contents.append(self.create_image(media.url))
-            elif media.type == "gif":
-                result.contents.append(
-                    self.create_video(
-                        media.url,
-                        media.thumbnail_url,
-                        duration=media.duration,
-                    )
-                )
 
         result.repost = self._collect_result(data.qrt) if data.qrt else None
 
@@ -166,7 +159,7 @@ class TwitterParser(BaseParser):
             elif "下载图片" in text:
                 result.contents.append(self.create_image(href))
             elif "下载 gif" in text:
-                result.contents.append(self.create_video(href))
+                result.contents.append(self.create_gif(href))
 
         # 3. 提取标题
         title_tag = soup.find("h3")

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/parsers/weibo/__init__.py

@@ -150,7 +150,7 @@ class WeiBoParser(BaseParser):
             author=author,
             title=play_info.title,
             text=play_info.text,
-            video=video_content,
+            contents=[video_content],
             timestamp=play_info.real_date,
         )
 
@@ -209,14 +209,13 @@ class WeiBoParser(BaseParser):
             url=data.url,
         )
 
-        # 添加视频内容
+        # 主视频
         if video_url := data.video_url:
             result.video = self.create_video(
                 video_url,
                 data.cover_url,
                 data.duration,
             )
-
         # 添加图片内容
         if image_urls := data.image_urls:
             result.contents.extend(self.create_images(image_urls))

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/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 IgnoreException, DownloadException
+from ..exception import DownloadException
 
 
 class BaseRenderer(ABC):
@@ -39,16 +39,10 @@ class BaseRenderer(ABC):
         other_segs: list[ForwardNodeInner] = []
 
         def on_error(e: Exception):
-            if isinstance(e, IgnoreException):
-                pass
-            elif isinstance(e, DownloadException):
+            if isinstance(e, DownloadException):
                 nonlocal failed_count
                 failed_count += 1
 
-        if self.result.video:
-            if video_path := await self.result.video.path_task.safe_get(on_error):
-                yield UniMessage(UniHelper.video_seg(video_path))
-
         for cont in chain(
             self.result.contents,
             self.result.repost.contents if self.result.repost else (),
@@ -59,17 +53,16 @@ class BaseRenderer(ABC):
 
             match cont:
                 case VideoContent() as video:
-                    thumbnail = await video.cover.safe_get() if video.cover else None
-                    other_segs.append(UniHelper.video_seg(path, thumbnail))
+                    if video.gif_path and (gif_path := await video.gif_path.safe_get()):
+                        mergeable_segs.append(UniHelper.img_seg(gif_path))
+                    else:
+                        thumbnail = await video.cover.safe_get() if video.cover else None
+                        yield UniMessage(UniHelper.video_seg(path, thumbnail))
                 case AudioContent():
                     yield UniMessage(UniHelper.record_seg(path))
                 case ImageContent():
                     mergeable_segs.append(UniHelper.img_seg(path))
 
-        if self.result.repost and self.result.repost.video:
-            if video_path := await self.result.repost.video.path_task.safe_get(on_error):
-                yield UniMessage(UniHelper.video_seg(video_path))
-
         for cont in chain(
             self.result.graphics,
             self.result.repost.graphics if self.result.repost else (),
@@ -85,15 +78,8 @@ class BaseRenderer(ABC):
                 mergeable_segs.append(img_seg)
 
         if mergeable_segs or other_segs:
-            if (
-                pconfig.need_forward_contents
-                or len(mergeable_segs) > 4
-                or len(other_segs) > 1
-                or (len(mergeable_segs) + len(other_segs)) > 4
-            ):
-                forward_msg = UniHelper.construct_forward_message(
-                    mergeable_segs + other_segs,
-                )
+            if pconfig.need_forward_contents or len(other_segs) > 1 or (len(mergeable_segs) + len(other_segs)) > 4:
+                forward_msg = UniHelper.construct_forward_message(mergeable_segs + other_segs)
                 yield UniMessage(forward_msg)
             else:
                 if mergeable_segs:

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/renders/templates/card.html.jinja2

@@ -577,52 +577,50 @@
                             {% if result.title and result.video %}<div class="title">{{ result.title }}</div>{% endif %}
                             {# ── Text（非动态类型） ── #}
                             {% if content_type != '动态' and result.text %}<div class="text">{{ result.text }}</div>{% endif %}
-                            {# ── 非视频媒体 ── #}
-                            {% if not video %}
-                                {# ── Image Grid ── #}
-                                {% set imgs = result.all_grid_images %}
-                                {% if imgs %}
-                                    {% set count = imgs|length %}
-                                    {% if count == 1 %}
-                                        {% set img = imgs[0] %}
-                                        <div class="image-container">
-                                            <img src="{{ img.uri | safe }}"
-                                                 class="single-image"
-                                                 alt="image" />
-                                        </div>
-                                    {% else %}
-                                        {% set cols = 2 if count in [2, 4] else 3 %}
-                                        <div class="image-grid cols-{{ cols }}">
-                                            {% for img in imgs[:9] %}
-                                                {% set img_uri = (img.uri if img.uri else fallback_pic) %}
-                                                <div class="grid-item">
-                                                    <img src="{{ img_uri | safe }}" alt="image" />
-                                                    {% if loop.last and count > 9 %}
-                                                        <div class="more-count">+{{ count - 9 }}</div>
-                                                    {% endif %}
-                                                </div>
-                                            {% endfor %}
-                                        </div>
-                                    {% endif %}
-                                {# ── Graphics ── #}
-                                {% elif result.graphics %}
-                                    {% for text_or_img in result.graphics %}
-                                        <div class="graphics-item">
-                                            {% if text_or_img is string %}
-                                                <div class="text">{{ text_or_img }}</div>
-                                            {% else %}
-                                                {% set img_uri = text_or_img.path_task.uri %}
-                                                {% set img_uri = (img_uri if img_uri else fallback_pic) %}
-                                                <div class="image-container">
-                                                    <img src="{{ img_uri | safe }}"
-                                                         class="single-image"
-                                                         alt="graphics" />
-                                                </div>
-                                            {% endif %}
-                                            {% if text_or_img.alt %}<div class="graphics-alt">{{ text_or_img.alt }}</div>{% endif %}
-                                        </div>
-                                    {% endfor %}
+
+                            {# ── Image Grid ── #}
+                            {% set imgs = result.all_grid_images %}
+                            {% if imgs %}
+                                {% set count = imgs|length %}
+                                {% if count == 1 %}
+                                    {% set img = imgs[0] %}
+                                    <div class="image-container">
+                                        <img src="{{ img.uri | safe }}"
+                                              class="single-image"
+                                              alt="image" />
+                                    </div>
+                                {% else %}
+                                    {% set cols = 2 if count in [2, 4] else 3 %}
+                                    <div class="image-grid cols-{{ cols }}">
+                                        {% for img in imgs[:9] %}
+                                            {% set img_uri = (img.uri if img.uri else fallback_pic) %}
+                                            <div class="grid-item">
+                                                <img src="{{ img_uri | safe }}" alt="image" />
+                                                {% if loop.last and count > 9 %}
+                                                    <div class="more-count">+{{ count - 9 }}</div>
+                                                {% endif %}
+                                            </div>
+                                        {% endfor %}
+                                    </div>
                                 {% endif %}
+                            {# ── Graphics ── #}
+                            {% elif result.graphics %}
+                                {% for text_or_img in result.graphics %}
+                                    <div class="graphics-item">
+                                        {% if text_or_img is string %}
+                                            <div class="text">{{ text_or_img }}</div>
+                                        {% else %}
+                                            {% set img_uri = text_or_img.path_task.uri %}
+                                            {% set img_uri = (img_uri if img_uri else fallback_pic) %}
+                                            <div class="image-container">
+                                                <img src="{{ img_uri | safe }}"
+                                                      class="single-image"
+                                                      alt="graphics" />
+                                            </div>
+                                        {% endif %}
+                                        {% if text_or_img.alt %}<div class="graphics-alt">{{ text_or_img.alt }}</div>{% endif %}
+                                    </div>
+                                {% endfor %}
                             {% endif %}
                             {# ── Repost ── #}
                             {% if result.repost %}{{ render_card(result.repost, is_repost=True) }}{% endif %}

{nonebot_plugin_parser-2.6.1 → nonebot_plugin_parser-2.6.2}/src/nonebot_plugin_parser/utils.py

@@ -144,11 +144,11 @@ async def encode_video_to_h264(video_path: Path) -> Path:
     return output_path
 
 
-async def extract_video_cover(video_path: Path) -> Path:
-    """从视频中提取封面图（第一帧）"""
-    cover_path = video_path.with_suffix(".jpg")
-    if cover_path.exists():
-        return cover_path
+async def extract_video_first_frame(video_path: Path) -> Path:
+    """从视频中提取第一帧"""
+    first_frame_path = video_path.with_suffix(".jpg")
+    if first_frame_path.exists():
+        return first_frame_path
 
     cmd = [
         "ffmpeg",
@@ -159,11 +159,30 @@ async def extract_video_cover(video_path: Path) -> Path:
         "00:00:01",
         "-vframes",
         "1",
-        str(cover_path),
+        str(first_frame_path),
     ]
 
     await exec_ffmpeg_cmd(cmd)
-    return cover_path
+    return first_frame_path
+
+
+async def convert_video_to_gif(video_path: Path) -> Path:
+    """将视频转换为 GIF"""
+    gif_path = video_path.with_suffix(".gif")
+    if gif_path.exists():
+        return gif_path
+
+    cmd = [
+        "ffmpeg",
+        "-y",
+        "-i",
+        str(video_path),
+        "-c:v",
+        "gif",
+        str(gif_path),
+    ]
+    await exec_ffmpeg_cmd(cmd)
+    return gif_path
 
 
 def fmt_size(file_path: Path) -> str: