From 35b5223fa3b552442c6323d3c09a286887325ccd Mon Sep 17 00:00:00 2001 From: DarkRRb <177549718+DarkRRb@users.noreply.github.com> Date: Wed, 21 May 2025 18:56:19 +0800 Subject: [PATCH 1/3] [Core] fix private chat Forward with additional information --- Lagrange.Core/Message/Entity/ForwardEntity.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lagrange.Core/Message/Entity/ForwardEntity.cs b/Lagrange.Core/Message/Entity/ForwardEntity.cs index 9db443713..ff3f8f2e6 100644 --- a/Lagrange.Core/Message/Entity/ForwardEntity.cs +++ b/Lagrange.Core/Message/Entity/ForwardEntity.cs @@ -63,7 +63,7 @@ IEnumerable PackElement(bool additional) }, }; - if (additional && ClientSequence != 0) + if (additional && ClientSequence == 0) { result.Add(new Elem { From 397e4b9216a17e0f8711c85be279cffb30281f5b Mon Sep 17 00:00:00 2001 From: DarkRRb <177549718+DarkRRb@users.noreply.github.com> Date: Wed, 21 May 2025 19:20:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=EF=BC=88=EF=BC=9B=C2=B4=D0=B4=EF=BD=80?= =?UTF-8?q?=EF=BC=89=E3=82=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lagrange.Core/Message/Entity/ForwardEntity.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Lagrange.Core/Message/Entity/ForwardEntity.cs b/Lagrange.Core/Message/Entity/ForwardEntity.cs index ff3f8f2e6..4b33d2f38 100644 --- a/Lagrange.Core/Message/Entity/ForwardEntity.cs +++ b/Lagrange.Core/Message/Entity/ForwardEntity.cs @@ -38,13 +38,12 @@ public ForwardEntity(MessageChain chain) Chain = chain; } - IEnumerable IMessageEntity.PackElement() => PackElement(true); + IEnumerable IMessageEntity.PackElement() => PackElement(false); - IEnumerable IMessageEntity.PackFakeElement() => PackElement(false); + IEnumerable IMessageEntity.PackFakeElement() => PackElement(true); - IEnumerable PackElement(bool additional) + IEnumerable PackElement(bool fake) { - byte[] bytes = ProtoExt.SerializeToBytes(MessagePacker.BuildFake(Chain, _selfUid)); var result = new List { new() { SrcMsg = new SrcMsg { @@ -57,13 +56,13 @@ IEnumerable PackElement(bool additional) MessageId = MessageId, SenderUid = Uid, }), - SourceMsg = !additional ? bytes : null, + SourceMsg = fake ? ProtoExt.SerializeToBytes(MessagePacker.BuildFake(Chain, _selfUid)) : null, ToUin = 0 } }, }; - if (additional && ClientSequence == 0) + if (!fake && ClientSequence == 0) { result.Add(new Elem { From bb412fb61eed7cc8cd047ef3ec1ffa2e222fe2c2 Mon Sep 17 00:00:00 2001 From: DarkRRb <177549718+DarkRRb@users.noreply.github.com> Date: Wed, 21 May 2025 19:43:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?(=E3=81=A3=20=C2=B0=D0=94=20=C2=B0;)?= =?UTF-8?q?=E3=81=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lagrange.Core/Message/Entity/ForwardEntity.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lagrange.Core/Message/Entity/ForwardEntity.cs b/Lagrange.Core/Message/Entity/ForwardEntity.cs index 4b33d2f38..d75eb077c 100644 --- a/Lagrange.Core/Message/Entity/ForwardEntity.cs +++ b/Lagrange.Core/Message/Entity/ForwardEntity.cs @@ -71,8 +71,8 @@ IEnumerable PackElement(bool fake) Str = "not null", PbReserve = ProtoExt.SerializeToBytes(new MentionExtra { - Type = 1, - Uin = TargetUin, + Type = 2, + Uid = Chain.Uid!, }) } });