[core] fix send image subtype (#818)

Author: NoirHare

Lagrange.Core/Internal/Packets/Service/Oidb/Common/NTV2RichMediaReq.cs

@@ -297,9 +297,9 @@ internal class PicExtBizInfo
 
     [ProtoMember(2)] public string TextSummary { get; set; }
 
-    [ProtoMember(11)] public byte[]? BytesPbReserveC2c { get; set; }
+    [ProtoMember(11)] public PicExtBizInfoC2c? C2c { get; set; }
 
-    [ProtoMember(12)] public byte[]? BytesPbReserveTroop { get; set; }
+    [ProtoMember(12)] public PicExtBizInfoTroop? Troop { get; set; }
 
     [ProtoMember(1001)] public uint FromScene { get; set; }
 
@@ -308,6 +308,18 @@ internal class PicExtBizInfo
     [ProtoMember(1003)] public uint OldFileId { get; set; }
 }
 
+[ProtoContract]
+internal class PicExtBizInfoC2c
+{
+    [ProtoMember(1)] public uint SubType { get; set; }
+}
+
+[ProtoContract]
+internal class PicExtBizInfoTroop
+{
+    [ProtoMember(1)] public uint SubType { get; set; }
+}
+
 [ProtoContract]
 internal class DownloadSafeReq
 {

Lagrange.Core/Internal/Service/Message/ImageGroupUploadService.cs

@@ -92,8 +92,15 @@ protected override bool Build(ImageGroupUploadEvent input, BotKeystore keystore,
                 {
                     Pic = new PicExtBizInfo
                     {
-                        TextSummary = input.Entity.Summary!,
-                        BytesPbReserveTroop = "0800180020004a00500062009201009a0100aa010c080012001800200028003a00".UnHex()
+                        BizType = (uint)input.Entity.SubType,
+                        // This is very confusing
+                        // so we only implement the default summary for sub type 1
+                        // and Tencent implements the others based on the default values.
+                        TextSummary = input.Entity.Summary ?? (input.Entity.SubType == 1 ? "[\u52a8\u753b\u8868\u60c5]" : null!),
+                        C2c = new PicExtBizInfoC2c
+                        {
+                            SubType = (uint)input.Entity.SubType
+                        }
                     },
                     Video = new VideoExtBizInfo { BytesPbReserve = Array.Empty<byte>() },
                     Ptt = new PttExtBizInfo

Lagrange.Core/Internal/Service/Message/ImageUploadService.cs

@@ -19,10 +19,10 @@ protected override bool Build(ImageUploadEvent input, BotKeystore keystore, BotA
         BotDeviceInfo device, out Span<byte> output, out List<Memory<byte>>? extraPackets)
     {
         if (input.Entity.ImageStream is null) throw new Exception();
-        
+
         string md5 = input.Entity.ImageStream.Value.Md5(true);
         string sha1 = input.Entity.ImageStream.Value.Sha1(true);
-        
+
         var buffer = new byte[1024]; // parse image header
         int _ = input.Entity.ImageStream.Value.Read(buffer.AsSpan());
         var type = ImageResolver.Resolve(buffer, out var size);
@@ -97,8 +97,14 @@ protected override bool Build(ImageUploadEvent input, BotKeystore keystore, BotA
                 {
                     Pic = new PicExtBizInfo
                     {
-                        TextSummary = input.Entity.Summary!,
-                        BytesPbReserveC2c = "0800180020004200500062009201009a0100a2010c080012001800200028003a00".UnHex()
+                        BizType = (uint)input.Entity.SubType,
+                        // This is very confusing, so we only implement the default summary for sub type 1
+                        // and Tencent implements the others based on the default values.
+                        TextSummary = input.Entity.Summary ?? (input.Entity.SubType == 1 ? "[\u52a8\u753b\u8868\u60c5]" : null!),
+                        C2c = new PicExtBizInfoC2c
+                        {
+                            SubType = (uint)input.Entity.SubType
+                        }
                     },
                     Video = new VideoExtBizInfo { BytesPbReserve = Array.Empty<byte>() },
                     Ptt = new PttExtBizInfo
@@ -112,7 +118,7 @@ protected override bool Build(ImageUploadEvent input, BotKeystore keystore, BotA
                 NoNeedCompatMsg = false
             }
         }, 0x11c5, 100, false, true);
-        
+
         output = packet.Serialize();
         extraPackets = null;
         return true;
@@ -124,7 +130,7 @@ protected override bool Parse(Span<byte> input, BotKeystore keystore, BotAppInfo
         var packet = Serializer.Deserialize<OidbSvcTrpcTcpBase<NTV2RichMediaResp>>(input);
         var upload = packet.Body.Upload;
         var compat = Serializer.Deserialize<NotOnlineImage>(upload.CompatQMsg.AsSpan());
-        
+
         output = ImageUploadEvent.Result((int)packet.ErrorCode, upload.MsgInfo, upload.UKey, upload.IPv4s, upload.SubFileInfos, compat);
         extraEvents = null;
         return true;