Skip to content
This repository was archived by the owner on Oct 12, 2025. It is now read-only.
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions Lagrange.Core/Message/Entity/ForwardEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,29 +85,40 @@ IEnumerable<Elem> PackElement(bool fake)
{
if (elem.SrcMsg is not { } src) return null;

var reserve = Serializer.Deserialize<SrcMsg.Preserve>(src.PbReserve.AsSpan());
return new ForwardEntity(MessagePacker.Parse(new PushMsgBody
if (src.SourceMsg != null)
{
ResponseHead = new ResponseHead
{
FromUin = (uint)src.SenderUin,
FromUid = reserve.SenderUid,
Grp = reserve.ReceiverUid != null ? null : new ResponseGrp { }
},
ContentHead = new ContentHead
{
Random = (long?)(reserve.MessageId & 0xFFFFFFFF),
Sequence = src.OrigSeqs?.Count > 0 ? src.OrigSeqs[0] : 0,
Timestamp = src.Time,
},
Body = new MessageBody
var chain = MessagePacker.Parse(Serializer.Deserialize<PushMsgBody>(src.SourceMsg.AsSpan()), true);
return new ForwardEntity(chain);
}

if (src.PbReserve != null)
{
var reserve = Serializer.Deserialize<SrcMsg.Preserve>(src.PbReserve.AsSpan());
return new ForwardEntity(MessagePacker.Parse(new PushMsgBody
{
RichText = new RichText
ResponseHead = new ResponseHead
{
FromUin = (uint)src.SenderUin,
FromUid = reserve.SenderUid,
Grp = reserve.ReceiverUid != null ? null : new ResponseGrp { }
},
ContentHead = new ContentHead
{
Random = (long?)(reserve.MessageId & 0xFFFFFFFF),
Sequence = src.OrigSeqs?[0] ?? 0,
Timestamp = src.Time,
},
Body = new MessageBody
{
Elems = src.Elems ?? new List<Elem>(),
RichText = new RichText
{
Elems = src.Elems ?? new List<Elem>(),
}
}
}
}, true));
}, true));
}

return new ForwardEntity(new MessageChain(0, 0, src.OrigSeqs?[0] ?? 0, 0));
}

void IMessageEntity.SetSelfUid(string selfUid) => _selfUid = selfUid;
Expand Down