feat(msg): parse Video elem

Author: wyapx

lagrange/client/message/decoder.py

@@ -144,15 +144,21 @@ async def parse_msg_new(client: "Client", pkg: MsgPushBody) -> Sequence[Element]
                 index = extra.body[0].index
                 uid = client.uid
                 gid = pkg.response_head.rsp_grp.gid if common.bus_type == 20 else None
-                url = await client.fetch_image_url(bus_type=cast(Literal[10, 20], common.bus_type),
-                                                   node=index, uid=uid, gid=gid)
+                url = await client.fetch_image_url(
+                    bus_type=cast(Literal[10, 20], common.bus_type),
+                    node=index,
+                    uid=uid,
+                    gid=gid,
+                )
                 msg_chain.append(
                     elems.Image(
                         name=index.info.name,
                         size=index.info.size,
                         id=0,
                         md5=bytes.fromhex(index.info.hash),
-                        text=extra.biz_info.pic.summary if extra.biz_info.pic.summary else "[图片]",
+                        text=extra.biz_info.pic.summary
+                        if extra.biz_info.pic.summary
+                        else "[图片]",
                         width=index.info.width,
                         height=index.info.height,
                         url=url,
@@ -173,23 +179,6 @@ async def parse_msg_new(client: "Client", pkg: MsgPushBody) -> Sequence[Element]
                     elems.Service(id=sid, raw=content, text=f"[service:{sid}]")
                 )
             ignore_next = True
-        # elif 16 in raw:  # extra
-        #     # nickname = unpack_dict(raw, "16.2", "")
-        #     pass
-        # elif 19 in raw:  # video
-        #     video = raw[19]
-        #     msg_chain.append({
-        #         "type": "video",
-        #         "text": "[视频]",
-        #         "name": unpack_dict(video, "3", "undefined"),
-        #         "id": unpack_dict(video, "1"),  # tlv struct? contain md5, filetype
-        #         "md5": unpack_dict(video, "2"),
-        #         "width": unpack_dict(video, "7"),
-        #         "height": unpack_dict(video, "8"),
-        #         "size": unpack_dict(video, "6")
-        #     })
-        # elif 37 in raw:  # unknown
-        #     pass
         elif raw.open_data:
             msg_chain.append(
                 elems.Raw(
@@ -247,6 +236,23 @@ async def parse_msg_new(client: "Client", pkg: MsgPushBody) -> Sequence[Element]
         #         "show_type": typ,
         #         "id": eid
         #     })
+        elif raw.video_file:
+            video = raw.video_file
+
+            msg_chain.append(
+                elems.Video(
+                    id=0,
+                    time=video.length,
+                    text="[视频]",
+                    name=video.name,
+                    size=video.size,
+                    file_key=video.id,
+                    md5=video.video_md5,
+                    width=video.width,
+                    height=video.height,
+                    qmsg=None,
+                )
+            )
         else:
             pass
             # print("unknown msg", raw)

lagrange/client/message/elems.py

@@ -94,6 +94,8 @@ class Image(Text, MediaInfo):
 class Video(Text, MediaInfo):
     width: int
     height: int
+    time: int
+    file_key: str = field(repr=True)
 
 
 @dataclass

lagrange/client/server_push/msg.py

@@ -167,6 +167,8 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                         type=body.detail.send_type,
                         total_operations=body.msg.total_operations,
                     )
+                elif pb.flag == 23:  # 群幸运字符？
+                    pass
                 else:
                     raise ValueError(
                         f"Unknown subtype_12 flag: {pb.flag}: {pb.body.hex() if pb.body else pb}"

lagrange/pb/message/rich_text/__init__.py

@@ -17,6 +17,7 @@
     SrcMsg,
     Text,
     TransElem,
+    VideoFile,
 )
 
 __all__ = ["Elems", "RichText"]
@@ -33,7 +34,7 @@ class Elems(ProtoStruct, debug=True):
     elem_flags2: Optional[bytes] = proto_field(9, default=None)
     rich_msg: Optional[RichMsg] = proto_field(12, default=None)
     extra_info: Optional[ExtraInfo] = proto_field(16, default=None)
-    # video_file: VideoFile = proto_field(19, default=None)
+    video_file: Optional[VideoFile] = proto_field(19, default=None)
     general_flags: Optional[bytes] = proto_field(37, default=None)
     open_data: Optional[OpenData] = proto_field(41, default=None)
     src_msg: Optional[SrcMsg] = proto_field(45, default=None)

lagrange/pb/message/rich_text/elems.py

@@ -131,3 +131,20 @@ class CommonElem(ProtoStruct):
     service_type: int = proto_field(1)
     pb_elem: dict = proto_field(2)
     bus_type: int = proto_field(3)
+
+
+class VideoFile(ProtoStruct):
+    id: str = proto_field(1)
+    video_md5: bytes = proto_field(2)
+    name: str = proto_field(3)
+    f4: int = proto_field(4)  # 2
+    length: int = proto_field(5)  # 100: mp4
+    size: int = proto_field(6)
+    width: int = proto_field(7)
+    height: int = proto_field(8)
+    thumb_md5: bytes = proto_field(9)
+    # thumb_name on field 10?
+    thumb_size: int = proto_field(11)
+    thumb_width: int = proto_field(16)
+    thumb_height: int = proto_field(17)
+    # reserve on field 24?