fix message_id type uint to int

LagrangeDev · Jan 16, 2024 · 3e1f2eb · 3e1f2eb
1 parent 592761d
commit 3e1f2eb
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/Lagrange.OneBot/Core/Entity/Action/OneBotGetMessage.cs b/Lagrange.OneBot/Core/Entity/Action/OneBotGetMessage.cs
@@ -5,5 +5,5 @@ namespace Lagrange.OneBot.Core.Entity.Action;
 [Serializable]
 public class OneBotGetMessage
 {
-    [JsonPropertyName("message_id")] public uint MessageId { get; set; }
+    [JsonPropertyName("message_id")] public int MessageId { get; set; }
 }
diff --git a/Lagrange.OneBot/Core/Entity/Action/Response/OneBotGetMessageResponse.cs b/Lagrange.OneBot/Core/Entity/Action/Response/OneBotGetMessageResponse.cs
@@ -4,15 +4,15 @@
 namespace Lagrange.OneBot.Core.Entity.Action.Response;
 
 [Serializable]
-public class OneBotGetMessageResponse(DateTime time, string messageType, uint messageId, List<OneBotSegment> message)
+public class OneBotGetMessageResponse(DateTime time, string messageType, int messageId, List<OneBotSegment> message)
 {
     [JsonPropertyName("time")] public int Time { get; set; } = (int)(time - DateTime.UnixEpoch).TotalSeconds;
 
     [JsonPropertyName("message_type")] public string MessageType { get; set; } = messageType;
 
-    [JsonPropertyName("message_id")] public uint MessageId { get; set; } = messageId;
+    [JsonPropertyName("message_id")] public int MessageId { get; set; } = messageId;
 
-    [JsonPropertyName("real_id")] public uint RealId { get; set; } = messageId;
+    [JsonPropertyName("real_id")] public int RealId { get; set; } = messageId;
 
     [JsonPropertyName("sender")] public OneBotSender Sender { get; set; } = new();
 

diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs
@@ -5,13 +5,13 @@
 namespace Lagrange.OneBot.Core.Entity.Message;
 
 [Serializable]
-public class OneBotGroupMsg(uint selfId, uint groupUin, List<OneBotSegment> message, BotGroupMember member, uint messageId) : OneBotEntityBase(selfId, "message")
+public class OneBotGroupMsg(uint selfId, uint groupUin, List<OneBotSegment> message, BotGroupMember member, int messageId) : OneBotEntityBase(selfId, "message")
 {
     [JsonPropertyName("message_type")] public string MessageType { get; set; } = "group";
 
     [JsonPropertyName("sub_type")] public string SubType { get; set; } = "normal";
 
-    [JsonPropertyName("message_id")] public uint MessageId { get; set; } = messageId;
+    [JsonPropertyName("message_id")] public int MessageId { get; set; } = messageId;
 
     [JsonPropertyName("group_id")] public uint GroupId { get; set; } = groupUin;
 

diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs
@@ -10,7 +10,7 @@ public class OneBotPrivateMsg(uint selfId) : OneBotEntityBase(selfId, "message")
 
     [JsonPropertyName("sub_type")] public string SubType { get; } = "friend";
 
-    [JsonPropertyName("message_id")] public uint MessageId { get; set; }
+    [JsonPropertyName("message_id")] public int MessageId { get; set; }
 
     [JsonPropertyName("user_id")] public uint UserId { get; set; }
 

diff --git a/Lagrange.OneBot/Database/MessageRecord.cs b/Lagrange.OneBot/Database/MessageRecord.cs
@@ -22,7 +22,7 @@ public class MessageRecord
 
     public List<IMessageEntity> Entities { get; set; } = [];
 
-    public uint MessageHash { get; set; }
+    public int MessageHash { get; set; }
 
     public static explicit operator MessageChain(MessageRecord record)
     {
@@ -51,12 +51,12 @@ public static explicit operator MessageChain(MessageRecord record)
         MessageHash = CalcMessageHash(chain.MessageId, chain.Sequence)
     };
 
-    private static uint CalcMessageHash(ulong msgId, uint seq)
+    private static int CalcMessageHash(ulong msgId, uint seq)
     {
         var messageId = BitConverter.GetBytes(msgId);
         var sequence = BitConverter.GetBytes(seq);
 
         byte[] id = [messageId[0], messageId[1], sequence[0], sequence[1]];
-        return BitConverter.ToUInt32(id.AsSpan());
+        return BitConverter.ToInt32(id.AsSpan());
     }
 }
diff --git a/Lagrange.OneBot/Properties/PublishProfiles/FolderProfile.pubxml b/Lagrange.OneBot/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net7.0\publish\win-x64\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+  </PropertyGroup>
+</Project>