Merge remote-tracking branch 'upstream/master'

sisi0318 · Jan 9, 2025 · 804a812 · 804a812
2 parents 55aa4c6 + 8e3ffc4
commit 804a812
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs b/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs
@@ -399,8 +399,8 @@ private async Task ResolveIncomingChain(MessageChain chain)
                 case ImageEntity image when !image.ImageUrl.Contains("&rkey=") && image.MsgInfo is not null:
                 {
                     var @event = image.IsGroup
-                        ? ImageGroupDownloadEvent.Create(image.GroupUin ?? 0, image.MsgInfo)
-                        : ImageDownloadEvent.Create(image.FriendUid ?? string.Empty, image.MsgInfo);
+                        ? ImageGroupDownloadEvent.Create(chain.GroupUin ?? 0, image.MsgInfo)
+                        : ImageDownloadEvent.Create(chain.Uid ?? string.Empty, image.MsgInfo);
 
                     var results = await Collection.Business.SendEvent(@event);
                     if (results.Count != 0)

diff --git a/Lagrange.Core/Internal/Packets/Service/Oidb/Common/NTV2RichMediaReq.cs b/Lagrange.Core/Internal/Packets/Service/Oidb/Common/NTV2RichMediaReq.cs
@@ -295,9 +295,9 @@ internal class PicExtBizInfo
 
     [ProtoMember(2)] public string TextSummary { get; set; }
 
-    [ProtoMember(11)] public byte[] BytesPbReserveC2c { get; set; }
+    [ProtoMember(11)] public byte[]? BytesPbReserveC2c { get; set; }
 
-    [ProtoMember(12)] public byte[] BytesPbReserveTroop { get; set; }
+    [ProtoMember(12)] public byte[]? BytesPbReserveTroop { get; set; }
 
     [ProtoMember(1001)] public uint FromScene { get; set; }
 

diff --git a/Lagrange.Core/Message/Entity/ImageEntity.cs b/Lagrange.Core/Message/Entity/ImageEntity.cs
@@ -27,11 +27,7 @@ public class ImageEntity : IMessageEntity
     public string ImageUrl { get; set; } = string.Empty;
 
     internal Lazy<Stream>? ImageStream { get; set; }
-
-    internal string? Path { get; set; }
-
-    internal uint FileId { get; set; }
-
+
     internal MsgInfo? MsgInfo { get; set; }
 
     internal NotOnlineImage? CompatImage { get; set; }
@@ -45,11 +41,7 @@ public class ImageEntity : IMessageEntity
 
     public int SubType { get; set; }
 
-    internal bool IsGroup => GroupUin.HasValue;
-
-    internal uint? GroupUin { get; set; }
-
-    internal string? FriendUid { get; set; }
+    internal bool IsGroup { get; set; }
 
     public ImageEntity() { }
 
@@ -113,10 +105,12 @@ IEnumerable<Elem> IMessageEntity.PackElement()
                 ImageSize = index.Info.FileSize,
                 MsgInfo = extra,
                 SubType = (int)extra.ExtBizInfo.Pic.BizType,
-                GroupUin = msgInfoBody.HashSum.TroopSource?.GroupUin,
-                FriendUid = msgInfoBody.HashSum.BytesPbReserveC2c?.FriendUid,
+                // GroupUin = msgInfoBody.HashSum.TroopSource?.GroupUin,
+                // FriendUid = msgInfoBody.HashSum.BytesPbReserveC2c?.FriendUid,
                 H = index.Info.Height,
-                W = index.Info.Width
+                W = index.Info.Width,
+                IsGroup = extra.ExtBizInfo.Pic.BytesPbReserveTroop != null,
+                Summary = string.IsNullOrEmpty(extra.ExtBizInfo.Pic.TextSummary) ? "[图片]" : extra.ExtBizInfo.Pic.TextSummary,
             };
         }
 
@@ -134,7 +128,8 @@ IEnumerable<Elem> IMessageEntity.PackElement()
                     Summary = image.PbRes.Summary,
                     SubType = image.PbRes.SubType,
                     H = image.PicHeight,
-                    W = image.PicWidth
+                    W = image.PicWidth,
+                    IsGroup = false
                 };
             }
 
@@ -148,7 +143,8 @@ IEnumerable<Elem> IMessageEntity.PackElement()
                 Summary = image.PbRes.Summary,
                 SubType = image.PbRes.SubType,
                 H = image.PicHeight,
-                W = image.PicWidth
+                W = image.PicWidth,
+                IsGroup = false
             };
         }
 
@@ -166,7 +162,8 @@ IEnumerable<Elem> IMessageEntity.PackElement()
                     Summary = face.PbReserve?.Summary,
                     SubType = face.PbReserve?.SubType ?? GetImageTypeFromFaceOldData(face),
                     H = (uint)face.Height,
-                    W = (uint)face.Width
+                    W = (uint)face.Width,
+                    IsGroup = true
                 };
             }
 
@@ -180,7 +177,8 @@ IEnumerable<Elem> IMessageEntity.PackElement()
                 Summary = face.PbReserve?.Summary,
                 SubType = face.PbReserve?.SubType ?? GetImageTypeFromFaceOldData(face),
                 H = (uint)face.Height,
-                W = (uint)face.Width
+                W = (uint)face.Width,
+                IsGroup = true
             };
         }