From b540e05b97d021b50540a60df45f1b6598ca944d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E6=80=9D?= <71646091+sisi0318@users.noreply.github.com> Date: Tue, 5 Nov 2024 04:09:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=99929d=20=E7=9A=84chattype=20?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E9=BB=98=E8=AE=A4=E5=80=BC=20(#677)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 给929d 的chattype 加个默认值 * 在ob也加一个 --- .../Packets/Service/Oidb/Request/OidbSvcTrpcTcp0x929D_0.cs | 2 +- Lagrange.OneBot/Core/Entity/Action/OneBotGetAiCharacters.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lagrange.Core/Internal/Packets/Service/Oidb/Request/OidbSvcTrpcTcp0x929D_0.cs b/Lagrange.Core/Internal/Packets/Service/Oidb/Request/OidbSvcTrpcTcp0x929D_0.cs index 642b14269..3f0125758 100644 --- a/Lagrange.Core/Internal/Packets/Service/Oidb/Request/OidbSvcTrpcTcp0x929D_0.cs +++ b/Lagrange.Core/Internal/Packets/Service/Oidb/Request/OidbSvcTrpcTcp0x929D_0.cs @@ -8,5 +8,5 @@ internal class OidbSvcTrpcTcp0x929D_0 { [ProtoMember(1)] public uint Group { get; set; } - [ProtoMember(2)] public uint ChatType { get; set; } //1 voice,2 song + [ProtoMember(2)] public uint ChatType { get; set; } = 1; //1 voice,2 song } \ No newline at end of file diff --git a/Lagrange.OneBot/Core/Entity/Action/OneBotGetAiCharacters.cs b/Lagrange.OneBot/Core/Entity/Action/OneBotGetAiCharacters.cs index 8867187c3..4592fcd0a 100644 --- a/Lagrange.OneBot/Core/Entity/Action/OneBotGetAiCharacters.cs +++ b/Lagrange.OneBot/Core/Entity/Action/OneBotGetAiCharacters.cs @@ -7,5 +7,5 @@ public class OneBotGetAiCharacters { [JsonPropertyName("group_id")] public uint GroupId { get; set; } = 42; - [JsonPropertyName("chat_type")] public uint ChatType { get; set; } + [JsonPropertyName("chat_type")] public uint ChatType { get; set; } = 1; //1 voice,2 song } \ No newline at end of file From ae400c0168d0364f00d253420ed3e91c03934872 Mon Sep 17 00:00:00 2001 From: DarkRRb <177549718+DarkRRb@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:18:27 +0800 Subject: [PATCH 2/2] [Core] fix message id algorithm (#681) --- Lagrange.Core/Internal/Packets/Message/C2CRecallMsg.cs | 2 +- .../Internal/Service/Message/RecallFriendMessageService.cs | 2 +- Lagrange.Core/Message/MessageChain.cs | 4 ++-- Lagrange.OneBot/Core/Notify/NotifyService.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lagrange.Core/Internal/Packets/Message/C2CRecallMsg.cs b/Lagrange.Core/Internal/Packets/Message/C2CRecallMsg.cs index cb0dd3c22..a51c5cdd5 100644 --- a/Lagrange.Core/Internal/Packets/Message/C2CRecallMsg.cs +++ b/Lagrange.Core/Internal/Packets/Message/C2CRecallMsg.cs @@ -24,7 +24,7 @@ internal class C2CRecallMsgInfo [ProtoMember(2)] public uint Random { get; set; } - [ProtoMember(3)] public ulong MessageId { get; set; } // 0x1000000 << 32 | Random + [ProtoMember(3)] public ulong MessageId { get; set; } // 0x01000000 << 32 | Random [ProtoMember(4)] public uint Timestamp { get; set; } diff --git a/Lagrange.Core/Internal/Service/Message/RecallFriendMessageService.cs b/Lagrange.Core/Internal/Service/Message/RecallFriendMessageService.cs index a276b93e6..ba0566b18 100644 --- a/Lagrange.Core/Internal/Service/Message/RecallFriendMessageService.cs +++ b/Lagrange.Core/Internal/Service/Message/RecallFriendMessageService.cs @@ -21,7 +21,7 @@ protected override bool Build(RecallFriendMessageEvent input, BotKeystore keysto { ClientSequence = input.ClientSeq, Random = input.Random, - MessageId = 0x1000000UL << 32 | input.Random, + MessageId = 0x01000000UL << 32 | input.Random, Timestamp = input.Timestamp, Field5 = 0, MessageSequence = input.MessageSeq diff --git a/Lagrange.Core/Message/MessageChain.cs b/Lagrange.Core/Message/MessageChain.cs index eb199f1ea..404f379b9 100644 --- a/Lagrange.Core/Message/MessageChain.cs +++ b/Lagrange.Core/Message/MessageChain.cs @@ -48,7 +48,7 @@ internal MessageChain(uint friendUin, string selfUid, string friendUid, uint tar ClientSequence = clientSequence == 0 ? (uint)Random.Shared.Next(100000000, int.MaxValue) : clientSequence; SelfUid = selfUid; Uid = friendUid; - MessageId = messageId ?? (0x10000000ul << 32) | (uint)Random.Shared.Next(100000000, int.MaxValue); + MessageId = messageId ?? (0x01000000ul << 32) | (uint)Random.Shared.Next(100000000, int.MaxValue); Elements = new List(); Type = type; } @@ -58,7 +58,7 @@ internal MessageChain(uint groupUin) GroupUin = groupUin; Sequence = 0; // unuseful at there ClientSequence = 0; - MessageId = (0x10000000ul << 32) | (uint)Random.Shared.Next(100000000, int.MaxValue); + MessageId = (0x01000000ul << 32) | (uint)Random.Shared.Next(100000000, int.MaxValue); Uid = null; Elements = new List(); } diff --git a/Lagrange.OneBot/Core/Notify/NotifyService.cs b/Lagrange.OneBot/Core/Notify/NotifyService.cs index f76942bb0..85eef152f 100644 --- a/Lagrange.OneBot/Core/Notify/NotifyService.cs +++ b/Lagrange.OneBot/Core/Notify/NotifyService.cs @@ -151,7 +151,7 @@ await service.SendJsonAsync(new OneBotGroupRecall(bot.BotUin) var record = collection.FindOne(Query.And( Query.EQ("FriendUin", new BsonValue(@event.FriendUin)), Query.EQ("ClientSequence", new BsonValue(@event.ClientSequence)), - Query.EQ("MessageId", new BsonValue(0x1000000L << 32 | @event.Random)) + Query.EQ("MessageId", new BsonValue(0x01000000L << 32 | @event.Random)) )); await service.SendJsonAsync(new OneBotFriendRecall(bot.BotUin)