[NativeAPI] Sync and fix

Author: Lilyltt

Lagrange.Core.NativeAPI/NativeModel/Message/BotMessageStruct.cs

@@ -83,15 +83,15 @@ public static implicit operator BotMessageStruct(BotMessage message)
                         entities[i] = new TypedEntityStruct()
                         {
                             Type = (int)EntityType.RecordEntity,
-                            Entity = Marshal.AllocHGlobal(Marshal.SizeOf<RecordEntity>())
+                            Entity = Marshal.AllocHGlobal(Marshal.SizeOf<RecordEntityStruct>())
                         };
                         Marshal.StructureToPtr((RecordEntityStruct)recordEntity, entities[i].Entity, false);
                         break;
                     case ReplyEntity replyEntity:
                         entities[i] = new TypedEntityStruct()
                         {
                             Type = (int)EntityType.ReplyEntity,
-                            Entity = Marshal.AllocHGlobal(Marshal.SizeOf<ReplyEntity>())
+                            Entity = Marshal.AllocHGlobal(Marshal.SizeOf<ReplyEntityStruct>())
                         };
                         Marshal.StructureToPtr((ReplyEntityStruct)replyEntity, entities[i].Entity, false);
                         break;
@@ -111,6 +111,14 @@ public static implicit operator BotMessageStruct(BotMessage message)
                         };
                         Marshal.StructureToPtr((VideoEntityStruct)videoEntity, entities[i].Entity, false);
                         break;
+                    case MultiMsgEntity multiMsgEntity:
+                        entities[i] = new TypedEntityStruct()
+                        {
+                            Type = (int)EntityType.MultiMsgEntity,
+                            Entity = Marshal.AllocHGlobal(Marshal.SizeOf<MultiMsgEntityStruct>())
+                        };
+                        Marshal.StructureToPtr((MultiMsgEntityStruct)multiMsgEntity, entities[i].Entity, false);
+                        break;
                 }
             }
 

Lagrange.Core.NativeAPI/NativeModel/Message/Entity/EntityType.cs

@@ -8,5 +8,6 @@ public enum EntityType
         ReplyEntity = 3,
         VideoEntity = 4,
         TextEntity = 5,
+        MultiMsgEntity = 6,
     }
 }

Lagrange.Core.NativeAPI/NativeModel/Message/Entity/MentionEntityStruct.cs

@@ -18,7 +18,7 @@ public static implicit operator MentionEntityStruct(MentionEntity entity)
             return new MentionEntityStruct()
             {
                 Uin = entity.Uin,
-                Display = Encoding.UTF8.GetBytes(entity.Display)
+                Display = Encoding.UTF8.GetBytes(entity.Display ?? string.Empty)
             };
         }
     }

Lagrange.Core.NativeAPI/NativeModel/Message/Entity/MultiMsgEntityStruct.cs

@@ -0,0 +1,40 @@
+using System.Runtime.InteropServices;
+using System.Text;
+using Lagrange.Core.NativeAPI.NativeModel.Common;
+
+namespace Lagrange.Core.NativeAPI.NativeModel.Message.Entity;
+
+[StructLayout(LayoutKind.Sequential)]
+public struct MultiMsgEntityStruct
+{
+    public MultiMsgEntityStruct() { }
+    
+    public IntPtr Messages;
+    
+    public int MessageCount;
+    
+    public ByteArrayNative ResId;
+    
+    public static implicit operator MultiMsgEntityStruct(Lagrange.Core.Message.Entities.MultiMsgEntity entity)
+    {
+        var messagesStructs = entity.Messages
+            .Select(m => (BotMessageStruct)m)
+            .ToArray();
+        
+        IntPtr messagesPtr = Marshal.AllocHGlobal(Marshal.SizeOf<BotMessageStruct>() * messagesStructs.Length);
+        
+        for (int i = 0; i < messagesStructs.Length; i++)
+        {
+            Marshal.StructureToPtr(messagesStructs[i], messagesPtr + i * Marshal.SizeOf<BotMessageStruct>(), false);
+        }
+        
+        return new MultiMsgEntityStruct
+        {
+            Messages = messagesPtr,
+            MessageCount = messagesStructs.Length,
+            ResId = entity.ResId != null 
+                ? Encoding.UTF8.GetBytes(entity.ResId) 
+                : []
+        };
+    }
+}

Lagrange.Core.NativeAPI/NativeModel/Message/Entity/ReplyEntityStruct.cs

@@ -1,17 +1,47 @@
 using System.Runtime.InteropServices;
+using Lagrange.Core.Common.Entity;
 using Lagrange.Core.Message.Entities;
 
 namespace Lagrange.Core.NativeAPI.NativeModel.Message.Entity
 {
     [StructLayout(LayoutKind.Sequential)]
-    public class ReplyEntityStruct
+    public struct ReplyEntityStruct
     {
         public ReplyEntityStruct() { }
+
+        public ulong SrcUid;
+        
+        public int SrcSequence;
+        
+        public IntPtr Source;
+
+        public int SourceType;
 
         public static implicit operator ReplyEntityStruct(ReplyEntity entity)
         {
-            return new ReplyEntityStruct() { };
-            throw new NotImplementedException();
+            var type = entity.Source switch
+            {
+                BotFriend => 1,
+                BotGroupMember => 2,
+                BotStranger => 3,
+                _ => 0
+            };
+            
+            var sourcePtr = type switch
+            {
+                1 => Marshal.AllocHGlobal(Marshal.SizeOf<BotFriend>()),
+                2 => Marshal.AllocHGlobal(Marshal.SizeOf<BotGroupMember>()),
+                3 => Marshal.AllocHGlobal(Marshal.SizeOf<BotStranger>()),
+                _ => IntPtr.Zero
+            };
+            
+            return new ReplyEntityStruct
+            {
+                SrcUid = entity.SrcUid,
+                SrcSequence = entity.SrcSequence,
+                Source = sourcePtr,
+                SourceType = type
+            };
         }
     }
 }

Lagrange.Core.NativeAPI/SendMessageEntryPoint.cs

@@ -171,7 +171,7 @@ public static IntPtr SendFriendMessage(int index, int id, long friendUin)
                 return IntPtr.Zero;
             }
 
-            var message = context.BotContext.SendFriendMessage(chain, friendUin).GetAwaiter().GetResult();
+            var message = context.BotContext.SendFriendMessage(friendUin, chain).GetAwaiter().GetResult();
 
             IntPtr messagePtr = Marshal.AllocHGlobal(Marshal.SizeOf<BotMessageStruct>());
             Marshal.StructureToPtr((BotMessageStruct)message, messagePtr, false);
@@ -193,7 +193,7 @@ public static IntPtr SendGroupMessage(int index, int id, long groupUin)
                 return IntPtr.Zero;
             }
 
-            var message = context.BotContext.SendGroupMessage(chain, groupUin).GetAwaiter().GetResult();
+            var message = context.BotContext.SendGroupMessage(groupUin, chain).GetAwaiter().GetResult();
 
             IntPtr messagePtr = Marshal.AllocHGlobal(Marshal.SizeOf<BotMessageStruct>());
             Marshal.StructureToPtr((BotMessageStruct)message, messagePtr, false);

Lagrange.Core/Internal/Context/ServiceContext.cs

@@ -62,7 +62,7 @@ public ValueTask<ProtocolEvent> Resolve(SsoPacket ssoPacket)
     {
         if (!_services.TryGetValue(ssoPacket.Command, out var service)) throw new ServiceNotFoundException(ssoPacket.Command);
 
-        if (!_disabledLog.Contains(ssoPacket.Command)) _context.LogDebug(Tag, "Incoming SSOFrame: {0}", ssoPacket.Command);
+        if (!_disabledLog.Contains(ssoPacket.Command)) _context.LogTrace(Tag, "Incoming SSOFrame: {0}", ssoPacket.Command);
         return service.Parse(ssoPacket.Data, _context);
     }
 
@@ -71,7 +71,7 @@ public ValueTask<ProtocolEvent> Resolve(SsoPacket ssoPacket)
         if (!_servicesEventType.TryGetValue(@event.GetType(), out var handler)) return default;
 
         var (attr, service) = handler;
-        if (!handler.Attribute.DisableLog) _context.LogDebug(Tag, "Outgoing SSOFrame: {0}", handler.Attribute.Command);
+        if (!handler.Attribute.DisableLog) _context.LogTrace(Tag, "Outgoing SSOFrame: {0}", handler.Attribute.Command);
 
         return (new SsoPacket(attr.Command, await service.Build(@event, _context), GetNewSequence()), attr);
     }