[Core] Implemented FriendRequest Event

LagrangeDev · Oct 30, 2023 · e4e796b · e4e796b
1 parent 9d9e541
commit e4e796b
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 6 deletions.
diff --git a/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs b/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs
@@ -16,6 +16,7 @@ namespace Lagrange.Core.Internal.Context.Logic.Implementation;
 [EventSubscribe(typeof(GroupSysAdminEvent))]
 [EventSubscribe(typeof(GroupSysIncreaseEvent))]
 [EventSubscribe(typeof(GroupSysDecreaseEvent))]
+[EventSubscribe(typeof(FriendSysRequestEvent))]
 [BusinessLogic("MessagingLogic", "Manage the receiving and sending of messages and notifications")]
 internal class MessagingLogic : LogicBase
 {
@@ -75,6 +76,12 @@ public override async Task Incoming(ProtocolEvent e)
                 Collection.Invoker.PostEvent(decreaseArgs);
                 break;
             }
+            case FriendSysRequestEvent info:
+            {
+                var requestArgs = new FriendRequestEvent(info.SourceUin, info.Name, info.Message);
+                Collection.Invoker.PostEvent(requestArgs);
+                break;
+            }
         }
     }
 

diff --git a/Lagrange.Core/Internal/Event/EventArg/FriendRequestEvent.cs b/Lagrange.Core/Internal/Event/EventArg/FriendRequestEvent.cs
@@ -0,0 +1,19 @@
+namespace Lagrange.Core.Internal.Event.EventArg;
+
+public class FriendRequestEvent : EventBase
+{
+    public uint SourceUin { get; }
+
+    public string Name { get; }
+
+    public string Message { get; }
+
+    internal FriendRequestEvent(uint sourceUin, string name, string message)
+    {
+        SourceUin = sourceUin;
+        Name = name;
+        Message = message;
+
+        EventMessage = $"[{nameof(FriendRequestEvent)}]: {SourceUin}:{Name} {Message}";
+    }
+}
diff --git a/Lagrange.Core/Internal/Event/EventInvoker.Events.cs b/Lagrange.Core/Internal/Event/EventInvoker.Events.cs
@@ -25,4 +25,6 @@ public partial class EventInvoker
     public event LagrangeEvent<GroupMemberIncreaseEvent>? OnGroupMemberIncreaseEvent;
 
     public event LagrangeEvent<GroupMemberDecreaseEvent>? OnGroupMemberDecreaseEvent;
+
+    public event LagrangeEvent<FriendRequestEvent>? OnFriendRequestEvent;
 }
diff --git a/Lagrange.Core/Internal/Event/EventInvoker.cs b/Lagrange.Core/Internal/Event/EventInvoker.cs
@@ -24,6 +24,7 @@ internal EventInvoker(BotContext context)
         RegisterEvent((GroupAdminChangedEvent e) => OnGroupAdminChangedEvent?.Invoke(context, e));
         RegisterEvent((GroupMemberIncreaseEvent e) => OnGroupMemberIncreaseEvent?.Invoke(context, e));
         RegisterEvent((GroupMemberDecreaseEvent e) => OnGroupMemberDecreaseEvent?.Invoke(context, e));
+        RegisterEvent((FriendRequestEvent e) => OnFriendRequestEvent?.Invoke(context, e));
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/Lagrange.Core/Internal/Event/Protocol/Notify/FriendSysRequestEvent.cs b/Lagrange.Core/Internal/Event/Protocol/Notify/FriendSysRequestEvent.cs
@@ -0,0 +1,23 @@
+namespace Lagrange.Core.Internal.Event.Protocol.Notify;
+
+internal class FriendSysRequestEvent : ProtocolEvent
+{
+    public uint SourceUin { get; }
+
+    public string SourceUid { get; }
+
+    public string Message { get; }
+
+    public string Name { get; }
+
+    private FriendSysRequestEvent(uint sourceUin, string sourceUid, string message, string name) : base(0)
+    {
+        SourceUin = sourceUin;
+        SourceUid = sourceUid;
+        Message = message;
+        Name = name;
+    }
+
+    public static FriendSysRequestEvent Result(uint sourceUin, string sourceUid, string message, string name) =>
+        new(sourceUin, sourceUid, message, name);
+}
diff --git a/Lagrange.Core/Internal/Packets/Message/Notify/FriendRequest.cs b/Lagrange.Core/Internal/Packets/Message/Notify/FriendRequest.cs
@@ -0,0 +1,25 @@
+using ProtoBuf;
+
+#pragma warning disable CS8618
+
+namespace Lagrange.Core.Internal.Packets.Message.Notify;
+
+[ProtoContract]
+internal class FriendRequest
+{
+    [ProtoMember(1)] public FriendRequestInfo Info { get; set; }
+}
+
+[ProtoContract]
+internal class FriendRequestInfo
+{
+    [ProtoMember(1)] public uint Field0 { get; set; }
+
+    [ProtoMember(2)] public string SourceUid { get; set; }
+
+    [ProtoMember(3)] public string Message { get; set; }
+
+    [ProtoMember(4)] public string Name { get; set; }
+
+    [ProtoMember(5)] public uint Field5 { get; set; }
+}
diff --git a/Lagrange.Core/Internal/Service/Message/PushMessageService.cs b/Lagrange.Core/Internal/Service/Message/PushMessageService.cs
@@ -91,7 +91,7 @@ protected override bool Parse(byte[] input, BotKeystore keystore, BotAppInfo app
             }
             case PkgType.Event0x210:
             {
-                ProcessEvent0x210(input, message);
+                ProcessEvent0x210(input, message, extraEvents);
                 break;
             }
             case PkgType.Event0x2DC:
@@ -127,20 +127,21 @@ private static void ProcessEvent0x2DC(byte[] payload, PushMsg msg)
         }
     }
 
-    private static void ProcessEvent0x210(byte[] payload, PushMsg msg)
+    private static void ProcessEvent0x210(byte[] payload, PushMsg msg, List<ProtocolEvent> extraEvents)
     {
         var pkgType = (Event0x210SubType)(msg.Message.ContentHead.SubType ?? 0);
         switch (pkgType)
         {
             case Event0x210SubType.FriendRequestNotice when msg.Message.Body?.MsgContent is { } content:
             {
-                var subInfo = content[7..];
-                Console.WriteLine(subInfo.Hex());
+                var friend = Serializer.Deserialize<FriendRequest>(content.AsSpan());
+                var friendEvent = FriendSysRequestEvent.Result(msg.Message.ResponseHead.FromUin, friend.Info.SourceUid, friend.Info.Message, friend.Info.Name);
+                extraEvents.Add(friendEvent);
                 break;
             }
             default:
             {
-                Console.WriteLine($"Unknown Event0x2DC message type: {pkgType}: {payload.Hex()}");
+                Console.WriteLine($"Unknown Event0x210 message type: {pkgType}: {payload.Hex()}");
                 break;
             }
         }

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Please use Lagrange.Core responsibly and in accordance with the law.
 |          |         |                           |         | ~~Flash Image~~ |    🔴    | Group Request     |    🔴    | GroupPromoteAdmin   |    🟢    |
 |          |         |                           |         | Reply           |    🟢    | ~~Voice Call~~    |    🔴    | GroupInvite         |    🟢    |
 |          |         |                           |         | File            |    🟡    | Client Key        |    🟢    | GroupRequestJoin    |    🔴    |
-|          |         |                           |         |                 |         | Cookies           |    🟢    | FriendRequest       |    🔴    |
+|          |         |                           |         |                 |         | Cookies           |    🟢    | FriendRequest       |    🟢    |
 |          |         |                           |         |                 |         | Send Message      |    🟢    | ~~FriendTyping~~    |    🔴    |
 |          |         |                           |         |                 |         |                   |         | ~~FriendVoiceCall~~ |    🔴    |