From d5879c861a71622e47f2c7d87e518301cca2751d Mon Sep 17 00:00:00 2001 From: Mihail Gribkov <61027276+Misha-133@users.noreply.github.com> Date: Mon, 2 Dec 2024 01:59:21 +0300 Subject: [PATCH] [Fix] Entitlements `starts_at` is nullable (#3034) * i wonder if it was just as simple as that * nope * nope x2 * nope x3 --- src/Discord.Net.Rest/API/Common/Entitlement.cs | 2 +- .../Entities/AppSubscriptions/RestEntitlement.cs | 4 +--- .../Entities/AppSubscriptions/SocketEntitlement.cs | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Discord.Net.Rest/API/Common/Entitlement.cs b/src/Discord.Net.Rest/API/Common/Entitlement.cs index 218f9026..46d42642 100644 --- a/src/Discord.Net.Rest/API/Common/Entitlement.cs +++ b/src/Discord.Net.Rest/API/Common/Entitlement.cs @@ -27,7 +27,7 @@ internal class Entitlement public Optional IsConsumed { get; set; } [JsonProperty("starts_at")] - public Optional StartsAt { get; set; } + public DateTimeOffset? StartsAt { get; set; } [JsonProperty("ends_at")] public Optional EndsAt { get; set; } diff --git a/src/Discord.Net.Rest/Entities/AppSubscriptions/RestEntitlement.cs b/src/Discord.Net.Rest/Entities/AppSubscriptions/RestEntitlement.cs index e5fb4ea3..15f24fa0 100644 --- a/src/Discord.Net.Rest/Entities/AppSubscriptions/RestEntitlement.cs +++ b/src/Discord.Net.Rest/Entities/AppSubscriptions/RestEntitlement.cs @@ -56,9 +56,7 @@ public class RestEntitlement : RestEntity, IEntitlement ApplicationId = model.ApplicationId; Type = model.Type; IsConsumed = model.IsConsumed.GetValueOrDefault(false); - StartsAt = model.StartsAt.IsSpecified - ? model.StartsAt.Value - : null; + StartsAt = model.StartsAt; EndsAt = model.EndsAt.IsSpecified ? model.EndsAt.Value : null; diff --git a/src/Discord.Net.WebSocket/Entities/AppSubscriptions/SocketEntitlement.cs b/src/Discord.Net.WebSocket/Entities/AppSubscriptions/SocketEntitlement.cs index a4b71d92..9c074c1e 100644 --- a/src/Discord.Net.WebSocket/Entities/AppSubscriptions/SocketEntitlement.cs +++ b/src/Discord.Net.WebSocket/Entities/AppSubscriptions/SocketEntitlement.cs @@ -68,9 +68,7 @@ public class SocketEntitlement : SocketEntity, IEntitlement ApplicationId = model.ApplicationId; Type = model.Type; IsConsumed = model.IsConsumed.GetValueOrDefault(false); - StartsAt = model.StartsAt.IsSpecified - ? model.StartsAt.Value - : null; + StartsAt = model.StartsAt; EndsAt = model.EndsAt.IsSpecified ? model.EndsAt.Value : null;