[OneBot] Add StringPost Option

sisi0318 · Mar 9, 2024 · 13c8e2c · 13c8e2c
1 parent 17682b9
commit 13c8e2c
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 22 deletions.
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotFriendMsgHistoryResponse.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotFriendMsgHistoryResponse.cs
@@ -3,7 +3,7 @@
 namespace Lagrange.OneBot.Core.Entity.Message;
 
 [Serializable]
-public class OneBotFriendMsgHistoryResponse(List<OneBotPrivateMsg> messages)
+public class OneBotFriendMsgHistoryResponse(List<object> messages)
 {
-    [JsonPropertyName("messages")] public List<OneBotPrivateMsg> Messages { get; set; } = messages;
+    [JsonPropertyName("messages")] public List<object> Messages { get; set; } = messages;
 }
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs
@@ -26,3 +26,25 @@ public class OneBotGroupMsg(uint selfId, uint groupUin, List<OneBotSegment> mess
 
     [JsonPropertyName("sender")] public OneBotGroupSender GroupSender { get; set; } = new(member.Uin, member.MemberName, member.MemberCard ?? string.Empty, (int)member.GroupLevel, member.Permission);
 }
+
+[Serializable]
+public class OneBotGroupStringMsg(uint selfId, uint groupUin, string 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 int MessageId { get; set; } = messageId;
+
+    [JsonPropertyName("group_id")] public uint GroupId { get; set; } = groupUin;
+
+    [JsonPropertyName("user_id")] public uint UserId { get; set; } = member.Uin;
+
+    [JsonPropertyName("anonymous")] public object? Anonymous { get; set; } = null;
+
+    [JsonPropertyName("message")] public string Message { get; set; } = message;
+
+    [JsonPropertyName("font")] public int Font { get; set; } = 0;
+
+    [JsonPropertyName("sender")] public OneBotGroupSender GroupSender { get; set; } = new(member.Uin, member.MemberName, member.MemberCard ?? string.Empty, (int)member.GroupLevel, member.Permission);
+}
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsgHistoryResponse.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsgHistoryResponse.cs
@@ -3,7 +3,7 @@
 namespace Lagrange.OneBot.Core.Entity.Message;
 
 [Serializable]
-public class OneBotGroupMsgHistoryResponse(List<OneBotGroupMsg> messages)
+public class OneBotGroupMsgHistoryResponse(List<object> messages)
 {
-    [JsonPropertyName("messages")] public List<OneBotGroupMsg> Messages { get; set; } = messages;
+    [JsonPropertyName("messages")] public List<object> Messages { get; set; } = messages;
 }
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs
@@ -19,5 +19,23 @@ public class OneBotPrivateMsg(uint selfId, OneBotSender groupSender, string subT
 
     [JsonPropertyName("font")] public int Font { get; set; } = 0;
 
+    [JsonPropertyName("sender")] public OneBotSender GroupSender { get; set; } = groupSender;
+}
+
+[Serializable]
+public class OneBotPrivateStringMsg(uint selfId, OneBotSender groupSender, string subType) : OneBotEntityBase(selfId, "message")
+{
+    [JsonPropertyName("message_type")] public string MessageType { get; set; } = "private";
+
+    [JsonPropertyName("sub_type")] public string SubType { get; set; } = subType;
+
+    [JsonPropertyName("message_id")] public int MessageId { get; set; }
+
+    [JsonPropertyName("user_id")] public uint UserId { get; set; }
+
+    [JsonPropertyName("message")] public string Message { get; set; } = string.Empty;
+
+    [JsonPropertyName("font")] public int Font { get; set; } = 0;
+
     [JsonPropertyName("sender")] public OneBotSender GroupSender { get; set; } = groupSender;
 }
diff --git a/Lagrange.OneBot/Message/MessageService.cs b/Lagrange.OneBot/Message/MessageService.cs
@@ -25,6 +25,7 @@ public sealed class MessageService
     private readonly LiteDatabase _context;
     private readonly IConfiguration _config;
     private readonly Dictionary<Type, List<(string Type, SegmentBase Factory)>> _entityToFactory;
+    private readonly bool _stringPost;
 
     private static readonly JsonSerializerOptions Options;
 
@@ -38,6 +39,7 @@ public MessageService(BotContext bot, LagrangeWebSvcCollection service, LiteData
         _service = service;
         _context = context;
         _config = config;
+        _stringPost = config.GetValue<bool>("Message:StringPost");
 
         var invoker = bot.Invoker;
 
@@ -70,16 +72,21 @@ private void OnFriendMessageReceived(BotContext bot, FriendMessageEvent e)
         _ = _service.SendJsonAsync(request);
     }
 
-    public OneBotPrivateMsg ConvertToPrivateMsg(uint uin, MessageChain chain, int hash)
+    public object ConvertToPrivateMsg(uint uin, MessageChain chain, int hash)
     {
         var segments = Convert(chain);
-        var request = new OneBotPrivateMsg(uin, new OneBotSender(chain.FriendUin, chain.FriendInfo?.Nickname ?? string.Empty), "friend")
-        {
-            MessageId = hash,
-            UserId = chain.FriendUin,
-            Message = segments,
-            RawMessage = ToRawMessage(segments)
-        };
+        object request = _stringPost ? new OneBotPrivateStringMsg(uin, new OneBotSender(chain.FriendUin, chain.FriendInfo?.Nickname ?? string.Empty), "friend")
+            {
+                MessageId = hash,
+                UserId = chain.FriendUin,
+                Message = ToRawMessage(segments)
+            } : new OneBotPrivateMsg(uin, new OneBotSender(chain.FriendUin, chain.FriendInfo?.Nickname ?? string.Empty), "friend")
+            {
+                MessageId = hash,
+                UserId = chain.FriendUin,
+                Message = segments,
+                RawMessage = ToRawMessage(segments)
+            };
         return request;
     }
 
@@ -95,11 +102,12 @@ private void OnGroupMessageReceived(BotContext bot, GroupMessageEvent e)
         _ = _service.SendJsonAsync(request);
     }
 
-    public OneBotGroupMsg ConvertToGroupMsg(uint uin, MessageChain chain, int hash)
+    public object ConvertToGroupMsg(uint uin, MessageChain chain, int hash)
     {
         var segments = Convert(chain);
-        var request = new OneBotGroupMsg(uin, chain.GroupUin ?? 0, segments, ToRawMessage(segments),
-            chain.GroupMemberInfo ?? throw new Exception("Group member not found"), hash);
+        object request = _stringPost 
+            ? new OneBotGroupStringMsg(uin, chain.GroupUin ?? 0, ToRawMessage(segments), chain.GroupMemberInfo ?? throw new Exception("Group member not found"), hash)
+            : new OneBotGroupMsg(uin, chain.GroupUin ?? 0, segments, ToRawMessage(segments), chain.GroupMemberInfo ?? throw new Exception("Group member not found"), hash);
         return request;
     }
 

diff --git a/Lagrange.OneBot/Resources/appsettings.json b/Lagrange.OneBot/Resources/appsettings.json
@@ -15,7 +15,11 @@
         "GetOptimumServer": true
     },
     "Message": {
-      "IgnoreSelf": true
+      "IgnoreSelf": true, 
+      "StringPost": false
+    },
+    "QrCode": {
+        "ConsoleCompatibilityMode": false
     },
     "Implementations": [
         {
@@ -27,8 +31,5 @@
             "HeartBeatInterval": 5000,
             "AccessToken": ""
         }
-    ],
-    "QrCode": {
-        "ConsoleCompatibilityMode": false
-    }
+    ]
 }
diff --git a/README.md b/README.md
@@ -282,7 +282,11 @@ Please use Lagrange.Core responsibly and in accordance with the law.
     "GetOptimumServer": true
   },
   "Message": {
-    "IgnoreSelf": true
+    "IgnoreSelf": true,
+    "StringPost": false
+  },
+  "QrCode": {
+    "ConsoleCompatibilityMode": false
   },
   "Implementations": [
     {

diff --git a/README_zh.md b/README_zh.md
@@ -287,7 +287,11 @@ Lagrange.Core 的开发者和贡献者对用户违反法律或从事任何形式
     "GetOptimumServer": true
   },
   "Message": {
-    "IgnoreSelf": true
+    "IgnoreSelf": true,
+    "StringPost": false
+  },
+  "QrCode": {
+    "ConsoleCompatibilityMode": false
   },
   "Implementations": [
     {