[Core & Milky] Implement group_member_increase event (#71)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: kengwang

Lagrange.Core/Events/EventArgs/BotGroupMemberIncreaseEvent.cs

@@ -0,0 +1,16 @@
+namespace Lagrange.Core.Events.EventArgs;
+
+public class BotGroupMemberIncreaseEvent(long groupUin, long memberUin, long invitorUin, uint type, long? operatorUin) : EventBase
+{
+    public long GroupUin { get; } = groupUin;
+    public long MemberUin { get; } = memberUin;
+    public long InvitorUin { get; } = invitorUin;
+    public uint Type { get; } = type;
+    public long? OperatorUin { get; } = operatorUin;
+
+
+    public override string ToEventMessage()
+    {
+        return $"{nameof(BotGroupMemberIncreaseEvent)}: GroupUin={GroupUin}, MemberUin={MemberUin}, InvitorUin={InvitorUin}, Type={Type}, OperatorUin={OperatorUin}";
+    }
+}

Lagrange.Core/Internal/Logic/PushLogic.cs

@@ -1,3 +1,4 @@
+using System.Text;
 using System.Text.Json;
 using System.Web;
 using Lagrange.Core.Common;
@@ -54,6 +55,29 @@ public async ValueTask Incoming(ProtocolEvent e)
                 context.EventInvoker.PostEvent(new BotMessageEvent(message, messageEvent.Raw));
                 break;
             }
+            case Type.GroupMemberIncreaseNotice when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is { } content:
+            {
+                var increase = ProtoHelper.Deserialize<GroupChange>(content.Span);
+                var response = await context.EventContext.SendEvent<FetchGroupNotificationsEventResp>(
+                    new FetchGroupNotificationsEventReq(20)
+                );
+                var inviteNotifications = response
+                    .GroupNotifications
+                    .OfType<BotGroupInviteNotification>();
+                var notification = inviteNotifications.FirstOrDefault(notification =>
+                    increase.GroupUin == notification.GroupUin &&
+                    increase.MemberUid == notification.TargetUid &&
+                    notification.State == BotGroupNotificationState.Accept
+                );
+                var operatorUin = notification?.OperatorUin;
+                context.EventInvoker.PostEvent(new BotGroupMemberIncreaseEvent(
+                    increase.GroupUin,
+                    context.CacheContext.ResolveUin(increase.MemberUid),
+                    context.CacheContext.ResolveUin(Encoding.UTF8.GetString(increase.Operator.AsSpan())),
+                    increase.IncreaseType,
+                    operatorUin));
+                break;
+            }
             case Type.GroupMemberDecreaseNotice when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is { } content:
             {
                 var decrease = ProtoHelper.Deserialize<GroupChange>(content.Span);
@@ -266,6 +290,7 @@ public async ValueTask Incoming(ProtocolEvent e)
 
     private enum Type
     {
+        GroupMemberIncreaseNotice = 33,
         GroupMemberDecreaseNotice = 34,
         GroupMessage = 82,
         GroupJoinNotification = 84,

Lagrange.Milky/Entity/Event/GroupMemberIncreaseEvent.cs

@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+namespace Lagrange.Milky.Entity.Event;
+
+public class GroupMemberIncreaseEvent(long time, long selfId, GroupMemberIncreaseEventData data) : EventBase<GroupMemberIncreaseEventData>(time, selfId, "group_member_increase", data) { }
+
+public class GroupMemberIncreaseEventData(long groupId, long userId, long? operatorId, long? invitorId = null)
+{
+    [JsonPropertyName("group_id")]
+    public long GroupId { get; } = groupId;
+    [JsonPropertyName("user_id")]
+    public long UserId { get; } = userId;
+    [JsonPropertyName("operator_id")]
+    public long? OperatorId { get; } = operatorId;
+    [JsonPropertyName("invitor_id")]
+    public long? InvitorId { get; } = invitorId;
+}

Lagrange.Milky/Event/EventService.cs

@@ -29,6 +29,7 @@ public Task StartAsync(CancellationToken token)
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotOfflineEvent>(HandleOfflineEvent);
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotMessageEvent>(HandleMessageEvent);
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotGroupNudgeEvent>(HandleGroupNudgeEvent);
+        _bot.EventInvoker.RegisterEvent<LgrEvents.BotGroupMemberIncreaseEvent>(HandleGroupMemberIncreaseEvent);
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotGroupMemberDecreaseEvent>(HandleGroupMemberDecreaseEvent);
         _bot.EventInvoker.RegisterEvent<LgrEvents.BotFriendRequestEvent>(HandleFriendRequestEvent);
 
@@ -124,6 +125,32 @@ private void HandleGroupNudgeEvent(BotContext bot, LgrEvents.BotGroupNudgeEvent
         }
     }
 
+    private void HandleGroupMemberIncreaseEvent(BotContext bot, LgrEvents.BotGroupMemberIncreaseEvent @event)
+    {
+        try
+        {
+            _logger.LogGroupMemberIncreaseEvent(
+                @event.GroupUin,
+                @event.MemberUin,
+                @event.OperatorUin,
+                @event.InvitorUin
+            );
+            var result = _convert.GroupMemberIncreaseEvent(@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.BotGroupMemberIncreaseEvent), e);
+        }
+    }
+    
     private void HandleGroupMemberDecreaseEvent(BotContext bot, LgrEvents.BotGroupMemberDecreaseEvent @event)
     {
         try
@@ -226,6 +253,9 @@ public static partial class EventServiceLoggerExtension
     [LoggerMessage(EventId = 6, Level = LogLevel.Debug, Message = "BotGroupInviteEvent {{ request: {request}, user: {user}, group: {group} }}")]
     public static partial void LogGroupInvitationEvent(this ILogger<EventService> logger, long request, long user, long group);
 
+    [LoggerMessage(EventId = 7, Level = LogLevel.Debug, Message = "BotGroupMemberIncreaseEvent {{ group: {group}, user: {user}, operator: {operator}, invitor: {invitor} }}")]
+    public static partial void LogGroupMemberIncreaseEvent(this ILogger<EventService> logger, long group, long user, long? @operator, long? invitor);
+
     [LoggerMessage(EventId = 999, Level = LogLevel.Error, Message = "Handle {event} exception")]
     public static partial void LogHandleEventException(this ILogger<EventService> logger, string @event, Exception e);
 }

Lagrange.Milky/Utility/EntityConvert.Event.cs

@@ -24,6 +24,17 @@ public partial class EntityConvert
         new GroupNudgeEventData(@event.GroupUin, @event.OperatorUin, @event.TargetUin, @event.Action, @event.Suffix, @event.ActionImageUrl)
     );
 
+    public GroupMemberIncreaseEvent GroupMemberIncreaseEvent(LgrEventArgs.BotGroupMemberIncreaseEvent @event) => new(
+        @event.EventTime.ToUnixTimeSeconds(),
+        _bot.BotUin,
+        new GroupMemberIncreaseEventData(
+            @event.GroupUin,
+            @event.MemberUin,
+            @event.OperatorUin,
+            @event.InvitorUin
+        )
+    );
+    
     public GroupMemberDecreaseEvent GroupMemberDecreaseEvent(LgrEventArgs.BotGroupMemberDecreaseEvent @event) => new(
         @event.EventTime.ToUnixTimeSeconds(),
         _bot.BotUin,

Lagrange.Milky/Utility/JsonUtility.cs

@@ -117,6 +117,8 @@ public static partial class JsonUtility
     [JsonSerializable(typeof(MessageReceiveEvent))]
     // group_nudge
     [JsonSerializable(typeof(GroupNudgeEvent))]
+    // group_member_increase
+    [JsonSerializable(typeof(GroupMemberIncreaseEvent))]
     // group_member_decrease
     [JsonSerializable(typeof(GroupMemberDecreaseEvent))]
     // friend_request