Simplify color conversion

gehongyan · Feb 24, 2023 · 52aec27 · 52aec27
1 parent bff75ed
commit 52aec27
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 77 deletions.
diff --git a/src/Kook.Net.Rest/API/Common/Cards/Card.cs b/src/Kook.Net.Rest/API/Common/Cards/Card.cs
@@ -10,7 +10,8 @@ internal class Card : CardBase
     public CardTheme Theme { get; set; }
 
     [JsonPropertyName("color")]
-    [JsonConverter(typeof(NullableColorConverter))]
+    [JsonConverter(typeof(HexColorConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public Color? Color { get; set; }
 
     [JsonPropertyName("size")]

diff --git a/src/Kook.Net.Rest/API/Common/Embeds/LinkEmbed.cs b/src/Kook.Net.Rest/API/Common/Embeds/LinkEmbed.cs
@@ -15,7 +15,7 @@ internal class LinkEmbed : EmbedBase
     public string SiteName { get; set; }
 
     [JsonPropertyName("theme_color")]
-    [JsonConverter(typeof(ColorConverter))]
+    [JsonConverter(typeof(HexColorConverter))]
     public Color Color { get; set; }
 
     [JsonPropertyName("image")]

diff --git a/src/Kook.Net.Rest/API/Common/MentionRole.cs b/src/Kook.Net.Rest/API/Common/MentionRole.cs
diff --git a/src/Kook.Net.Rest/API/Common/Pokes/PokeQualityResource.cs b/src/Kook.Net.Rest/API/Common/Pokes/PokeQualityResource.cs
@@ -6,7 +6,7 @@ namespace Kook.API;
 internal class PokeQualityResource
 {
     [JsonPropertyName("color")]
-    [JsonConverter(typeof(ColorConverter))]
+    [JsonConverter(typeof(HexColorConverter))]
     public Color Color { get; set; }
     [JsonPropertyName("small")]
     public string Small { get; set; }

diff --git a/src/Kook.Net.Rest/API/Common/Role.cs b/src/Kook.Net.Rest/API/Common/Role.cs
@@ -1,15 +1,32 @@
+using Kook.Net.Converters;
 using System.Text.Json.Serialization;
 
 namespace Kook.API;
 
 internal class Role
 {
-    [JsonPropertyName("role_id")] public uint Id { get; set; }
-    [JsonPropertyName("name")] public string Name { get; set; }
-    [JsonPropertyName("color")] public uint Color { get; set; }
-    [JsonPropertyName("position")] public int Position { get; set; }
-    [JsonPropertyName("hoist")] public int Hoist { get; set; }
-    [JsonPropertyName("mentionable")] public int Mentionable { get; set; }
-    [JsonPropertyName("permissions")] public ulong Permissions { get; set; }
-    [JsonPropertyName("type")] public RoleType? Type { get; set; }
+    [JsonPropertyName("role_id")]
+    public uint Id { get; set; }
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    [JsonPropertyName("color")]
+    [JsonConverter(typeof(RawValueColorConverter))]
+    public Color Color { get; set; }
+
+    [JsonPropertyName("position")]
+    public int Position { get; set; }
+
+    [JsonPropertyName("hoist")]
+    public int Hoist { get; set; }
+
+    [JsonPropertyName("mentionable")]
+    public int Mentionable { get; set; }
+
+    [JsonPropertyName("permissions")]
+    public ulong Permissions { get; set; }
+
+    [JsonPropertyName("type")]
+    public RoleType? Type { get; set; }
 }
diff --git a/src/Kook.Net.Rest/API/Common/Tag.cs b/src/Kook.Net.Rest/API/Common/Tag.cs
diff --git a/src/Kook.Net.Rest/API/Common/UserTag.cs b/src/Kook.Net.Rest/API/Common/UserTag.cs
@@ -6,7 +6,7 @@ namespace Kook.API;
 internal class UserTag
 {
     [JsonPropertyName("color")]
-    [JsonConverter(typeof(ColorConverter))]
+    [JsonConverter(typeof(HexColorConverter))]
     public Color Color { get; set; }
 
     [JsonPropertyName("text")]

diff --git a/src/Kook.Net.Rest/API/Rest/GuildMember.cs b/src/Kook.Net.Rest/API/Rest/GuildMember.cs
@@ -5,8 +5,11 @@ namespace Kook.API.Rest;
 
 internal class GuildMember : User
 {
-    [JsonPropertyName("nickname")] public string Nickname { get; set; }
-    [JsonPropertyName("mobile_verified")] public bool MobileVerified { get; set; }
+    [JsonPropertyName("nickname")]
+    public string Nickname { get; set; }
+
+    [JsonPropertyName("mobile_verified")]
+    public bool MobileVerified { get; set; }
 
     [JsonPropertyName("joined_at")]
     [JsonConverter(typeof(DateTimeOffsetUnixTimeMillisecondsConverter))]
@@ -16,9 +19,15 @@ internal class GuildMember : User
     [JsonConverter(typeof(DateTimeOffsetUnixTimeMillisecondsConverter))]
     public DateTimeOffset ActiveAt { get; set; }
 
-    [JsonPropertyName("hoist_info")] public HoistInfo HoistInfo { get; set; }
-    [JsonPropertyName("color")] public uint Color { get; set; }
-    [JsonPropertyName("roles")] public uint[] Roles { get; set; }
+    [JsonPropertyName("hoist_info")]
+    public HoistInfo HoistInfo { get; set; }
+
+    [JsonPropertyName("color")]
+    [JsonConverter(typeof(RawValueColorConverter))]
+    public Color Color { get; set; }
+
+    [JsonPropertyName("roles")]
+    public uint[] Roles { get; set; }
 
     [JsonPropertyName("is_master")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -34,7 +43,12 @@ internal class GuildMember : User
 
 internal class HoistInfo
 {
-    [JsonPropertyName("role_id")] public uint RoleId { get; set; }
-    [JsonPropertyName("name")] public string Name { get; set; }
-    [JsonPropertyName("color")] public uint Color { get; set; }
+    [JsonPropertyName("role_id")]
+    public uint RoleId { get; set; }
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    [JsonPropertyName("color")]
+    public uint Color { get; set; }
 }
diff --git a/src/Kook.Net.Rest/API/Rest/ModifyGuildRoleParams.cs b/src/Kook.Net.Rest/API/Rest/ModifyGuildRoleParams.cs
@@ -1,3 +1,4 @@
+using Kook.Net.Converters;
 using System.Text.Json.Serialization;
 
 namespace Kook.API.Rest;
@@ -15,8 +16,9 @@ internal class ModifyGuildRoleParams
     public string Name { get; set; }
 
     [JsonPropertyName("color")]
+    [JsonConverter(typeof(RawValueColorConverter))]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public uint? Color { get; set; }
+    public Color? Color { get; set; }
 
     [JsonPropertyName("hoist")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]

diff --git a/src/Kook.Net.Rest/Entities/Roles/RestRole.cs b/src/Kook.Net.Rest/Entities/Roles/RestRole.cs
@@ -64,7 +64,7 @@ internal void Update(Model model)
         IsHoisted = model.Hoist == 1;
         IsMentionable = model.Mentionable == 1;
         Position = model.Position;
-        Color = new Color(model.Color);
+        Color = model.Color;
         Permissions = new GuildPermissions(model.Permissions);
     }
 

diff --git a/src/Kook.Net.Rest/Entities/Roles/RoleHelper.cs b/src/Kook.Net.Rest/Entities/Roles/RoleHelper.cs
@@ -27,7 +27,7 @@ public static async Task<Model> ModifyAsync(IRole role, BaseKookClient client,
             GuildId = role.Guild.Id,
             RoleId = role.Id,
             Name = args.Name,
-            Color = args.Color?.RawValue,
+            Color = args.Color,
             Hoist = args.Hoist switch
             {
                 true => 1,

diff --git a/src/Kook.Net.Rest/Entities/Users/RestGuildUser.cs b/src/Kook.Net.Rest/Entities/Users/RestGuildUser.cs
@@ -78,7 +78,7 @@ internal void Update(MemberModel model)
         IsMobileVerified = model.MobileVerified;
         JoinedAt = model.JoinedAt;
         ActiveAt = model.ActiveAt;
-        Color = new Color(model.Color);
+        Color = model.Color;
         IsOwner = model.IsOwner;
         UpdateRoles(model.Roles);
     }

diff --git a/src/Kook.Net.Rest/Net/Converters/Cards/ColorConverter.cs b/src/Kook.Net.Rest/Net/Converters/Cards/ColorConverter.cs
diff --git a/...onverters/Cards/NullableColorConverter.cs → ...Net/Converters/Cards/HexColorConverter.cs b/...onverters/Cards/NullableColorConverter.cs → ...Net/Converters/Cards/HexColorConverter.cs
@@ -3,7 +3,7 @@
 
 namespace Kook.Net.Converters;
 
-internal class ColorConverter : JsonConverter<Color>
+internal class HexColorConverter : JsonConverter<Color>
 {
     public override Color Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {

diff --git a/src/Kook.Net.Rest/Net/Converters/Cards/RawValueColorConverter.cs b/src/Kook.Net.Rest/Net/Converters/Cards/RawValueColorConverter.cs
@@ -0,0 +1,18 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Kook.Net.Converters;
+
+internal class RawValueColorConverter : JsonConverter<Color>
+{
+    public override Color Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        uint rawValue = reader.GetUInt32();
+        return new Color(rawValue);
+    }
+
+    public override void Write(Utf8JsonWriter writer, Color value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.RawValue);
+    }
+}
diff --git a/src/Kook.Net.WebSocket/Entities/Roles/SocketRole.cs b/src/Kook.Net.WebSocket/Entities/Roles/SocketRole.cs
@@ -63,7 +63,7 @@ internal void Update(ClientState state, Model model)
     {
         Name = model.Name;
         Type = model.Type;
-        Color = new Color(model.Color);
+        Color = model.Color;
         Position = model.Position;
         IsHoisted = model.Hoist switch
         {

diff --git a/src/Kook.Net.WebSocket/Entities/Users/SocketGuildUser.cs b/src/Kook.Net.WebSocket/Entities/Users/SocketGuildUser.cs
@@ -165,7 +165,7 @@ internal void Update(ClientState state, MemberModel model)
         IsMobileVerified = model.MobileVerified;
         JoinedAt = model.JoinedAt;
         ActiveAt = model.ActiveAt;
-        Color = new Color(model.Color);
+        Color = model.Color;
         IsOwner = model.IsOwner;
         UpdateRoles(model.Roles);
     }