From 97e71cd5e5e825e6f0a63eb3bf5a0cd1690fd652 Mon Sep 17 00:00:00 2001 From: Paulo Date: Wed, 18 Nov 2020 14:52:00 -0300 Subject: [PATCH] fix: Revert PremiumSubscriptionCount type (#1686) --- src/Discord.Net.Rest/API/Common/Guild.cs | 2 +- src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs | 3 +-- src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Discord.Net.Rest/API/Common/Guild.cs b/src/Discord.Net.Rest/API/Common/Guild.cs index 414929a7b..46075ce4d 100644 --- a/src/Discord.Net.Rest/API/Common/Guild.cs +++ b/src/Discord.Net.Rest/API/Common/Guild.cs @@ -69,7 +69,7 @@ namespace Discord.API [JsonProperty("max_members")] public Optional MaxMembers { get; set; } [JsonProperty("premium_subscription_count")] - public Optional PremiumSubscriptionCount { get; set; } + public int? PremiumSubscriptionCount { get; set; } [JsonProperty("preferred_locale")] public string PreferredLocale { get; set; } [JsonProperty("public_updates_channel_id")] diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs index c1dd39afe..c74e128a8 100644 --- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs +++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs @@ -161,8 +161,7 @@ namespace Discord.Rest BannerId = model.Banner; SystemChannelFlags = model.SystemChannelFlags; Description = model.Description; - if (model.PremiumSubscriptionCount.IsSpecified) - PremiumSubscriptionCount = model.PremiumSubscriptionCount.Value; + PremiumSubscriptionCount = model.PremiumSubscriptionCount.GetValueOrDefault(); if (model.MaxPresences.IsSpecified) MaxPresences = model.MaxPresences.Value ?? 25000; if (model.MaxMembers.IsSpecified) diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs index 2365ec6a6..ad58a735e 100644 --- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs +++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs @@ -448,8 +448,7 @@ namespace Discord.WebSocket BannerId = model.Banner; SystemChannelFlags = model.SystemChannelFlags; Description = model.Description; - if (model.PremiumSubscriptionCount.IsSpecified) - PremiumSubscriptionCount = model.PremiumSubscriptionCount.Value; + PremiumSubscriptionCount = model.PremiumSubscriptionCount.GetValueOrDefault(); if (model.MaxPresences.IsSpecified) MaxPresences = model.MaxPresences.Value ?? 25000; if (model.MaxMembers.IsSpecified)