[Core] Fix the situation where some LightApps were judged as group invitations

Author: NoirHare

Lagrange.Core/Internal/Logic/MsgPushProccessors/RichTextMsgProcessor.cs

@@ -3,6 +3,7 @@
 using Lagrange.Core.Common.Entity;
 using Lagrange.Core.Events.EventArgs;
 using Lagrange.Core.Internal.Events.Message;
+using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entities;
 
 namespace Lagrange.Core.Internal.Logic.MsgPushProccessors;
@@ -15,31 +16,48 @@ internal class RichTextMsgProcessor : MsgPushProcessorBase
     internal override async ValueTask<bool> Handle(BotContext context, MsgType msgType, int subType, PushMessageEvent msgEvt, ReadOnlyMemory<byte>? content)
     {
         var message = await context.EventContext.GetLogic<MessagingLogic>().Parse(msgEvt.MsgPush.CommonMessage);
-        if (message.Entities[0] is LightAppEntity { AppName: "com.tencent.qun.invite" } || message.Entities[0] is LightAppEntity { AppName: "com.tencent.tuwen.lua" })
-        {
-            var app = (LightAppEntity)message.Entities[0];
-            using var document = JsonDocument.Parse(app.Payload);
-            var root = document.RootElement;
-
-            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'?"));
-            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,
-                message.Contact.Uid,
-                false
-            )));
-            return true;
-        }
+
+        if (message.Entities[0] is LightAppEntity app && TryHandleLightApp(context, message, app)) return true;
+
         context.EventInvoker.PostEvent(new BotMessageEvent(message, msgEvt.Raw));
         return true;
     }
+
+    private bool TryHandleLightApp(BotContext context, BotMessage message, LightAppEntity app)
+    {
+        if ((app.AppName == "com.tencent.qun.invite" || app.AppName == "com.tencent.qun.invite") && TryHandleQunInvite(context, message, app)) return true;
+
+        return false;
+    }
+
+    private bool TryHandleQunInvite(BotContext context, BotMessage message, LightAppEntity app)
+    {
+        using var document = JsonDocument.Parse(app.Payload);
+        var root = document.RootElement;
+
+        string? bizsrc = root.GetProperty("bizsrc").GetString();
+        if (app.AppName == "com.tencent.qun.invite" && bizsrc != "qun.invite") return false;
+
+        string? url = root.GetProperty("meta").GetProperty("news").GetProperty("jumpUrl").GetString();
+        if (url == null) throw new Exception($"TryHandleQunInvite failed! LightApp: {app.Payload}");
+
+        var query = HttpUtility.ParseQueryString(new Uri(url).Query);
+        long uin = uint.Parse(query["groupcode"] ?? throw new Exception($"TryHandleQunInvite failed! LightApp: {app.Payload}"));
+        ulong sequence = ulong.Parse(query["msgseq"] ?? throw new Exception($"TryHandleQunInvite failed! LightApp: {app.Payload}"));
+
+        context.EventInvoker.PostEvent(new BotGroupInviteNotificationEvent(new BotGroupInviteNotification(
+            uin,
+            sequence,
+            context.BotUin,
+            context.CacheContext.ResolveCachedUid(context.BotUin) ?? string.Empty,
+            BotGroupNotificationState.Wait,
+            null,
+            null,
+            message.Contact.Uin,
+            message.Contact.Uid,
+            false
+        )));
+
+        return true;
+    }
 }

Lagrange.Milky/README.md

@@ -48,11 +48,11 @@ Current Milky version: [77c6cbd](https://github.com/SaltifyDev/milky/tree/77c6cb
   - [x] friend
   - [x] group
   - [ ] temp (wontimpl)
-  - [ ] no start_message_seq
+  - [ ] start_message_seq
 - [x] /get_resource_temp_url
 - [ ] /get_forwarded_messages
-- [ ] /recall_private_message
-- [ ] /recall_group_message
+- [x] /recall_private_message
+- [x] /recall_group_message
 - [ ] /mark_message_as_read
 
 #### friend