Fixes Role creation deserialization failure

gehongyan · Mar 18, 2023 · 1726d5c · 1726d5c
1 parent 2b5c59d
commit 1726d5c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Kook.Net.Rest/API/Common/Role.cs b/src/Kook.Net.Rest/API/Common/Role.cs
@@ -16,7 +16,7 @@ internal class Role
     public Color Color { get; set; }
 
     [JsonPropertyName("color_type")]
-    public ColorType ColorType { get; set; }
+    public ColorType? ColorType { get; set; }
 
     [JsonPropertyName("color_map")]
     [JsonConverter(typeof(NullableGradientColorConverter))]

diff --git a/src/Kook.Net.Rest/Entities/Roles/RestRole.cs b/src/Kook.Net.Rest/Entities/Roles/RestRole.cs
@@ -76,7 +76,7 @@ internal void Update(Model model)
         Name = model.Name;
         Type = model.Type;
         Color = model.Color;
-        ColorType = model.ColorType;
+        ColorType = model.ColorType ?? ColorType.Solid; // BUG: The API returns null when creating new roles.
         GradientColor = model.GradientColor;
         IsHoisted = model.Hoist == 1;
         IsMentionable = model.Mentionable == 1;

diff --git a/src/Kook.Net.Rest/Kook.Net.Rest.csproj b/src/Kook.Net.Rest/Kook.Net.Rest.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>TRACE_REST;DEBUG_REST</DefineConstants>
+    <DefineConstants>TRACE_REST</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Kook.Net.WebSocket/Entities/Roles/SocketRole.cs b/src/Kook.Net.WebSocket/Entities/Roles/SocketRole.cs
@@ -79,7 +79,7 @@ internal void Update(ClientState state, Model model)
         Name = model.Name;
         Type = model.Type;
         Color = model.Color;
-        ColorType = model.ColorType;
+        ColorType = model.ColorType ?? ColorType.Solid; // BUG: The API returns null when creating new roles.
         GradientColor = model.GradientColor;
         Position = model.Position;
         IsHoisted = model.Hoist switch