[Core] Implemented group join event and group invite event (#34)

A-n-o-n-0 · web-flow · commit af18c39fd420 · 2025-08-14T18:41:29.000+08:00
diff --git a/Lagrange.Core/Common/Entity/BotGroupExitNotification.cs b/Lagrange.Core/Common/Entity/BotGroupExitNotification.cs
@@ -1,3 +1,3 @@
 namespace Lagrange.Core.Common.Entity;
 
-public class BotGroupExitNotification(long group, ulong sequence, long target) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Exit, target);
+public class BotGroupExitNotification(long groupUin, ulong sequence, long targetUin, string targetUid) : BotGroupNotificationBase(groupUin, sequence, BotGroupNotificationType.Exit, targetUin, targetUid);
diff --git a/Lagrange.Core/Common/Entity/BotGroupInviteNotification.cs b/Lagrange.Core/Common/Entity/BotGroupInviteNotification.cs
@@ -1,10 +1,14 @@
 namespace Lagrange.Core.Common.Entity;
 
-public class BotGroupInviteNotification(long group, ulong sequence, long target, BotGroupNotificationState state, long? @operator, long inviter) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Invite, target)
+public class BotGroupInviteNotification(long group, ulong sequence, long targetUin, string targetUid, BotGroupNotificationState state, long? operatorUin, string? operatorUid, long inviterUin, string inviterUid) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Invite, targetUin, targetUid)
 {
     public BotGroupNotificationState State { get; } = state;
 
-    public long? Operator { get; } = @operator;
+    public long? OperatorUin { get; } = operatorUin;
 
-    public long Inviter { get; } = inviter;
+    public string? OperatorUid { get; } = operatorUid;
+
+    public long InviterUin { get; } = inviterUin;
+
+    public string InviterUid { get; } = inviterUid;
 }
diff --git a/Lagrange.Core/Common/Entity/BotGroupJoinNotification.cs b/Lagrange.Core/Common/Entity/BotGroupJoinNotification.cs
@@ -1,10 +1,12 @@
 namespace Lagrange.Core.Common.Entity;
 
-public class BotGroupJoinNotification(long group, ulong sequence, long target, BotGroupNotificationState state, long? @operator, string comment) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Join, target)
+public class BotGroupJoinNotification(long group, ulong sequence, long targetUin, string targetUid, BotGroupNotificationState state, long? operatorUin, string? operatorUid, string comment) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Join, targetUin, targetUid)
 {
     public BotGroupNotificationState State { get; } = state;
 
-    public long? Operator { get; } = @operator;
+    public long? OperatorUin { get; } = operatorUin;
+
+    public string? OperatorUid { get; } = operatorUid;
 
     public string Comment { get; } = comment;
 }
diff --git a/Lagrange.Core/Common/Entity/BotGroupKickNotification.cs b/Lagrange.Core/Common/Entity/BotGroupKickNotification.cs
@@ -1,6 +1,8 @@
 namespace Lagrange.Core.Common.Entity;
 
-public class BotGroupKickNotification(long group, ulong sequence, long target, long @operator) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Exit, target)
+public class BotGroupKickNotification(long group, ulong sequence, long targetUin, string targetUid, long operatorUin, string operatorUid) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Exit, targetUin, targetUid)
 {
-    public long Operator { get; } = @operator;
+    public long Operator { get; } = operatorUin;
+
+    public string OperatorUid { get; } = operatorUid;
 }
diff --git a/Lagrange.Core/Common/Entity/BotGroupNotificationBase.cs b/Lagrange.Core/Common/Entity/BotGroupNotificationBase.cs
@@ -1,12 +1,14 @@
 namespace Lagrange.Core.Common.Entity;
 
-public abstract class BotGroupNotificationBase(long group, ulong sequence, BotGroupNotificationType type, long target)
+public abstract class BotGroupNotificationBase(long groupUin, ulong sequence, BotGroupNotificationType type, long targetUin, string targetUid)
 {
-    public long Group { get; } = group;
+    public long GroupUin { get; } = groupUin;
 
     public ulong Sequence { get; } = sequence;
 
     public BotGroupNotificationType Type { get; } = type;
 
-    public long Target { get; } = target;
+    public long TargetUin { get; } = targetUin;
+
+    public string TargetUid { get; } = targetUid;
 }
diff --git a/Lagrange.Core/Common/Entity/BotGroupNotificationType.cs b/Lagrange.Core/Common/Entity/BotGroupNotificationType.cs
@@ -3,8 +3,10 @@ namespace Lagrange.Core.Common.Entity;
 public enum BotGroupNotificationType
 {
     Join = 1,
-    Exit = 13,
+    SetAdmin = 3,
     KickOther = 6,
     KickSelf = 7,
+    Exit = 13,
+    UnsetAdmin = 16,
     Invite = 22
 }
diff --git a/Lagrange.Core/Common/Entity/BotGroupRejectNotification.cs b/Lagrange.Core/Common/Entity/BotGroupRejectNotification.cs
@@ -0,0 +1,8 @@
+namespace Lagrange.Core.Common.Entity;
+
+public class BotGroupUnsetAdminNotification(long groupUin, ulong sequence, long targetUin, string targetUid, long operatorUin, string operatorUid) : BotGroupNotificationBase(groupUin, sequence, BotGroupNotificationType.UnsetAdmin, targetUin, targetUid)
+{
+    public long Operator { get; } = operatorUin;
+
+    public string OperatorUid { get; } = operatorUid;
+}
diff --git a/Lagrange.Core/Common/Entity/BotGroupSetAdminNotification.cs b/Lagrange.Core/Common/Entity/BotGroupSetAdminNotification.cs
@@ -0,0 +1,8 @@
+namespace Lagrange.Core.Common.Entity;
+
+public class BotGroupSetAdminNotification(long group, ulong sequence, long targetUin, string targetUid, long operatorUin, string operatorUid) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.SetAdmin, targetUin, targetUid)
+{
+    public long Operator { get; } = operatorUin;
+
+    public string OperatorUid { get; } = operatorUid;
+}
diff --git a/Lagrange.Core/Events/EventArgs/BotGroupInviteNotificationEvent.cs b/Lagrange.Core/Events/EventArgs/BotGroupInviteNotificationEvent.cs
@@ -0,0 +1,10 @@
+﻿using Lagrange.Core.Common.Entity;
+
+namespace Lagrange.Core.Events.EventArgs;
+
+public class BotGroupInviteNotificationEvent(BotGroupInviteNotification notification) : EventBase
+{
+    public BotGroupInviteNotification Notification { get; } = notification;
+
+    public override string ToEventMessage() => $"{nameof(BotGroupInviteNotificationEvent)} Group {Notification.GroupUin} Inviter {Notification.InviterUin} Target {Notification.TargetUin}";
+}
diff --git a/Lagrange.Core/Events/EventArgs/BotGroupJoinNotificationEvent.cs b/Lagrange.Core/Events/EventArgs/BotGroupJoinNotificationEvent.cs
@@ -0,0 +1,10 @@
+﻿using Lagrange.Core.Common.Entity;
+
+namespace Lagrange.Core.Events.EventArgs;
+
+public class BotGroupJoinNotificationEvent(BotGroupJoinNotification notification) : EventBase
+{
+    public BotGroupJoinNotification Notification { get; } = notification;
+
+    public override string ToEventMessage() => $"{nameof(BotGroupJoinNotificationEvent)} Group {Notification.GroupUin} Target {Notification.TargetUin}";
+}
diff --git a/Lagrange.Core/Internal/Logic/PushLogic.cs b/Lagrange.Core/Internal/Logic/PushLogic.cs
@@ -1,8 +1,10 @@
 using System.Text;
 using Lagrange.Core.Common;
+using Lagrange.Core.Common.Entity;
 using Lagrange.Core.Events.EventArgs;
 using Lagrange.Core.Internal.Events;
 using Lagrange.Core.Internal.Events.Message;
+using Lagrange.Core.Internal.Events.System;
 using Lagrange.Core.Internal.Packets.Notify;
 using Lagrange.Core.Utility.Binary;
 using ProtoHelper = Lagrange.Core.Utility.ProtoHelper;
@@ -21,10 +23,13 @@ public async ValueTask Incoming(ProtocolEvent e)
             case Type.GroupMessage:
             case Type.PrivateMessage:
             case Type.TempMessage:
+            {
                 var message = await context.EventContext.GetLogic<MessagingLogic>().Parse(messageEvent.MsgPush.CommonMessage);
                 context.EventInvoker.PostEvent(new BotMessageEvent(message, messageEvent.Raw));
                 break;
+            }
             case Type.GroupMemberDecreaseNotice when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is { } content:
+            {
                 var decrease = ProtoHelper.Deserialize<GroupChange>(content.Span);
                 if (decrease.DecreaseType == 3)
                 {
@@ -48,11 +53,70 @@ public async ValueTask Incoming(ProtocolEvent e)
                     );
                 }
                 break;
+            }
+            case Type.GroupJoinNotification when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is { } content:
+            {
+                var join = ProtoHelper.Deserialize<GroupJoin>(content.Span);
+
+                var response = await context.EventContext.SendEvent<FetchGroupNotificationsEventResp>(
+                    new FetchGroupNotificationsEventReq(20)
+                );
+                var joinNotifications = response
+                    .GroupNotifications
+                    .OfType<BotGroupJoinNotification>();
+                var notification = joinNotifications.FirstOrDefault(notification =>
+                    join.GroupUin == notification.GroupUin &&
+                    join.TargetUid == notification.TargetUid &&
+                    notification.State == BotGroupNotificationState.Wait
+                );
+                if (notification == null)
+                {
+                    context.LogWarning(nameof(PushLogic), "Received GroupJoinNotification but no corresponding notification found");
+                    break;
+                }
+
+                context.EventInvoker.PostEvent(new BotGroupJoinNotificationEvent(notification));
+                break;
+            }
+            case Type.Event0x20D when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is { } content:
+            {
+                var decrease = ProtoHelper.Deserialize<Event0x20D>(content.Span);
+                switch ((Event0x20DSubType)decrease.SubType)
+                {
+                    case Event0x20DSubType.GroupInviteNotification:
+                    {
+                        var body = ProtoHelper.Deserialize<GroupInvite>(decrease.Body);
+
+                        var response = await context.EventContext.SendEvent<FetchGroupNotificationsEventResp>(
+                            new FetchGroupNotificationsEventReq(20)
+                        );
+                        var inviteNotifications = response
+                            .GroupNotifications
+                            .OfType<BotGroupInviteNotification>();
+                        var notification = inviteNotifications.FirstOrDefault(notification =>
+                            body.Body.GroupUin == notification.GroupUin &&
+                            body.Body.InviterUid == notification.InviterUid &&
+                            body.Body.TargetUid == notification.TargetUid &&
+                            notification.State == BotGroupNotificationState.Wait
+                        );
+                        if (notification == null)
+                        {
+                            context.LogWarning(nameof(PushLogic), "Received GroupInviteNotification but no corresponding notification found");
+                            break;
+                        }
+
+                        context.EventInvoker.PostEvent(new BotGroupInviteNotificationEvent(notification));
+                        break;
+                    }
+                }
+                break;
+            }
             case Type.Event0x2DC:
+            {
                 var pkgType = (Event0x2DCSubType)messageEvent.MsgPush.CommonMessage.ContentHead.SubType;
                 switch (pkgType)
                 {
-                    case Event0x2DCSubType.GroupGreyTipNotice20 when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is {} content:
+                    case Event0x2DCSubType.GroupGreyTipNotice20 when messageEvent.MsgPush.CommonMessage.MessageBody.MsgContent is { } content:
                         var packet = new BinaryPacket(content);
                         Int64 groupUin = packet.Read<Int32>(); // group uin
                         _ = packet.Read<byte>(); // unknown byte
@@ -76,20 +140,28 @@ public async ValueTask Incoming(ProtocolEvent e)
                         break;
                 }
                 break;
+            }
+            default: break;
         }
     }
 
     private enum Type
     {
-        PrivateMessage = 166,
+        GroupMemberDecreaseNotice = 34,
         GroupMessage = 82,
+        GroupJoinNotification = 84,
         TempMessage = 141,
+        PrivateMessage = 166,
+        Event0x20D = 525,
         Event0x210 = 528,  // friend related event
         Event0x2DC = 732,  // group related event
-        
-        GroupMemberDecreaseNotice = 34,
     }
-    
+
+    private enum Event0x20DSubType
+    {
+        GroupInviteNotification = 87
+    }
+
     private enum Event0x2DCSubType
     {
         GroupMuteNotice = 12,
diff --git a/Lagrange.Core/Internal/Packets/Notify/Event0x20D.cs b/Lagrange.Core/Internal/Packets/Notify/Event0x20D.cs
@@ -0,0 +1,13 @@
+﻿using Lagrange.Proto;
+
+namespace Lagrange.Core.Internal.Packets.Notify;
+
+#pragma warning disable CS8618
+
+[ProtoPackable]
+internal partial class Event0x20D
+{
+    [ProtoMember(1)] public ulong SubType { get; set; }
+
+    [ProtoMember(2)] public byte[] Body { get; set; }
+}
diff --git a/Lagrange.Core/Internal/Packets/Notify/GroupInvite.cs b/Lagrange.Core/Internal/Packets/Notify/GroupInvite.cs
@@ -0,0 +1,21 @@
+﻿using Lagrange.Proto;
+
+namespace Lagrange.Core.Internal.Packets.Notify;
+
+#pragma warning disable CS8618
+
+[ProtoPackable]
+internal partial class GroupInvite
+{
+    [ProtoMember(1)] public GroupInviteBody Body { get; set; }
+}
+
+[ProtoPackable]
+internal partial class GroupInviteBody
+{
+    [ProtoMember(1)] public long GroupUin { get; set; }
+
+    [ProtoMember(5)] public string TargetUid { get; set; }
+
+    [ProtoMember(6)] public string InviterUid { get; set; }
+}
diff --git a/Lagrange.Core/Internal/Packets/Notify/GroupJoin.cs b/Lagrange.Core/Internal/Packets/Notify/GroupJoin.cs
@@ -0,0 +1,17 @@
+﻿using Lagrange.Proto;
+
+namespace Lagrange.Core.Internal.Packets.Notify;
+
+#pragma warning disable CS8618
+
+[ProtoPackable]
+internal partial class GroupJoin
+{
+    [ProtoMember(1)] public long GroupUin { get; set; }
+
+    [ProtoMember(2)] public ulong Type { get; set; }
+
+    [ProtoMember(3)] public string TargetUid { get; set; }
+
+    [ProtoMember(5)] public string Comment { get; set; }
+}
diff --git a/Lagrange.Core/Internal/Services/System/FetchGroupNotificationsService.cs b/Lagrange.Core/Internal/Services/System/FetchGroupNotificationsService.cs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`namespace Lagrange.Core.Common.Entity;`
`2`	`2`
`3`		`-public class BotGroupExitNotification(long group, ulong sequence, long target) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Exit, target);`
	`3`	`+public class BotGroupExitNotification(long groupUin, ulong sequence, long targetUin, string targetUid) : BotGroupNotificationBase(groupUin, sequence, BotGroupNotificationType.Exit, targetUin, targetUid);`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`namespace Lagrange.Core.Common.Entity;`
`2`	`2`
`3`		`-public class BotGroupJoinNotification(long group, ulong sequence, long target, BotGroupNotificationState state, long? @operator, string comment) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Join, target)`
	`3`	`+public class BotGroupJoinNotification(long group, ulong sequence, long targetUin, string targetUid, BotGroupNotificationState state, long? operatorUin, string? operatorUid, string comment) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Join, targetUin, targetUid)`
`4`	`4`	`{`
`5`	`5`	`public BotGroupNotificationState State { get; } = state;`
`6`	`6`
`7`		`- public long? Operator { get; } = @operator;`
	`7`	`+ public long? OperatorUin { get; } = operatorUin;`
	`8`	`+`
	`9`	`+ public string? OperatorUid { get; } = operatorUid;`
`8`	`10`
`9`	`11`	`public string Comment { get; } = comment;`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`namespace Lagrange.Core.Common.Entity;`
`2`	`2`
`3`		`-public class BotGroupKickNotification(long group, ulong sequence, long target, long @operator) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Exit, target)`
	`3`	`+public class BotGroupKickNotification(long group, ulong sequence, long targetUin, string targetUid, long operatorUin, string operatorUid) : BotGroupNotificationBase(group, sequence, BotGroupNotificationType.Exit, targetUin, targetUid)`
`4`	`4`	`{`
`5`		`- public long Operator { get; } = @operator;`
	`5`	`+ public long Operator { get; } = operatorUin;`
	`6`	`+`
	`7`	`+ public string OperatorUid { get; } = operatorUid;`
`6`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,14 @@`
`1`	`1`	`namespace Lagrange.Core.Common.Entity;`
`2`	`2`
`3`		`-public abstract class BotGroupNotificationBase(long group, ulong sequence, BotGroupNotificationType type, long target)`
	`3`	`+public abstract class BotGroupNotificationBase(long groupUin, ulong sequence, BotGroupNotificationType type, long targetUin, string targetUid)`
`4`	`4`	`{`
`5`		`- public long Group { get; } = group;`
	`5`	`+ public long GroupUin { get; } = groupUin;`
`6`	`6`
`7`	`7`	`public ulong Sequence { get; } = sequence;`
`8`	`8`
`9`	`9`	`public BotGroupNotificationType Type { get; } = type;`
`10`	`10`
`11`		`- public long Target { get; } = target;`
	`11`	`+ public long TargetUin { get; } = targetUin;`
	`12`	`+`
	`13`	`+ public string TargetUid { get; } = targetUid;`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@ namespace Lagrange.Core.Common.Entity;`
`3`	`3`	`public enum BotGroupNotificationType`
`4`	`4`	`{`
`5`	`5`	`Join = 1,`
`6`		`- Exit = 13,`
	`6`	`+ SetAdmin = 3,`
`7`	`7`	`KickOther = 6,`
`8`	`8`	`KickSelf = 7,`
	`9`	`+ Exit = 13,`
	`10`	`+ UnsetAdmin = 16,`
`9`	`11`	`Invite = 22`
`10`	`12`	`}`