* Support Guild Boost Progress Bars * Update SocketChannel.cs * Fix non-optional and unnecessary values. * Spelling * Reordering and consistency.pull/1923/head
| @@ -108,5 +108,9 @@ namespace Discord | |||||
| /// the value of <see cref="PreferredCulture"/> will be unused. | /// the value of <see cref="PreferredCulture"/> will be unused. | ||||
| /// </remarks> | /// </remarks> | ||||
| public Optional<CultureInfo> PreferredCulture { get; set; } | public Optional<CultureInfo> PreferredCulture { get; set; } | ||||
| /// <summary> | |||||
| /// Gets or sets if the boost progress bar is enabled. | |||||
| /// </summary> | |||||
| public Optional<bool> IsBoostProgressBarEnabled { get; set; } | |||||
| } | } | ||||
| } | } | ||||
| @@ -339,6 +339,13 @@ namespace Discord | |||||
| /// The preferred culture information of this guild. | /// The preferred culture information of this guild. | ||||
| /// </returns> | /// </returns> | ||||
| CultureInfo PreferredCulture { get; } | CultureInfo PreferredCulture { get; } | ||||
| /// <summary> | |||||
| /// Gets whether the guild has the boost progress bar enabled. | |||||
| /// </summary> | |||||
| /// <returns> | |||||
| /// <see langword="true"/> if the boost progress bar is enabled; otherwise <see langword="false"/>. | |||||
| /// </returns> | |||||
| bool IsBoostProgressBarEnabled { get; } | |||||
| /// <summary> | /// <summary> | ||||
| /// Modifies this guild. | /// Modifies this guild. | ||||
| @@ -81,5 +81,7 @@ namespace Discord.API | |||||
| public NsfwLevel NsfwLevel { get; set; } | public NsfwLevel NsfwLevel { get; set; } | ||||
| [JsonProperty("stickers")] | [JsonProperty("stickers")] | ||||
| public Sticker[] Stickers { get; set; } | public Sticker[] Stickers { get; set; } | ||||
| [JsonProperty("premium_progress_bar_enabled")] | |||||
| public Optional<bool> IsBoostProgressBarEnabled { get; set; } | |||||
| } | } | ||||
| } | } | ||||
| @@ -35,5 +35,7 @@ namespace Discord.API.Rest | |||||
| public Optional<SystemChannelMessageDeny> SystemChannelFlags { get; set; } | public Optional<SystemChannelMessageDeny> SystemChannelFlags { get; set; } | ||||
| [JsonProperty("preferred_locale")] | [JsonProperty("preferred_locale")] | ||||
| public string PreferredLocale { get; set; } | public string PreferredLocale { get; set; } | ||||
| [JsonProperty("premium_progress_bar_enabled")] | |||||
| public Optional<bool> IsBoostProgressBarEnabled { get; set; } | |||||
| } | } | ||||
| } | } | ||||
| @@ -36,7 +36,8 @@ namespace Discord.Rest | |||||
| Banner = args.Banner.IsSpecified ? args.Banner.Value?.ToModel() : Optional.Create<ImageModel?>(), | Banner = args.Banner.IsSpecified ? args.Banner.Value?.ToModel() : Optional.Create<ImageModel?>(), | ||||
| VerificationLevel = args.VerificationLevel, | VerificationLevel = args.VerificationLevel, | ||||
| ExplicitContentFilter = args.ExplicitContentFilter, | ExplicitContentFilter = args.ExplicitContentFilter, | ||||
| SystemChannelFlags = args.SystemChannelFlags | |||||
| SystemChannelFlags = args.SystemChannelFlags, | |||||
| IsBoostProgressBarEnabled = args.IsBoostProgressBarEnabled | |||||
| }; | }; | ||||
| if (args.AfkChannel.IsSpecified) | if (args.AfkChannel.IsSpecified) | ||||
| @@ -88,6 +88,8 @@ namespace Discord.Rest | |||||
| public int? ApproximatePresenceCount { get; private set; } | public int? ApproximatePresenceCount { get; private set; } | ||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public NsfwLevel NsfwLevel { get; private set; } | public NsfwLevel NsfwLevel { get; private set; } | ||||
| /// <inheritdoc /> | |||||
| public bool IsBoostProgressBarEnabled { get; private set; } | |||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public CultureInfo PreferredCulture { get; private set; } | public CultureInfo PreferredCulture { get; private set; } | ||||
| @@ -170,6 +172,8 @@ namespace Discord.Rest | |||||
| ApproximateMemberCount = model.ApproximateMemberCount.Value; | ApproximateMemberCount = model.ApproximateMemberCount.Value; | ||||
| if (model.ApproximatePresenceCount.IsSpecified) | if (model.ApproximatePresenceCount.IsSpecified) | ||||
| ApproximatePresenceCount = model.ApproximatePresenceCount.Value; | ApproximatePresenceCount = model.ApproximatePresenceCount.Value; | ||||
| if (model.IsBoostProgressBarEnabled.IsSpecified) | |||||
| IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value; | |||||
| if (model.Emojis != null) | if (model.Emojis != null) | ||||
| { | { | ||||
| @@ -125,9 +125,10 @@ namespace Discord.WebSocket | |||||
| public int? MaxVideoChannelUsers { get; private set; } | public int? MaxVideoChannelUsers { get; private set; } | ||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public NsfwLevel NsfwLevel { get; private set; } | public NsfwLevel NsfwLevel { get; private set; } | ||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public CultureInfo PreferredCulture { get; private set; } | public CultureInfo PreferredCulture { get; private set; } | ||||
| /// <inheritdoc /> | |||||
| public bool IsBoostProgressBarEnabled { get; private set; } | |||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); | public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); | ||||
| @@ -495,7 +496,8 @@ namespace Discord.WebSocket | |||||
| MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value; | MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value; | ||||
| PreferredLocale = model.PreferredLocale; | PreferredLocale = model.PreferredLocale; | ||||
| PreferredCulture = PreferredLocale == null ? null : new CultureInfo(PreferredLocale); | PreferredCulture = PreferredLocale == null ? null : new CultureInfo(PreferredLocale); | ||||
| if (model.IsBoostProgressBarEnabled.IsSpecified) | |||||
| IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value; | |||||
| if (model.Emojis != null) | if (model.Emojis != null) | ||||
| { | { | ||||
| var emojis = ImmutableArray.CreateBuilder<GuildEmote>(model.Emojis.Length); | var emojis = ImmutableArray.CreateBuilder<GuildEmote>(model.Emojis.Length); | ||||
| @@ -1627,7 +1629,6 @@ namespace Discord.WebSocket | |||||
| int? IGuild.ApproximatePresenceCount => null; | int? IGuild.ApproximatePresenceCount => null; | ||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| IReadOnlyCollection<ICustomSticker> IGuild.Stickers => Stickers; | IReadOnlyCollection<ICustomSticker> IGuild.Stickers => Stickers; | ||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| async Task<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(RequestOptions options) | async Task<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(RequestOptions options) | ||||
| => await GetBansAsync(options).ConfigureAwait(false); | => await GetBansAsync(options).ConfigureAwait(false); | ||||