[OneBot] Fixed the problem that the friend message type is incorrect (#…

…765)
LagrangeDev · Feb 7, 2025 · 6dad4a4 · 6dad4a4
1 parent bc37832
commit 6dad4a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Lagrange.OneBot/Core/Notify/NotifyService.cs b/Lagrange.OneBot/Core/Notify/NotifyService.cs
@@ -165,12 +165,16 @@ await service.SendJsonAsync(new OneBotGroupRecall(bot.BotUin)
             logger.LogInformation(@event.ToString());
 
             var sequence = realm.Do(realm => realm.All<MessageRecord>()
-                .First(record => record.TypeInt == (int)MessageType.Friend
+                .FirstOrDefault(record => record.TypeInt == (int)MessageType.Friend
                     && record.FromUinLong == @event.FriendUin
                     && record.ClientSequenceLong == @event.ClientSequence
                     && record.MessageIdLong == (0x01000000L << 32 | @event.Random)
-                )
+                )?
                 .Sequence);
+            if (sequence == null) {
+                logger.LogWarning("Unable to find the {} message sent by {}", @event.ClientSequence, @event.FriendUin);
+                return;
+            }
 
             await service.SendJsonAsync(new OneBotFriendRecall(bot.BotUin)
             {

diff --git a/Lagrange.OneBot/Database/MessageRecord.cs b/Lagrange.OneBot/Database/MessageRecord.cs
@@ -72,6 +72,7 @@ public static int CalcMessageHash(ulong msgId, uint seq)
     public static implicit operator MessageRecord(MessageChain chain) => new()
     {
         Id = CalcMessageHash(chain.MessageId, chain.Sequence),
+        Type = chain.Type,
         Sequence = chain.Sequence,
         ClientSequence = chain.ClientSequence,
         MessageId = chain.MessageId,