[OneBot] add url key to Segment Properties

LagrangeDev · Feb 2, 2024 · ea709e9 · ea709e9
1 parent e03ad8c
commit ea709e9
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 33 deletions.
diff --git a/Lagrange.OneBot/Core/Message/CQPropertyAttribute.cs b/Lagrange.OneBot/Core/Message/CQPropertyAttribute.cs
@@ -0,0 +1,4 @@
+namespace Lagrange.OneBot.Core.Message;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class CQPropertyAttribute : Attribute;
diff --git a/Lagrange.OneBot/Core/Message/Entity/AtSegment.cs b/Lagrange.OneBot/Core/Message/Entity/AtSegment.cs
@@ -9,7 +9,7 @@ public partial class AtSegment(uint at)
 {
     public AtSegment() : this(0) { }
 
-    [JsonPropertyName("qq")] public string At { get; set; } = at.ToString();
+    [JsonPropertyName("qq")] [CQProperty] public string At { get; set; } = at.ToString();
 }
 
 [SegmentSubscriber(typeof(MentionEntity), "at")]

diff --git a/Lagrange.OneBot/Core/Message/Entity/FaceSegment.cs b/Lagrange.OneBot/Core/Message/Entity/FaceSegment.cs
@@ -9,7 +9,7 @@ public partial class FaceSegment(int id)
 {
     public FaceSegment() : this(0) { }
 
-    [JsonPropertyName("id")] public string Id { get; set; } = id.ToString();
+    [JsonPropertyName("id")] [CQProperty] public string Id { get; set; } = id.ToString();
 }
 
 [SegmentSubscriber(typeof(FaceEntity), "face")]

diff --git a/Lagrange.OneBot/Core/Message/Entity/ForwardSegment.cs b/Lagrange.OneBot/Core/Message/Entity/ForwardSegment.cs
@@ -9,7 +9,7 @@ public partial class ForwardSegment(string name)
 {
     public ForwardSegment() : this("") { }
 
-    [JsonPropertyName("id")] public string Name { get; set; } = name;
+    [JsonPropertyName("id")] [CQProperty] public string Name { get; set; } = name;
 }
 
 [SegmentSubscriber(typeof(MultiMsgEntity), "forward", "node")]

diff --git a/Lagrange.OneBot/Core/Message/Entity/ImageSegment.cs b/Lagrange.OneBot/Core/Message/Entity/ImageSegment.cs
@@ -9,17 +9,19 @@ public partial class ImageSegment(string url)
 {
     public ImageSegment() : this("") { }
 
-    [JsonPropertyName("file")] public string Url { get; set; } = url;
+    [JsonPropertyName("file")]  [CQProperty] public string File { get; set; } = url;
+
+    [JsonPropertyName("url")] public string Url { get; set; }  = url;
 }
 
 [SegmentSubscriber(typeof(ImageEntity), "image")]
 public partial class ImageSegment : ISegment
 {
-    public IMessageEntity ToEntity() => new ImageEntity(Url);
+    public IMessageEntity ToEntity() => new ImageEntity(File);
 
     public void Build(MessageBuilder builder, ISegment segment)
     {
-        if (segment is ImageSegment imageSegment and not { Url: "" } && CommonResolver.Resolve(imageSegment.Url) is { } image)
+        if (segment is ImageSegment imageSegment and not { File: "" } && CommonResolver.Resolve(imageSegment.File) is { } image)
         {
             builder.Image(image);
         }

diff --git a/Lagrange.OneBot/Core/Message/Entity/RecordSegment.cs b/Lagrange.OneBot/Core/Message/Entity/RecordSegment.cs
@@ -9,17 +9,19 @@ public partial class RecordSegment(string url)
 {
     public RecordSegment() : this("") { }
 
-    [JsonPropertyName("file")] public string Url { get; set; } = url;
+    [JsonPropertyName("file")] [CQProperty] public string File { get; set; } = url;
+
+    [JsonPropertyName("url")] public string Url { get; set; }  = url;
 }
 
 [SegmentSubscriber(typeof(RecordEntity), "record")]
 public partial class RecordSegment : ISegment
 {
-    public IMessageEntity ToEntity() => new RecordEntity(Url);
+    public IMessageEntity ToEntity() => new RecordEntity(File);
 
     public void Build(MessageBuilder builder, ISegment segment)
     {
-        if (segment is RecordSegment recordSegment and not { Url: "" } && CommonResolver.Resolve(recordSegment.Url) is { } image)
+        if (segment is RecordSegment recordSegment and not { File: "" } && CommonResolver.Resolve(recordSegment.File) is { } image)
         {
             builder.Record(image);
         }

diff --git a/Lagrange.OneBot/Core/Message/Entity/TextSegment.cs b/Lagrange.OneBot/Core/Message/Entity/TextSegment.cs
@@ -9,7 +9,7 @@ public partial class TextSegment(string text)
 {
     public TextSegment() : this("") { }
 
-    [JsonPropertyName("text")] public string Text { get; set; } = text;
+    [JsonPropertyName("text")] [CQProperty] public string Text { get; set; } = text;
 }
 
 [SegmentSubscriber(typeof(TextEntity), "text")]

diff --git a/Lagrange.OneBot/Core/Message/Entity/VideoSegment.cs b/Lagrange.OneBot/Core/Message/Entity/VideoSegment.cs
@@ -9,17 +9,19 @@ public partial class VideoSegment(string url)
 {
     public VideoSegment() : this("") { }
 
-    [JsonPropertyName("file")] public string Url { get; set; } = url;
+    [JsonPropertyName("file")] [CQProperty] public string File { get; set; } = url;
+
+    [JsonPropertyName("url")] public string Url { get; set; }  = url;
 }
 
 [SegmentSubscriber(typeof(VideoEntity), "video")]
 public partial class VideoSegment : ISegment
 {
-    public IMessageEntity ToEntity() => new VideoEntity(Url);
+    public IMessageEntity ToEntity() => new VideoEntity(File);
 
     public void Build(MessageBuilder builder, ISegment segment)
     {
-        if (segment is VideoSegment videoSegment and not { Url: "" } && CommonResolver.Resolve(videoSegment.Url) is { } image)
+        if (segment is VideoSegment videoSegment and not { File: "" } && CommonResolver.Resolve(videoSegment.File) is { } image)
         {
             // TODO: Add Video
         }

diff --git a/Lagrange.OneBot/Core/Message/MessageService.cs b/Lagrange.OneBot/Core/Message/MessageService.cs
@@ -1,8 +1,9 @@
 using System.Reflection;
 using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 using Lagrange.Core;
-using Lagrange.Core.Common.Interface.Api;
 using Lagrange.Core.Event.EventArg;
 using Lagrange.Core.Message;
 using Lagrange.Core.Utility.Extension;
@@ -12,7 +13,6 @@
 using Lagrange.OneBot.Database;
 using LiteDB;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Options;
 
 namespace Lagrange.OneBot.Core.Message;
 
@@ -26,10 +26,12 @@ public sealed class MessageService
     private readonly IConfiguration _config;
 
     private static readonly Dictionary<Type, (string, ISegment)> EntityToSegment;
+    private static readonly IJsonTypeInfoResolver Resolver;
 
     static MessageService()
     {
         EntityToSegment = new Dictionary<Type, (string, ISegment)>();
+        Resolver = new DefaultJsonTypeInfoResolver { Modifiers = { ModifyTypeInfo } };
         foreach (var type in Assembly.GetExecutingAssembly().GetTypes())
         {
             var attribute = type.GetCustomAttribute<SegmentSubscriberAttribute>();
@@ -109,41 +111,48 @@ public static List<OneBotSegment> Convert(IEnumerable<IMessageEntity> entities)
         return result;
     }
 
-    private static string EscapeText(string str)
-    {
-        return str.Replace("&", "&amp;")
-                  .Replace("[", "&#91;")
-                  .Replace("]", "&#93;");
-    }
+    private static string EscapeText(string str) => str
+        .Replace("&", "&amp;")
+        .Replace("[", "&#91;")
+        .Replace("]", "&#93;");
 
-    private static string EscapeCQ(string str)
-    {
-        return EscapeText(str).Replace(",", "&#44;");
-    }
+    private static string EscapeCQ(string str) => EscapeText(str).Replace(",", "&#44;");
 
-    public static string ToRawMessage(List<OneBotSegment> segments)
+    private static string ToRawMessage(List<OneBotSegment> segments)
     {
         var rawMessageBuilder = new StringBuilder();
         foreach (var segment in segments)
         {
-            if (segment.Type == "text")
+            if (segment.Data is TextSegment textSeg)
             {
-                rawMessageBuilder.Append(EscapeText(((TextSegment)segment.Data).Text));
+                rawMessageBuilder.Append(EscapeText(textSeg.Text));
             }
             else
             {
                 rawMessageBuilder.Append("[CQ:");
                 rawMessageBuilder.Append(segment.Type);
-                foreach (var property in JsonSerializer.SerializeToElement(segment.Data).EnumerateObject())
+                foreach (var property in JsonSerializer.SerializeToElement(segment.Data, new JsonSerializerOptions { TypeInfoResolver = Resolver  }).EnumerateObject())
                 {
-                    rawMessageBuilder.Append(',');
-                    rawMessageBuilder.Append(property.Name);
-                    rawMessageBuilder.Append('=');
-                    rawMessageBuilder.Append(EscapeCQ(property.Value.GetString()!));
+                    if (property.Value.GetString() is { } content)
+                    {
+                        rawMessageBuilder.Append(',');
+                        rawMessageBuilder.Append(property.Name);
+                        rawMessageBuilder.Append('=');
+                        rawMessageBuilder.Append(EscapeCQ(content));
+                    }
                 }
                 rawMessageBuilder.Append(']');
             }
         }
         return rawMessageBuilder.ToString();
     }
+
+    private static void ModifyTypeInfo(JsonTypeInfo ti)
+    {
+        if (ti.Kind != JsonTypeInfoKind.Object) return;
+        foreach (var info in ti.Properties.Where(x => x.AttributeProvider?.IsDefined(typeof(CQPropertyAttribute), false) == false).ToArray())
+        {
+            ti.Properties.Remove(info);
+        }
+    }
 }