Browse Source

Resolve some reviews

pull/2510/head
Misha133 2 years ago
parent
commit
37f1c9df38
6 changed files with 7 additions and 7 deletions
  1. +2
    -1
      src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs
  2. +1
    -1
      src/Discord.Net.Core/Entities/Invites/IInvite.cs
  3. +1
    -1
      src/Discord.Net.Rest/API/Common/Guild.cs
  4. +0
    -1
      src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs
  5. +2
    -2
      src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
  6. +1
    -1
      src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs

+ 2
- 1
src/Discord.Net.Core/Entities/Guilds/WelcomeScreen.cs View File

@@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable;


namespace Discord; namespace Discord;


@@ -18,7 +19,7 @@ public class WelcomeScreen
{ {
Description = description; Description = description;


Channels = channels;
Channels = channels.ToImmutableArray();
} }


} }

+ 1
- 1
src/Discord.Net.Core/Entities/Invites/IInvite.cs View File

@@ -57,7 +57,7 @@ namespace Discord
/// Gets the guild this invite is linked to. /// Gets the guild this invite is linked to.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Guild might have empty properties due to API not returning full guild object.
/// The guild may be partially populated.
/// </remarks> /// </remarks>
/// <returns> /// <returns>
/// A guild object representing the guild that the invite points to. /// A guild object representing the guild that the invite points to.


+ 1
- 1
src/Discord.Net.Rest/API/Common/Guild.cs View File

@@ -66,7 +66,7 @@ namespace Discord.API
[JsonProperty("premium_subscription_count")] [JsonProperty("premium_subscription_count")]
public int? PremiumSubscriptionCount { get; set; } public int? PremiumSubscriptionCount { get; set; }
[JsonProperty("preferred_locale")] [JsonProperty("preferred_locale")]
public Optional<string> PreferredLocale { get; set; }
public string PreferredLocale { get; set; }
[JsonProperty("public_updates_channel_id")] [JsonProperty("public_updates_channel_id")]
public ulong? PublicUpdatesChannelId { get; set; } public ulong? PublicUpdatesChannelId { get; set; }
[JsonProperty("max_video_channel_users")] [JsonProperty("max_video_channel_users")]


+ 0
- 1
src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs View File

@@ -2,7 +2,6 @@ using Newtonsoft.Json;


namespace Discord.API.Rest; namespace Discord.API.Rest;



[JsonObject(MemberSerialization = MemberSerialization.OptIn)] [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
internal class ModifyGuildWelcomeScreenParams internal class ModifyGuildWelcomeScreenParams
{ {


+ 2
- 2
src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs View File

@@ -181,8 +181,8 @@ namespace Discord.Rest
MaxMembers = model.MaxMembers.Value; MaxMembers = model.MaxMembers.Value;
if (model.MaxVideoChannelUsers.IsSpecified) if (model.MaxVideoChannelUsers.IsSpecified)
MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value; 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) if (model.ApproximateMemberCount.IsSpecified)
ApproximateMemberCount = model.ApproximateMemberCount.Value; ApproximateMemberCount = model.ApproximateMemberCount.Value;
if (model.ApproximatePresenceCount.IsSpecified) if (model.ApproximatePresenceCount.IsSpecified)


+ 1
- 1
src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs View File

@@ -515,7 +515,7 @@ namespace Discord.WebSocket
MaxMembers = model.MaxMembers.Value; MaxMembers = model.MaxMembers.Value;
if (model.MaxVideoChannelUsers.IsSpecified) if (model.MaxVideoChannelUsers.IsSpecified)
MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value; MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value;
PreferredLocale = model.PreferredLocale.IsSpecified ? model.PreferredLocale.Value : null;
PreferredLocale = model.PreferredLocale;
PreferredCulture = PreferredLocale == null ? null : new CultureInfo(PreferredLocale); PreferredCulture = PreferredLocale == null ? null : new CultureInfo(PreferredLocale);
if (model.IsBoostProgressBarEnabled.IsSpecified) if (model.IsBoostProgressBarEnabled.IsSpecified)
IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value; IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value;


Loading…
Cancel
Save