nonebot-plugin-parser 2.4.2__tar.gz → 2.4.3__tar.gz

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.4.2
+Version: 2.4.3
 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
@@ -25,7 +25,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: apilmoji[rich]>=0.3.0,<1.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
@@ -35,12 +35,12 @@ Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
 Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'all'
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7 ; extra == 'all'
-Requires-Dist: yt-dlp[default]>=2026.2.4 ; extra == 'all'
+Requires-Dist: yt-dlp[default]>=2026.2.21 ; extra == 'all'
 Requires-Dist: emosvg>=0.1.6 ; extra == 'all'
 Requires-Dist: emosvg>=0.1.6 ; extra == 'emosvg'
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'htmlkit'
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7 ; extra == 'htmlrender'
-Requires-Dist: yt-dlp[default]>=2025.2.4 ; extra == 'ytdlp'
+Requires-Dist: yt-dlp[default]>=2025.2.21 ; extra == 'ytdlp'
 Requires-Python: >=3.10
 Project-URL: IssueTracker, https://github.com/fllesser/nonebot-plugin-parser/issues
 Project-URL: Release, https://github.com/fllesser/nonebot-plugin-parser/releases

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.4.2"
+version = "2.4.3"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -45,7 +45,7 @@ dependencies = [
   "aiofiles>=25.1.0",
   "httpx>=0.27.2,<1.0.0",
   "msgspec>=0.20.0,<1.0.0",
-  "apilmoji[rich]>=0.3.0,<1.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",
   "bilibili-api-python>=17.4.1,<18.0.0",
@@ -64,12 +64,12 @@ Repository = "https://github.com/fllesser/nonebot-plugin-parser"
 [project.optional-dependencies]
 htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc4"]
 htmlrender = ["nonebot-plugin-htmlrender>=0.6.7"]
-ytdlp = ["yt-dlp[default]>=2025.2.4"]
+ytdlp = ["yt-dlp[default]>=2025.2.21"]
 emosvg = ["emosvg>=0.1.6"]
 all = [
   "nonebot-plugin-htmlkit>=0.1.0rc4",
   "nonebot-plugin-htmlrender>=0.6.7",
-  "yt-dlp[default]>=2026.2.4",
+  "yt-dlp[default]>=2026.2.21",
   "emosvg>=0.1.6",
 ]
 
@@ -85,12 +85,12 @@ extras = [
   "emosvg>=0.1.6",
   "nonebot-plugin-htmlkit>=0.1.0rc4",
   "nonebot-plugin-htmlrender>=0.6.7",
-  "yt-dlp[default]>=2026.2.4",
-  "types-yt-dlp>=2026.2.4.20260206",
+  "yt-dlp[default]>=2026.2.21",
+  "types-yt-dlp>=2026.2.21.20260223",
 ]
 test = [
   "nonebug>=0.4.3,<1.0.0",
-  "poethepoet>=0.40.0",
+  "poethepoet>=0.42.0",
   "pytest-asyncio>=1.3.0,<1.4.0",
   "pytest-cov>=7.0.0",
   "pytest-xdist>=3.8.0,<4.0.0",
@@ -119,7 +119,7 @@ nonebug = { git = "https://github.com/nonebot/nonebug" }
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.4.2"
+current_version = "2.4.3"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/matchers/rule.py

@@ -1,8 +1,9 @@
 import re
 from typing import Literal
 
-import msgspec
+from msgspec import Struct, DecodeError
 from nonebot import logger
+from msgspec.json import Decoder
 from nonebot.rule import Rule
 from nonebot.params import Depends
 from nonebot.typing import T_State
@@ -20,29 +21,29 @@ PSR_SEARCHED_KEY: Literal["psr-searched"] = "psr-searched"
 
 
 # 定义 JSON 卡片的数据结构
-class MetaDetail(msgspec.Struct):
+class MetaDetail(Struct):
     qqdocurl: str | None = None
 
 
-class MetaNews(msgspec.Struct):
+class MetaNews(Struct):
     jumpUrl: str | None = None
 
 
-class MetaMusic(msgspec.Struct):
+class MetaMusic(Struct):
     jumpUrl: str | None = None
 
 
-class Meta(msgspec.Struct):
+class Meta(Struct):
     detail_1: MetaDetail | None = None
     news: MetaNews | None = None
     music: MetaMusic | None = None
 
 
-class RawData(msgspec.Struct):
+class RawData(Struct):
     meta: Meta | None = None
 
 
-raw_decoder = msgspec.json.Decoder(RawData)
+raw_decoder = Decoder(RawData)
 
 
 class SearchResult:
@@ -81,7 +82,7 @@ def _extract_url(hyper: Hyper) -> str | None:
 
     try:
         raw = raw_decoder.decode(raw_str)
-    except msgspec.DecodeError:
+    except DecodeError:
         logger.exception(f"json 卡片解析失败: {raw_str}")
         return None
 

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/douyin/slides.py

@@ -1,6 +1,7 @@
 from random import choice
 
-from msgspec import Struct, json, field
+from msgspec import Struct, field
+from msgspec.json import Decoder
 
 
 class PlayAddr(Struct):
@@ -59,4 +60,4 @@ class SlidesInfo(Struct):
     aweme_details: list[SlidesData] = field(default_factory=list)
 
 
-decoder = json.Decoder(SlidesInfo)
+decoder = Decoder(SlidesInfo)

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/douyin/video.py

@@ -1,7 +1,8 @@
 from random import choice
 from typing import Any
 
-from msgspec import Struct, json, field
+from msgspec import Struct, field
+from msgspec.json import Decoder
 
 from ..base import ParseException
 
@@ -95,4 +96,4 @@ class RouterData(Struct):
         raise ParseException("can't find video_(id)/page or note_(id)/page in router data")
 
 
-decoder = json.Decoder(RouterData)
+decoder = Decoder(RouterData)

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/kuaishou/states.py

@@ -1,6 +1,7 @@
 from random import choice
 
-from msgspec import Struct, json, field
+from msgspec import Struct, field
+from msgspec.json import Decoder
 
 
 class CdnUrl(Struct):
@@ -59,4 +60,4 @@ class TusjohData(Struct):
     photo: Photo | None = None
 
 
-decoder = json.Decoder(dict[str, TusjohData])
+decoder = Decoder(dict[str, TusjohData])

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/nga.py

@@ -27,12 +27,15 @@ class NGAParser(BaseParser):
             "Upgrade-Insecure-Requests": "1",
         }
         self.headers.update(extra_headers)
-        self.base_img_url = "https://img.nga.178.com/attachments"
 
     @staticmethod
     def build_url_by_tid(tid: str | int) -> str:
         return f"https://nga.178.com/read.php?tid={tid}"
 
+    @staticmethod
+    def build_img_url(path: str) -> str:
+        return "https://img.nga.178.com/attachments" + path
+
     # ("ngabbs.com", r"https?://ngabbs\.com/read\.php\?tid=(?P<tid>\d+)(?:[&#A-Za-z\d=_-]+)?"),
     # ("nga.178.com", r"https?://nga\.178\.com/read\.php\?tid=(?P<tid>\d+)(?:[&#A-Za-z\d=_-]+)?"),
     # ("bbs.nga.cn", r"https?://bbs\.nga\.cn/read\.php\?tid=(?P<tid>\d+)(?:[&#A-Za-z\d=_-]+)?"),
@@ -117,20 +120,29 @@ class NGAParser(BaseParser):
         if content_tag and isinstance(content_tag, Tag):
             text = content_tag.get_text("\n", strip=True)
             lines = text.split("\n")
-            temp_text = ""
+            text_buffer: list[str] = []
+
             for line in lines:
-                if line.startswith("[img]"):
+                if "[" in line:
                     # [img]./mon_202602/10/-lmuf1Q1aw-hzwpZ2dT3cSl4-bs.webp[/img]
-                    img_url = self.base_img_url + line[6:-6]
-                    contents.append(self.create_graphics_content(img_url, text=temp_text))
-                    temp_text = ""
-                # 去除其他标签, 仅保留文本
-                elif "[" in line:
-                    if clean_line := re.sub(r"\[[^\]]*?\]", "", line).strip():
-                        temp_text += clean_line + "\n"
+                    if paths := re.findall(r"\[img\]\.(.*?)\[\/img\]", line):
+                        for path in paths:
+                            contents.append(
+                                self.create_graphics_content(
+                                    self.build_img_url(path),
+                                    text="\n".join(text_buffer).strip(),
+                                )
+                            )
+                            text_buffer.clear()
+                    else:
+                        # 去除其他标签, 仅保留文本
+                        if clean_line := re.sub(r"\[[^\]]*?\]", "", line).strip():
+                            text_buffer.append(clean_line)
                 else:
-                    temp_text += line + "\n"
-            text = temp_text.strip()
+                    text_buffer.append(line)
+
+            # 处理剩余的文本
+            text = "\n".join(text_buffer).strip()
 
         return self.result(
             title=title,

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/twitter.py

@@ -1,5 +1,5 @@
 import re
-from typing import Any, ClassVar
+from typing import Any, Literal, ClassVar
 from itertools import chain
 
 from httpx import AsyncClient
@@ -12,16 +12,21 @@ from ..exception import ParseException
 
 
 class MediaElement(Struct):
-    type: str
-    """媒体类型 video/image/gif"""
+    type: Literal["video", "image", "gif"]
     url: str
     altText: str | None = None
     thumbnail_url: str | None = None
     duration_millis: int | None = None
 
 
+class Article(Struct):
+    image: str | None = None
+    preview_text: str | None = None
+    title: str | None = None
+
+
 class VxTwitterResponse(Struct):
-    article: str | None
+    article: str | Article | None
     date_epoch: int
     fetched_on: int
     likes: int
@@ -33,6 +38,10 @@ class VxTwitterResponse(Struct):
     qrtURL: str | None = None
     media_extended: list[MediaElement] = field(default_factory=list)
 
+    @property
+    def name(self) -> str:
+        return f"{self.user_name} @{self.user_screen_name}"
+
 
 decoder = Decoder(VxTwitterResponse)
 
@@ -57,10 +66,10 @@ class TwitterParser(BaseParser):
         return self._collect_result(data)
 
     def _collect_result(self, data: VxTwitterResponse) -> ParseResult:
-        author = self.create_author(data.user_screen_name, data.user_profile_image_url)
+        author = self.create_author(data.user_name, data.user_profile_image_url)
+        title = data.article.title if isinstance(data.article, Article) else data.article
 
         contents: list[MediaContent] = []
-
         for media in data.media_extended:
             if media.type in ("video", "gif"):
                 contents.append(self.create_video_content(media.url, media.thumbnail_url))
@@ -71,7 +80,7 @@ class TwitterParser(BaseParser):
 
         return self.result(
             author=author,
-            title=data.article,
+            title=title,
             text=data.text,
             timestamp=data.date_epoch,
             contents=contents,

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/weibo/article.py

@@ -1,4 +1,5 @@
-from msgspec import Struct, json
+from msgspec import Struct
+from msgspec.json import Decoder
 
 
 class UserInfo(Struct):
@@ -20,4 +21,4 @@ class Detail(Struct):
     data: Data
 
 
-decoder = json.Decoder(Detail)
+decoder = Decoder(Detail)

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/weibo/common.py

@@ -1,6 +1,7 @@
 from re import sub
 
-from msgspec import Struct, json
+from msgspec import Struct
+from msgspec.json import Decoder
 
 
 class LargeInPic(Struct):
@@ -107,4 +108,4 @@ class WeiboResponse(Struct):
     data: WeiboData
 
 
-decoder = json.Decoder(WeiboResponse)
+decoder = Decoder(WeiboResponse)

{nonebot_plugin_parser-2.4.2 → nonebot_plugin_parser-2.4.3}/src/nonebot_plugin_parser/parsers/youtube/meta.py

@@ -1,4 +1,5 @@
-from msgspec import Struct, json
+from msgspec import Struct
+from msgspec.json import Decoder
 
 
 class Thumbnail(Struct):
@@ -40,4 +41,4 @@ class BrowseResponse(Struct):
         return self.metadata.channelMetadataRenderer.description
 
 
-decoder = json.Decoder(BrowseResponse)
+decoder = Decoder(BrowseResponse)