feat(event): add GroupReaction & GroupNudge

Author: wyapx

lagrange/client/events/group.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, List, Optional, Union, Dict
 
 from . import BaseEvent
 
@@ -42,6 +42,16 @@ class GroupRecall(GroupEvent, MessageInfo):
     suffix: str
 
 
+@dataclass
+class GroupNudge(GroupEvent):
+    sender_uin: int
+    target_uin: int
+    action: str
+    suffix: str
+    attrs: Dict[str, Union[str, int]] = field(repr=False)
+    attrs_xml: str = field(repr=False)
+
+
 @dataclass
 class GroupMuteMember(GroupEvent):
     """when target_uid is empty, mute all member"""
@@ -86,8 +96,26 @@ class GroupMemberGotSpecialTitle(GroupEvent):
 
 
 @dataclass
-class GroupNameChanged:
-    grp_id: int
+class GroupNameChanged(GroupEvent):
     name_new: str
     timestamp: int
     operator_uid: str
+
+
+@dataclass
+class GroupReaction(GroupEvent):
+    uid: str
+    seq: int
+    emoji_id: int
+    emoji_type: int
+    emoji_count: int
+    type: int
+    total_operations: int
+
+    @property
+    def is_increase(self) -> bool:
+        return self.type == 1
+
+    @property
+    def is_emoji(self) -> bool:
+        return self.emoji_type == 2

lagrange/client/server_push/msg.py

@@ -1,6 +1,6 @@
 import json
 import re
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Type, Tuple, TypeVar, Union, Dict
 
 from lagrange.client.message.decoder import parse_grp_msg, parse_friend_msg
 from lagrange.pb.message.msg_push import MsgPush
@@ -11,27 +11,37 @@
     MemberGotTitleBody,
     MemberInviteRequest,
     MemberJoinRequest,
-    MemberRecallMsg,
+    MemberRecallMsg, GroupSub20Head,
 )
-from lagrange.utils.binary.protobuf import proto_decode
+from lagrange.utils.binary.protobuf import proto_decode, ProtoStruct
 from lagrange.utils.binary.reader import Reader
 from lagrange.utils.operator import unpack_dict
 
+from ..events import BaseEvent
 from ..events.group import (
     GroupMemberGotSpecialTitle,
     GroupMemberJoined,
     GroupMemberJoinRequest,
     GroupMemberQuit,
     GroupMuteMember,
     GroupNameChanged,
-    GroupRecall,
+    GroupRecall, GroupNudge, GroupReaction,
 )
 from ..wtlogin.sso import SSOPacket
 from .log import logger
 
 if TYPE_CHECKING:
     from lagrange.client.client import Client
 
+T = TypeVar("T", bound=ProtoStruct)
+
+
+def unpack(buf2: bytes, decoder: Type[T]) -> Tuple[int, T]:
+    reader = Reader(buf2)
+    grp_id = reader.read_u32()
+    reader.read_u8()
+    return grp_id, decoder.decode(reader.read_bytes_with_length("u16", False))
+
 
 async def msg_push_handler(client: "Client", sso: SSOPacket):
     pkg = MsgPush.decode(sso.data).body
@@ -76,13 +86,30 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
         logger.debug("unhandled friend event: %s" % pkg)
     elif typ == 0x2DC:  # grp event, 732
         if sub_typ == 20:  # nudget(grp_id only)
-            return
-        elif sub_typ == 16:  # rename and special_title and reaction(server not impl)
-            if pkg.message:  # rename and special_title
-                reader = Reader(pkg.message.buf2)
-                grp_id = reader.read_u32()
-                reader.read_u8()  # reserve
-                pb = GroupSub16Head.decode(reader.read_bytes_with_length("u16", False))
+            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 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
+                )
+            else:
+                # print(pkg.encode().hex(), 2)
+                return
+        elif sub_typ == 16:  # rename and special_title and reaction
+            if pkg.message:
+                grp_id, pb = unpack(pkg.message.buf2, GroupSub16Head)
                 if pb.flag == 6:  # special_title
                     body = MemberGotTitleBody.decode(pb.body)
                     for el in re.findall(r"<(\{.*?})>", body.string):
@@ -107,15 +134,24 @@ async def msg_push_handler(client: "Client", sso: SSOPacket):
                         timestamp=pb.timestamp,
                         operator_uid=pb.operator_uid,
                     )
+                elif pb.flag == 35:  # add reaction
+                    body = pb.f44.inner.body
+                    return GroupReaction(
+                        grp_id=grp_id,
+                        uid=body.detail.sender_uid,
+                        seq=body.msg.id,
+                        emoji_id=int(body.detail.emo_id),
+                        emoji_type=body.detail.emo_type,
+                        emoji_count=body.detail.count,
+                        type=body.detail.send_type,
+                        total_operations=body.msg.total_operations
+                    )
                 else:
                     raise ValueError(
                         f"Unknown subtype_12 flag: {pb.flag}: {pb.body.hex() if pb.body else pb}"
                     )
         elif sub_typ == 17:  # recall
-            reader = Reader(pkg.message.buf2)
-            grp_id = reader.read_u32()
-            reader.read_u8()  # reserve
-            pb = MemberRecallMsg.decode(reader.read_bytes_with_length("u16", False))
+            grp_id, pb = unpack(pkg.message.buf2, MemberRecallMsg)
 
             info = pb.body.info
             return GroupRecall(

lagrange/pb/status/group.py

@@ -73,9 +73,55 @@ class GroupRenamedBody(ProtoStruct):
     grp_name: str = proto_field(2)
 
 
+class GroupReactionMsg(ProtoStruct):
+    id: int = proto_field(1)
+    total_operations: int = proto_field(2)
+    # f3: int = proto_field(3)  # 4
+
+
+class GroupReactionDetail(ProtoStruct):
+    emo_id: str = proto_field(1)  # string type Unicode
+    emo_type: int = proto_field(2)  # 1: qq internal emoji, 2: unicode emoji
+    count: int = proto_field(3, default=0)
+    send_type: int = proto_field(5)  # 1: set, 2: remove
+    sender_uid: str = proto_field(4)
+
+
+class GroupReactionBody(ProtoStruct):
+    op_id: int = proto_field(1)
+    msg: GroupReactionMsg = proto_field(2)
+    detail: GroupReactionDetail = proto_field(3)
+
+
+class GroupReactionInner(ProtoStruct):
+    body: GroupReactionBody = proto_field(1)
+
+
+class GroupReaction(ProtoStruct):
+    inner: GroupReactionInner = proto_field(1)
+
+
 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
+    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
+    # 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)
+
+
+class GroupSub20Head(ProtoStruct):
+    f1: int = proto_field(1)  # 20
+    grp_id: int = proto_field(4)
+    f13: int = proto_field(13)  # 19
+    body: GroupSub20Body = proto_field(26)

main.py

@@ -5,15 +5,15 @@
 from lagrange.client.client import Client
 from lagrange.client.events.group import GroupMessage
 from lagrange.client.events.service import ServerKick
-from lagrange.client.message.elems import At, Raw, Text
+from lagrange.client.message.elems import At, Text
 
 
 async def msg_handler(client: Client, event: GroupMessage):
-    print(event)
+    #print(event)
     if event.msg.startswith("114514"):
-        p = await client.send_grp_msg([Text("1919810")], event.grp_id)
+        msg_seq = await client.send_grp_msg([At.build(event), Text("1919810")], event.grp_id)
         await asyncio.sleep(5)
-        await client.recall_grp_msg(event.grp_id, p)
+        await client.recall_grp_msg(event.grp_id, msg_seq)
     elif event.msg.startswith("imgs"):
         await client.send_grp_msg(
             [