🐛 B站转发动态补充 DeletedItem 类型解析 (#659)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

nonebot_bison/platform/bilibili/models.py

@@ -131,7 +131,7 @@ class PostAPI(APIBase):
         basic: "PostAPI.Basic"
         id_str: str
         modules: "PostAPI.Modules"
-        orig: "PostAPI.Item | None" = None
+        orig: "PostAPI.Item | PostAPI.DeletedItem | None" = None
         topic: "PostAPI.Topic | None" = None
         type: DynamicType
 
@@ -141,6 +141,14 @@ class PostAPI(APIBase):
         modules: "PostAPI.Modules"
         type: Literal["DYNAMIC_TYPE_NONE"]
 
+        def to_item(self) -> "PostAPI.Item":
+            return PostAPI.Item(
+                basic=self.basic,
+                id_str="",
+                modules=self.modules,
+                type=self.type,
+            )
+
     class Data(Base):
         items: "list[PostAPI.Item | PostAPI.DeletedItem] | None" = None
 

nonebot_bison/platform/bilibili/platforms.py

@@ -32,6 +32,7 @@ from .models import (
     DynamicType,
     ArticleMajor,
     CoursesMajor,
+    DeletedMajor,
     UnknownMajor,
     LiveRecommendMajor,
 )
@@ -243,6 +244,13 @@ class Bilibili(NewMessage):
                     pics=[courses.cover],
                     url=URL(courses.jump_url).with_scheme("https").human_repr(),
                 )
+            case DeletedMajor(none=none):
+                return _ParsedMojarPost(
+                    title="",
+                    content=none.tips,
+                    pics=[],
+                    url=None,
+                )
             case UnknownMajor(type=unknown_type):
                 raise CategoryNotSupport(unknown_type)
             case None:  # 没有major的情况
@@ -259,10 +267,13 @@ class Bilibili(NewMessage):
         parsed_raw_post = self.pre_parse_by_mojar(raw_post)
         parsed_raw_repost = None
         if self._do_get_category(raw_post.type) == Category(5):
-            if raw_post.orig:
-                parsed_raw_repost = self.pre_parse_by_mojar(raw_post.orig)
-            else:
-                logger.warning(f"转发动态{raw_post.id_str}没有原动态")
+            match raw_post.orig:
+                case PostAPI.Item() as orig:
+                    parsed_raw_repost = self.pre_parse_by_mojar(orig)
+                case PostAPI.DeletedItem() as orig:
+                    parsed_raw_repost = self.pre_parse_by_mojar(orig.to_item())
+                case None:
+                    logger.warning(f"转发动态{raw_post.id_str}没有原动态")
 
         post = Post(
             self,
@@ -275,8 +286,14 @@ class Bilibili(NewMessage):
             nickname=raw_post.modules.module_author.name,
         )
         if parsed_raw_repost:
-            orig = raw_post.orig
-            assert orig
+            match raw_post.orig:
+                case PostAPI.Item() as orig:
+                    orig = orig
+                case PostAPI.DeletedItem() as orig:
+                    orig = orig.to_item()
+                case None:
+                    raise ValueError("转发动态没有原动态")
+
             post.repost = Post(
                 self,
                 content=decode_unicode_escapes(parsed_raw_repost.content),