From 37f1c9df38c11cc9605b794126fec95d819d3731 Mon Sep 17 00:00:00 2001 From: Misha133 Date: Wed, 14 Dec 2022 12:46:42 +0300 Subject: [PATCH] Resolve some reviews --- src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs | 3 ++- src/Discord.Net.Core/Entities/Invites/IInvite.cs | 2 +- src/Discord.Net.Rest/API/Common/Guild.cs | 2 +- .../API/Rest/ModifyGuildWelcomeScreenParams.cs | 1 - src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs | 4 ++-- src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs b/src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs index f4a10b6af..4a2c0a991 100644 --- a/src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs +++ b/src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Collections.Immutable; namespace Discord; @@ -18,7 +19,7 @@ public class WelcomeScreen { Description = description; - Channels = channels; + Channels = channels.ToImmutableArray(); } } diff --git a/src/Discord.Net.Core/Entities/Invites/IInvite.cs b/src/Discord.Net.Core/Entities/Invites/IInvite.cs index 292fc5c2b..53b483d21 100644 --- a/src/Discord.Net.Core/Entities/Invites/IInvite.cs +++ b/src/Discord.Net.Core/Entities/Invites/IInvite.cs @@ -57,7 +57,7 @@ namespace Discord /// Gets the guild this invite is linked to. /// /// - /// Guild might have empty properties due to API not returning full guild object. + /// The guild may be partially populated. /// /// /// A guild object representing the guild that the invite points to. diff --git a/src/Discord.Net.Rest/API/Common/Guild.cs b/src/Discord.Net.Rest/API/Common/Guild.cs index e49704d64..d091c26a7 100644 --- a/src/Discord.Net.Rest/API/Common/Guild.cs +++ b/src/Discord.Net.Rest/API/Common/Guild.cs @@ -66,7 +66,7 @@ namespace Discord.API [JsonProperty("premium_subscription_count")] public int? PremiumSubscriptionCount { get; set; } [JsonProperty("preferred_locale")] - public Optional PreferredLocale { get; set; } + public string PreferredLocale { get; set; } [JsonProperty("public_updates_channel_id")] public ulong? PublicUpdatesChannelId { get; set; } [JsonProperty("max_video_channel_users")] diff --git a/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs b/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs index 8e8ddb63e..b9a53c487 100644 --- a/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs +++ b/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs @@ -2,7 +2,6 @@ using Newtonsoft.Json; namespace Discord.API.Rest; - [JsonObject(MemberSerialization = MemberSerialization.OptIn)] internal class ModifyGuildWelcomeScreenParams { diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs index 9bccd4abb..77c6d0e90 100644 --- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs +++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs @@ -181,8 +181,8 @@ namespace Discord.Rest MaxMembers = model.MaxMembers.Value; if (model.MaxVideoChannelUsers.IsSpecified) MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value; - PreferredLocale = model.PreferredLocale.IsSpecified ? model.PreferredLocale.Value : null; - PreferredCulture = model.PreferredLocale.IsSpecified ? new CultureInfo(PreferredLocale) : null; + PreferredLocale = model.PreferredLocale; + PreferredCulture = model.PreferredLocale is null ? null : new CultureInfo(PreferredLocale); if (model.ApproximateMemberCount.IsSpecified) ApproximateMemberCount = model.ApproximateMemberCount.Value; if (model.ApproximatePresenceCount.IsSpecified) diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs index 283b46de4..7d53619f1 100644 --- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs +++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs @@ -515,7 +515,7 @@ namespace Discord.WebSocket MaxMembers = model.MaxMembers.Value; if (model.MaxVideoChannelUsers.IsSpecified) MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value; - PreferredLocale = model.PreferredLocale.IsSpecified ? model.PreferredLocale.Value : null; + PreferredLocale = model.PreferredLocale; PreferredCulture = PreferredLocale == null ? null : new CultureInfo(PreferredLocale); if (model.IsBoostProgressBarEnabled.IsSpecified) IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value;