nonebot-plugin-parser 2.6.6__tar.gz → 2.6.8__tar.gz

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.6
+Version: 2.6.8
 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
@@ -315,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.6 → nonebot_plugin_parser-2.6.8}/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.8/pyproject.toml

@@ -0,0 +1,224 @@
+[project]
+name = "nonebot-plugin-parser"
+version = "2.6.8"
+description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
+readme = "README.md"
+requires-python = ">=3.10"
+keywords = [
+    "acfun",
+    "bilibili",
+    "douyin",
+    "kuaishou",
+    "nga",
+    "nonebot",
+    "nonebot2",
+    "tiktok",
+    "twitter",
+    "video",
+    "weibo",
+    "xiaohongshu",
+    "youtube",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Framework :: AsyncIO",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Communications :: Chat",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Multimedia :: Video",
+]
+dependencies = [
+    "rich>=13.0.0",
+    "pillow>=11.0.0",
+    "aiofiles>=25.1.0",
+    "httpx>=0.27.2,<1.0.0",
+    "msgspec>=0.20.0,<1.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",
+    "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",
+    "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
+]
+
+[[project.authors]]
+name = "fllesser"
+email = "fllessive@gmail.com"
+
+[project.urls]
+IssueTracker = "https://github.com/fllesser/nonebot-plugin-parser/issues"
+Release = "https://github.com/fllesser/nonebot-plugin-parser/releases"
+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.21"]
+emosvg = ["emosvg>=0.1.7"]
+all = [
+    "nonebot-plugin-htmlkit>=0.1.0rc4",
+    "nonebot-plugin-htmlrender>=0.6.7",
+    "yt-dlp[default]>=2026.3.13",
+    "emosvg>=0.1.7",
+]
+
+[dependency-groups]
+dev = [
+    "nonebot2[fastapi]>=2.5.0,<3.0.0",
+    "nonebot-adapter-onebot>=2.4.6",
+    "ruff>=0.15.6,<1.0.0",
+    { include-group = "extras" },
+    { include-group = "test" },
+]
+extras = [
+    "emosvg>=0.1.7",
+    "nonebot-plugin-htmlkit>=0.1.0rc4",
+    "nonebot-plugin-htmlrender>=0.6.7",
+    "yt-dlp[default]>=2026.3.13",
+    "types-yt-dlp>=2026.3.13.20260314",
+]
+test = [
+    "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",
+    "respx>=0.22.0",
+]
+pydantic-v1 = ["pydantic<2.0.0"]
+pydantic-v2 = ["pydantic>=2.0.0"]
+telegram = ["nonebot-adapter-telegram>=0.1.0b20"]
+
+[build-system]
+requires = ["uv_build>=0.11.0,<0.12.0"]
+build-backend = "uv_build"
+
+[tool.uv]
+conflicts = [[
+    { group = "pydantic-v1" },
+    { group = "pydantic-v2" },
+    { group = "telegram" },
+]]
+
+[tool.bumpversion]
+tag = true
+commit = true
+current_version = "2.6.8"
+message = "release: bump vesion from {current_version} to {new_version}"
+
+[[tool.bumpversion.files]]
+filename = "uv.lock"
+search = """
+name = "nonebot-plugin-parser"
+version = "{current_version}""""
+replace = """
+name = "nonebot-plugin-parser"
+version = "{new_version}""""
+
+[tool.coverage.report]
+show_missing = true
+exclude_lines = [
+    "raise NotImplementedError",
+    "if TYPE_CHECKING:",
+    "@overload",
+    "except",
+    "raise",
+]
+
+[tool.nonebot]
+plugins = ["nonebot_plugin_parser"]
+
+[[tool.nonebot.adapters]]
+name = "Onebot V11"
+module_name = "nonebot.adapters.onebot.v11"
+
+[tool.poe.tasks]
+test-other = "pytest tests/others --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
+test-parser = "pytest tests/parsers --cov=src --cov-report=xml --junitxml=junit.xml -n auto"
+test-render = "pytest tests/renders --cov=src --cov-report=xml --junitxml=junit.xml"
+bump = "bump-my-version bump"
+show-bump = "bump-my-version show-bump"
+
+[tool.basedpyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+typeCheckingMode = "standard"
+disableBytesTypePromotions = true
+
+[tool.basedpyright.defineConstant]
+PYDANTIC_V2 = true
+
+[[tool.basedpyright.executionEnvironments]]
+root = "./tests"
+extraPaths = ["./src"]
+
+[[tool.basedpyright.executionEnvironments]]
+root = "./src"
+
+[tool.pytest]
+addopts = [
+    "--import-mode=prepend",
+    "--strict-markers",
+    "--tb=short",
+    "-ra",
+    "-s",
+    "-v",
+]
+pythonpath = ["src"]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.format]
+line-ending = "lf"
+
+[tool.ruff.lint]
+select = [
+    "F",
+    "W",
+    "E",
+    "I",
+    "UP",
+    "Q",
+    "PYI",
+    "T10",
+    "T20",
+    "C4",
+    "PT",
+    "TID",
+    "ASYNC",
+    "RUF",
+]
+ignore = [
+    "E402",
+    "UP037",
+    "RUF001",
+    "RUF002",
+    "RUF003",
+    "W191",
+    "TID252",
+    "ASYNC240",
+]
+
+[tool.ruff.lint.isort]
+length-sort = true
+known-first-party = [
+    "nonebot_plugin_parser",
+    "tests/*",
+]
+extra-standard-library = ["typing_extensions"]
+
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true

nonebot_plugin_parser-2.6.6/pyproject.toml → nonebot_plugin_parser-2.6.8/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.6.6"
+version = "2.6.8"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -115,7 +115,7 @@ conflicts = [
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.6.6"
+current_version = "2.6.8"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.8}/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.6 → nonebot_plugin_parser-2.6.8}/src/nonebot_plugin_parser/download/__init__.py

@@ -1,20 +1,13 @@
 import asyncio
 from pathlib import Path
-from functools import partial
-from contextlib import contextmanager
 from urllib.parse import urljoin
 
 import httpx
 import aiofiles
 import curl_cffi
 from nonebot import logger, get_driver
-from rich.progress import (
-    Progress,
-    BarColumn,
-    TextColumn,
-    DownloadColumn,
-)
 
+from .rich import progress_bar, add_progress_task
 from .task import auto_task
 from ..utils import merge_av, safe_unlink, generate_file_name, is_module_available
 from ..config import pconfig
@@ -31,22 +24,6 @@ class StreamDownloader:
     async def aclose(self):
         await self.client.aclose()
 
-    @staticmethod
-    @contextmanager
-    def rich_progress(
-        desc: str,
-        total: int | None = None,
-    ):
-        with Progress(
-            TextColumn("[bold blue]{task.description}", justify="right"),
-            BarColumn(bar_width=None),
-            "[progress.percentage]{task.percentage:>3.1f}%",
-            "•",
-            DownloadColumn(),
-        ) as progress:
-            task_id = progress.add_task(description=desc, total=total)
-            yield partial(progress.update, task_id)
-
     @staticmethod
     def _validate_content_length(
         response: httpx.Response | curl_cffi.Response,
@@ -84,10 +61,11 @@ class StreamDownloader:
             response.raise_for_status()
             content_length = self._validate_content_length(response)
 
-            with self.rich_progress(
-                f"httpx | {file_path.name}",
-                content_length,
-            ) as update_progress:
+            with progress_bar:
+                update_progress = add_progress_task(
+                    f"httpx | {file_path.name}",
+                    content_length,
+                )
                 async with aiofiles.open(file_path, "wb") as file:
                     async for chunk in response.aiter_bytes(chunk_size):
                         await file.write(chunk)
@@ -112,10 +90,11 @@ class StreamDownloader:
             response.raise_for_status()
             content_length = self._validate_content_length(response)
 
-            with self.rich_progress(
-                f"curl_cffi | {file_path.name}",
-                content_length,
-            ) as update_progress:
+            with progress_bar:
+                update_progress = add_progress_task(
+                    f"curl_cffi | {file_path.name}",
+                    content_length,
+                )
                 async with aiofiles.open(file_path, "wb") as file:
                     async for chunk in response.aiter_content(chunk_size=8192):
                         await file.write(chunk)
@@ -241,15 +220,14 @@ class StreamDownloader:
         video_path = pconfig.cache_dir / video_name
 
         try:
-            async with aiofiles.open(video_path, "wb") as f:
-                total_size = 0
-                with self.rich_progress(desc=video_name) as update_progress:
+            with progress_bar:
+                async with aiofiles.open(video_path, "wb") as f:
+                    update_progress = add_progress_task(desc=video_name)
                     for url in await self._get_m3u8_slices(m3u8_url):
                         async with self.client.stream("GET", url, headers=ext_headers) as response:
                             async for chunk in response.aiter_bytes(chunk_size=1024 * 1024):
                                 await f.write(chunk)
-                                total_size += len(chunk)
-                                update_progress(advance=len(chunk), total=total_size)
+                                update_progress(advance=len(chunk))
         except httpx.HTTPError:
             await safe_unlink(video_path)
             logger.exception("m3u8 视频下载失败")

nonebot_plugin_parser-2.6.8/src/nonebot_plugin_parser/download/rich.py

@@ -0,0 +1,25 @@
+from functools import partial
+
+from rich.progress import (
+    Progress,
+    BarColumn,
+    TextColumn,
+    DownloadColumn,
+)
+
+progress_bar: Progress = Progress(
+    TextColumn("[bold blue]{task.description}", justify="right"),
+    BarColumn(bar_width=None),
+    "[progress.percentage]{task.percentage:>3.1f}%",
+    "•",
+    DownloadColumn(),
+)
+
+
+def add_progress_task(
+    desc: str,
+    total: int | None = None,
+):
+    task_id = progress_bar.add_task(description=desc, total=total)
+    progress_bar.start_task(task_id)
+    return partial(progress_bar.update, task_id)

nonebot_plugin_parser-2.6.8/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.8/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -0,0 +1,118 @@
+import re
+import json
+from typing import ClassVar
+
+from httpx import AsyncClient
+
+from ..base import (
+    COMMON_TIMEOUT,
+    Platform,
+    BaseParser,
+    PlatformEnum,
+    ParseException,
+    handle,
+)
+from .aweme import decoder
+
+
+class DouyinParser(BaseParser):
+    platform: ClassVar[Platform] = Platform(name=PlatformEnum.DOUYIN, display_name="抖音")
+
+    def __init__(self):
+        super().__init__()
+        self.headers.update(
+            {
+                "Origin": "https://open.douyin.com",
+                "Referer": "https://open.douyin.com/",
+            }
+        )
+
+    # https://v.douyin.com/_2ljF4AmKL8
+    @handle("v.douyin", r"v\.douyin\.com/[a-zA-Z0-9_\-]+")
+    @handle("jx.douyin", r"jx\.douyin\.com/[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)
+
+    # https://www.douyin.com/video/7521023890996514083
+    # https://www.douyin.com/note/7469411074119322899
+    @handle("douyin", r"douyin\.com/[a-z]+/(?P<aweme_id>\d+)")
+    @handle("iesdouyin", r"iesdouyin\.com/share/[a-z]+/(?P<aweme_id>\d+)")
+    @handle("m.douyin", r"m\.douyin\.com/share/[a-z]+/(?P<aweme_id>\d+)")
+    # https://jingxuan.douyin.com/m/video/7574300896016862490?app=yumme&utm_source=copy_link
+    @handle("jingxuan.douyin", r"jingxuan\.douyin.com/m/[a-z]+/(?P<aweme_id>\d+)")
+    async def _parse_douyin(self, searched: re.Match[str]):
+        aweme_id = searched.group("aweme_id")
+        return await self.parse_aweme(aweme_id)
+
+    async def parse_aweme(self, aweme_id: str):
+        async with AsyncClient(
+            headers=self.headers,
+            timeout=COMMON_TIMEOUT,
+            follow_redirects=True,
+            verify=False,
+        ) as client:
+            response = await client.get(
+                "https://www.douyin.com/aweme/v1/web/aweme/detail/",
+                params={"aweme_id": aweme_id, "aid": "6383"},
+            )
+            if response.status_code != 200:
+                raise ParseException(f"status: {response.status_code}")
+            aweme = decoder.decode(response.content).aweme_detail
+
+        # 作者
+        author = self.create_author(
+            aweme.author.nickname,
+            aweme.author.avatar_thumb.url_list[-1],
+            aweme.author.signature,
+        )
+
+        # 先以部分数据构建结果，后续再填充内容，避免使用临时变量
+        result = self.result(
+            text=aweme.share_info.text,
+            author=author,
+            timestamp=aweme.create_time,
+            url=aweme.share_url.split("?")[0],
+        )
+        if music := aweme.music:
+            if not music.is_original_sound:
+                if music.play_url.uri == "":
+                    extra = json.loads(music.extra)
+                    music_url = extra.get("original_song_url")
+                else:
+                    music_url = music.play_url.uri
+                if music_url:
+                    result.contents.append(
+                        self.create_audio(
+                            url_or_task=music_url,
+                            duration=music.duration,
+                        )
+                    )
+
+        # 添加图片内容
+        if images := aweme.images:
+            for image in images:
+                if image.clip_type == 2 or image.clip_type is None:
+                    result.contents.append(
+                        self.create_image(
+                            url_or_task=image.url_list[-1],
+                        )
+                    )
+                elif image_video := image.video:
+                    result.contents.extend(
+                        [
+                            self.create_image(
+                                url_or_task=image_video.cover.url_list[-1],
+                            ),
+                            self.create_video(url_or_task=image_video.play_addr.url),
+                        ]
+                    )
+        # 添加视频内容
+        elif video := aweme.video:
+            result.video = self.create_video(
+                video.play_addr.url,
+                video.cover_original_scale.url_list[-1] if video.cover_original_scale else video.cover.url_list[-1],
+                video.duration // 1000,
+            )
+
+        return result

nonebot_plugin_parser-2.6.8/src/nonebot_plugin_parser/parsers/douyin/aweme.py

@@ -0,0 +1,82 @@
+from msgspec import Struct, field
+from msgspec.json import Decoder
+
+
+class Addr(Struct):
+    uri: str
+
+    @property
+    def url(self) -> str:
+        return f"https://aweme.snssdk.com/aweme/v1/play/?video_id={self.uri}&ratio=1080p&line=0"
+
+
+class UrlList(Struct):
+    url_list: list[str]
+
+
+class Author(Struct):
+    uid: str
+    nickname: str
+    avatar_thumb: UrlList
+    """头像"""
+    signature: str | None = None
+
+
+class Video(Struct):
+    cover: UrlList
+    duration: int
+    """视频时长(/1000)"""
+    play_addr: Addr
+    cover_original_scale: UrlList | None = None
+
+    @property
+    def url(self) -> str:
+        return self.play_addr.url
+
+
+class Image(Struct):
+    url_list: list[str]
+    uri: str = field(default="")
+    clip_type: int | None = field(default=None)
+    """=2 or None 是普通图片"""
+    video: Video | None = field(default=None)
+    """Live Photo 视频"""
+
+
+class MusicPlayUrl(Struct):
+    uri: str
+
+
+class Music(Struct):
+    duration: int
+    mid: str
+    play_url: MusicPlayUrl
+    extra: str
+    is_original_sound: bool
+
+
+class ShareInfo(Struct):
+    share_desc: str
+    share_desc_info: str
+
+    @property
+    def text(self) -> str:
+        return self.share_desc_info.replace(f"#{self.share_desc}#", "", 1)
+
+
+class Aweme(Struct):
+    aweme_id: str
+    author: Author
+    share_info: ShareInfo
+    create_time: int
+    share_url: str
+    images: list[Image] | None = field(default=None)
+    music: Music | None = field(default=None)
+    video: Video | None = field(default=None)
+
+
+class Response(Struct):
+    aweme_detail: Aweme
+
+
+decoder = Decoder(Response)