[Core] Merge group invite self to group notification

Author: NoirHare

Lagrange.Core/Events/EventArgs/BotGroupInviteSelfEvent.cs

@@ -36,12 +36,19 @@ public async ValueTask Incoming(ProtocolEvent e)
                     string url = root.GetProperty("meta").GetProperty("news").GetProperty("jumpUrl").GetString() ?? throw new Exception("sb tx! Is this 'com.tencent.qun.invite' or 'com.tencent.tuwen.lua'?");
                     var query = HttpUtility.ParseQueryString(new Uri(url).Query);
                     long groupUin = uint.Parse(query["groupcode"] ?? throw new Exception("sb tx! Is this '/group/invite_join'?"));
-                    long sequence = long.Parse(query["msgseq"] ?? throw new Exception("sb tx! Is this '/group/invite_join'?"));
-                    context.EventInvoker.PostEvent(new BotGroupInviteSelfEvent(
+                    ulong sequence = ulong.Parse(query["msgseq"] ?? throw new Exception("sb tx! Is this '/group/invite_join'?"));
+                    context.EventInvoker.PostEvent(new BotGroupInviteNotificationEvent(new BotGroupInviteNotification(
+                        groupUin,
                         sequence,
+                        context.BotUin,
+                        context.CacheContext.ResolveCachedUid(context.BotUin) ?? string.Empty,
+                        BotGroupNotificationState.Wait,
+                        null,
+                        null,
                         message.Contact.Uin,
-                        groupUin
-                    ));
+                        message.Contact.Uid,
+                        false
+                    )));
                     break;
                 }
                 context.EventInvoker.PostEvent(new BotMessageEvent(message, messageEvent.Raw));

Lagrange.Core/Internal/Logic/PushLogic.cs

@@ -2,7 +2,6 @@
 using Lagrange.Core.Common.Entity;
 using Lagrange.Core.Message;
 using Lagrange.Milky.Configuration;
-using Lagrange.Milky.Entity;
 using Lagrange.Milky.Extension;
 using Lagrange.Milky.Utility;
 using Microsoft.Extensions.Hosting;
@@ -32,7 +31,6 @@ public Task StartAsync(CancellationToken token)
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotGroupNudgeEvent>(HandleGroupNudgeEvent);
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotGroupMemberDecreaseEvent>(HandleGroupMemberDecreaseEvent);
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotFriendRequestEvent>(HandleFriendRequestEvent);
-        _bot.EventInvoker.RegisterEvent<LgrEvents.BotGroupInviteSelfEvent>(HandleGroupInvitationEvent);
 
         return Task.CompletedTask;
     }
@@ -176,31 +174,6 @@ private void HandleFriendRequestEvent(BotContext bot, LgrEvents.BotFriendRequest
             _logger.LogHandleEventException(nameof(LgrEvents.BotFriendRequestEvent), e);
         }
     }
-    
-    private void HandleGroupInvitationEvent(BotContext bot, LgrEvents.BotGroupInviteSelfEvent @event)
-    {
-        try
-        {
-            _logger.LogGroupInvitationEvent(
-                @event.InvitationSeq,
-                @event.InitiatorUin,
-                @event.GroupUin
-            );
-            var result = _convert.GroupInvitationEvent(@event);
-            byte[] bytes = JsonUtility.SerializeToUtf8Bytes(result.GetType(), result);
-            using (_lock.UsingReadLock())
-            {
-                foreach (var handler in _handlers)
-                {
-                    handler(bytes);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            _logger.LogHandleEventException(nameof(LgrEvents.BotGroupInviteSelfEvent), e);
-        }
-    }
 
     public Task StopAsync(CancellationToken token)
     {

Lagrange.Milky/Event/EventService.cs

@@ -27,20 +27,21 @@ public partial class EntityConvert
     public GroupMemberDecreaseEvent GroupMemberDecreaseEvent(LgrEventArgs.BotGroupMemberDecreaseEvent @event) => new(
         @event.EventTime.ToUnixTimeSeconds(),
         _bot.BotUin,
-        new GroupMemberDecreaseEventData(@event.GroupUin, @event.UserUin, @event.OperatorUin == 0 ? null : @event.OperatorUin)
+        new GroupMemberDecreaseEventData(
+            @event.GroupUin,
+            @event.UserUin,
+            @event.OperatorUin == 0 ? null : @event.OperatorUin
+        )
     );
 
     public FriendRequestEvent FriendRequestEvent(LgrEventArgs.BotFriendRequestEvent @event) => new(
         @event.EventTime.ToUnixTimeSeconds(),
         _bot.BotUin,
-        new FriendRequestEventData(@event.InitiatorUid, @event.InitiatorUin, 
-            @event.Message, @event.Source)
-    );
-    
-    public GroupInvitationEvent GroupInvitationEvent(LgrEventArgs.BotGroupInviteSelfEvent @event) => new(
-        @event.EventTime.ToUnixTimeSeconds(),
-        _bot.BotUin,
-        new GroupInvitationEventData(@event.InvitationSeq,
-            @event.InitiatorUin, @event.GroupUin)
+        new FriendRequestEventData(
+            @event.InitiatorUid,
+            @event.InitiatorUin,
+            @event.Message,
+            @event.Source
+        )
     );
 }