fix(msg): error on parsing GroupNudge

Author: wyapx

lagrange/client/server_push/msg.py

@@ -14,7 +14,7 @@
     MemberRecallMsg,
     GroupSub20Head,
 )
-from lagrange.utils.binary.protobuf import proto_decode, ProtoStruct
+from lagrange.utils.binary.protobuf import proto_decode, ProtoStruct, proto_encode
 from lagrange.utils.binary.reader import Reader
 from lagrange.utils.operator import unpack_dict
 
@@ -87,29 +87,38 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
     elif typ == 0x210:  # frd event
         logger.debug("unhandled friend event: %s" % pkg)
     elif typ == 0x2DC:  # grp event, 732
-        if sub_typ == 20:  # nudget(grp_id only)
+        if sub_typ == 20:  # nudge and group_sign(群打卡)
             if pkg.message:
                 grp_id, pb = unpack(pkg.message.buf2, GroupSub20Head)
                 attrs: Dict[str, Union[str, int]] = {}
                 for x in pb.body.attrs:  # type: dict[bytes, bytes]
                     k, v = x.values()
+                    if isinstance(v, dict):
+                        v = proto_encode(v)
                     if v.isdigit():
                         attrs[k.decode()] = int(v.decode())
                     else:
                         attrs[k.decode()] = v.decode()
-                return GroupNudge(
-                    grp_id,
-                    attrs["uin_str1"],
-                    attrs["uin_str2"],
-                    attrs["action_str"],
-                    attrs["suffix_str"],
-                    attrs,
-                    pb.body.attrs_xml,
-                )
+                if pb.body.type == 12:
+                    return GroupNudge(
+                        grp_id,
+                        attrs["uin_str1"],
+                        attrs["uin_str2"],
+                        attrs["action_str"],
+                        attrs["suffix_str"],
+                        attrs,
+                        pb.body.attrs_xml,
+                    )
+                elif pb.body.type == 14:  # grp_sign
+                    pass
+                else:
+                    raise ValueError(
+                        f"unknown type({pb.body.type}) on GroupSub20: {attrs}"
+                    )
             else:
                 # print(pkg.encode().hex(), 2)
                 return
-        elif sub_typ == 16:  # rename and special_title and reaction
+        elif sub_typ == 16:  # rename & special_title & reaction
             if pkg.message:
                 grp_id, pb = unpack(pkg.message.buf2, GroupSub16Head)
                 if pb.flag == 6:  # special_title
@@ -136,7 +145,7 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                         timestamp=pb.timestamp,
                         operator_uid=pb.operator_uid,
                     )
-                elif pb.flag == 35:  # add reaction
+                elif pb.flag == 35:  # set reaction
                     body = pb.f44.inner.body
                     return GroupReaction(
                         grp_id=grp_id,

lagrange/pb/status/group.py

@@ -1,6 +1,7 @@
 """
 Push Events
 """
+
 from typing import Optional
 
 from lagrange.utils.binary.protobuf import proto_field, ProtoStruct
@@ -105,19 +106,21 @@ class GroupSub16Head(ProtoStruct):
     timestamp: int = proto_field(2, default=0)
     uin: Optional[int] = proto_field(4, default=None)
     body: Optional[bytes] = proto_field(5, default=None)
-    flag: int = proto_field(13)  # 12: renamed, 6: set special_title, 13: unknown, 35: set reaction
+    flag: int = proto_field(
+        13
+    )  # 12: renamed, 6: set special_title, 13: unknown, 35: set reaction
     operator_uid: str = proto_field(21, default="")
     f44: Optional[GroupReaction] = proto_field(44, default=None)  # set reaction only
 
 
 class GroupSub20Body(ProtoStruct):
-    # f1: int = proto_field(1)  # 12
+    type: int = proto_field(1)  # 12: nudge, 14: group_sign
     # f2: int = proto_field(2)  # 1061
     # f3: int = proto_field(3)  # 7
     # f6: int = proto_field(6)  # 1132
     attrs: list[dict] = proto_field(7, default={})
     attrs_xml: str = proto_field(8, default=None)
-    f10: int = proto_field(10)
+    f10: int = proto_field(10)  # rand?
 
 
 class GroupSub20Head(ProtoStruct):