<onebot>[feat]support Event: FriendRecallNoticeEvent

Author: HornCopper

app.py

@@ -12,15 +12,17 @@
     GroupMemberJoinRequest
 )
 from lagrange.client.events.friend import (
-    FriendMessage
+    FriendMessage,
+    FriendRecall
 )
 
 from onebot.handlers import (
     GroupMessageEventHandler,
     PrivateMessageEventHandler,
     GroupDecreaseEventHandler,
     GroupRecallEventHandler,
-    GroupRequestEventHandler
+    GroupRequestEventHandler,
+    FriendRecallEventHandler
 )
 from onebot.utils.database import db
 from onebot.utils.datamodels import UserInformation
@@ -70,4 +72,5 @@ async def handle_kick(client: "Client", event: "ServerKick"):
 lag.subscribe(GroupRecall, GroupRecallEventHandler)
 lag.subscribe(GroupInvite, GroupRequestEventHandler)
 lag.subscribe(GroupMemberJoinRequest, GroupRequestEventHandler)
+lag.subscribe(FriendRecall, FriendRecallEventHandler)
 lag.subscribe(ServerKick, handle_kick)

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

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
@@ -35,6 +38,9 @@
     GroupSign,
     GroupAlbumUpdate,
 )
+from ..events.friend import (
+    FriendRecall
+)
 from ..wtlogin.sso import SSOPacket
 from .log import logger
 
@@ -90,7 +96,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(群打卡)

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)

onebot/event/NoticeEvent.py

@@ -17,4 +17,9 @@ class GroupRecallNoticeEvent(NoticeEvent):
     group_id: int = 0
     user_id: int = 0
     operator_id: int = 0
+    message_id: int = 0
+
+class FriendRecallNoticeEvent(NoticeEvent):
+    notice_type: str = "friend_recall"
+    user_id: int = 0
     message_id: int = 0

onebot/handlers.py

@@ -10,7 +10,8 @@
     GroupMemberJoinRequest
 )
 from lagrange.client.events.friend import (
-    FriendMessage
+    FriendMessage,
+    FriendRecall
 )
 from onebot.event.MessageEvent import (
     GroupMessageSender,
@@ -19,7 +20,8 @@
 )
 from onebot.event.NoticeEvent import (
     GroupDecreaseNoticeEvent,
-    GroupRecallNoticeEvent
+    GroupRecallNoticeEvent,
+    FriendRecallNoticeEvent
 )
 from onebot.event.RequestEvent import (
     GroupRequestEvent
@@ -32,7 +34,7 @@
 from onebot.utils.message_chain import MessageConverter
 from onebot.cache import get_info
 
-from config import Config
+from config import Config, logger
 
 import json
 import ws
@@ -52,6 +54,9 @@ async def GroupMessageEventHandler(client: Client, converter: MessageConverter,
     message_id = generate_message_id(event.grp_id, event.seq)
     if Config.ignore_self and event.uin == client.uin:
         return
+    
+    logger.onebot.info(f"Received message ({message_id}/{event.seq}) from group ({event.grp_id}): {event.msg}")
+
     event_content = event.__dict__
     record_data = MessageEvent(
         msg_id=message_id,
@@ -85,6 +90,7 @@ async def PrivateMessageEventHandler(client: Client, converter: MessageConverter
         return
     content = await converter.convert_to_segments(event.msg_chain, "friend")
     message_id = generate_message_id(event.from_uin, event.seq)
+    logger.onebot.info(f"Received message ({message_id}/{event.seq}) from friend ({event.from_uin}): {event.msg}")
     event_content = event.__dict__
     record_data = MessageEvent(
         msg_id=message_id,
@@ -96,7 +102,7 @@ async def PrivateMessageEventHandler(client: Client, converter: MessageConverter
     )
     db.save(record_data)
     formatted_event = PrivateMessageEvent(
-        message_id=event.msg_id,
+        message_id=message_id,
         time=event.timestamp,
         user_id=event.from_uin, 
         self_id=event.to_uin, 
@@ -181,4 +187,23 @@ async def GroupRequestEventHandler(client: Client, converter: MessageConverter,
             converter.convert_to_dict(formatted_event),
             ensure_ascii=False
         )
-    )
+    )
+
+@init_handler
+async def FriendRecallEventHandler(client: Client, converter: MessageConverter, event: FriendRecall):
+    uin = event.from_uin
+    seq = event.seq
+    message: MessageEvent | Any = db.where_one(MessageEvent(), "uin = ? AND seq = ?", uin, seq, default=None)
+    if message is None:
+        return
+    formatted_event = FriendRecallNoticeEvent(
+        self_id = client.uin,
+        user_id = uin,
+        message_id = message.msg_id
+    )
+    await ws.websocket_connection.send(
+        json.dumps(
+            converter.convert_to_dict(formatted_event),
+            ensure_ascii=False
+        )
+    )