nonebot-plugin-parser 2.6.9__tar.gz → 2.6.10__tar.gz

{nonebot_plugin_parser-2.6.9 → nonebot_plugin_parser-2.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.9
+Version: 2.6.10
 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

{nonebot_plugin_parser-2.6.9 → nonebot_plugin_parser-2.6.10}/pyproject.toml

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

{nonebot_plugin_parser-2.6.9 → nonebot_plugin_parser-2.6.10}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.6.9"
+version = "2.6.10"
 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.9"
+current_version = "2.6.10"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.6.9 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/parsers/bilibili/__init__.py

@@ -41,6 +41,7 @@ class BilibiliParser(BaseParser):
     platform: ClassVar[Platform] = Platform(name=PlatformEnum.BILIBILI, display_name="哔哩哔哩")
 
     def __init__(self):
+        super().__init__()
         self.headers = HEADERS.copy()
         self._credential: Credential | None = None
         self._cookies_file = pconfig.config_dir / "bilibili_cookies.json"

{nonebot_plugin_parser-2.6.9 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -74,20 +74,6 @@ class DouyinParser(BaseParser):
             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:
@@ -107,6 +93,20 @@ class DouyinParser(BaseParser):
                             self.create_video(url_or_task=image_video.play_addr.url),
                         ]
                     )
+            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,
+                            )
+                        )
         # 添加视频内容
         elif video := aweme.video:
             result.video = self.create_video(

{nonebot_plugin_parser-2.6.9 → nonebot_plugin_parser-2.6.10}/src/nonebot_plugin_parser/parsers/twitter.py

@@ -57,6 +57,10 @@ decoder = Decoder(VxTwitterResponse)
 class TwitterParser(BaseParser):
     platform: ClassVar[Platform] = Platform(name=PlatformEnum.TWITTER, display_name="小蓝鸟")
 
+    def __init__(self):
+        super().__init__()
+        self.headers = {"User-Agent": "python-httpx/0.28.1"}
+
     @handle("x.com", r"x.com/[0-9-a-zA-Z_]{1,20}/status/([0-9]+)")
     async def _parse(self, searched: re.Match[str]) -> ParseResult:
         url = f"https://{searched.group(0)}"