feat(event): GroupInviteAccept event & GroupRecall event (LagrangeDev#37)

HornCopper · web-flow · commit a05321c156ac · 2024-09-25T11:48:22.000+08:00
diff --git a/lagrange/client/events/friend.py b/lagrange/client/events/friend.py
@@ -23,3 +23,10 @@ class FriendMessage(FriendEvent):
     timestamp: int
     msg: str
     msg_chain: list[Element]
+
+
+@dataclass
+class FriendRecall(FriendEvent):
+    seq: int
+    msg_id: int
+    timestamp: int
diff --git a/lagrange/client/events/group.py b/lagrange/client/events/group.py
@@ -147,3 +147,9 @@ class GroupAlbumUpdate(GroupEvent):
 @dataclass
 class GroupInvite(GroupEvent):
     invitor_uid: str
+
+
+@dataclass
+class GroupInviteAccept(GroupEvent):
+    invitor_uin: int
+    uin: int
diff --git a/lagrange/client/server_push/msg.py b/lagrange/client/server_push/msg.py
@@ -17,6 +17,9 @@
     PBGroupAlbumUpdate,
     PBGroupInvite,
 )
+from lagrange.pb.status.friend import (
+    PBFriendRecall
+)
 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, timestamp
@@ -34,6 +37,10 @@
     GroupReaction,
     GroupSign,
     GroupAlbumUpdate,
+    GroupInviteAccept
+)
+from ..events.friend import (
+    FriendRecall
 )
 from ..wtlogin.sso import SSOPacket
 from .log import logger
@@ -90,7 +97,18 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
         if pb.cmd == 87:
             inn = pb.info.inner
             return GroupMemberJoinRequest(grp_id=inn.grp_id, uid=inn.uid, invitor_uid=inn.invitor_uid)
-    elif typ == 0x210:  # friend event / group file upload notice event
+    elif typ == 0x210:  # friend event, 528 / group file upload notice event
+        if sub_typ == 138: # friend recall
+            pb = PBFriendRecall.decode(pkg.message.buf2)
+            return FriendRecall(
+                pkg.response_head.from_uin,
+                pb.info.from_uid,
+                pkg.response_head.to_uin,
+                pb.info.to_uid,
+                pb.info.seq,
+                pb.info.random,
+                pb.info.time
+            )
         logger.debug(f"unhandled friend event / group file upload notice event: {pkg}")  # TODO: paste
     elif typ == 0x2DC:  # grp event, 732
         if sub_typ == 20:  # nudge and group_sign(群打卡)
@@ -106,6 +124,12 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                         attrs[k.decode()] = int(v.decode())
                     else:
                         attrs[k.decode()] = v.decode()
+                if pb.body.type == 1:
+                    return GroupInviteAccept(
+                        grp_id,
+                        attrs["invitor"],
+                        attrs["invitee"]
+                    )
                 if pb.body.type == 12:
                     return GroupNudge(
                         grp_id,
diff --git a/lagrange/pb/status/friend.py b/lagrange/pb/status/friend.py
@@ -0,0 +1,15 @@
+from lagrange.utils.binary.protobuf import proto_field, ProtoStruct
+
+class FriendRecallInfo(ProtoStruct):
+    from_uid: str = proto_field(1)
+    to_uid: str = proto_field(2)
+    seq: int = proto_field(3)
+    new_id: int = proto_field(4)
+    time: int = proto_field(5)
+    random: int = proto_field(6)
+    package_num: int = proto_field(7)
+    package_index: int = proto_field(8)
+    div_seq: int = proto_field(9)
+
+class PBFriendRecall(ProtoStruct):
+    info: FriendRecallInfo = proto_field(1)
