Merge branch 'release/3.x' of https://github.com/Discord-Net-Labs/Discord.Net-Labs into release/3.x

docs/_template/light-dark-theme/partials/head.tmpl.partial

@@ -10,7 +10,7 @@
   <meta property="og:locale" content="en-us">
   <meta property="og:type" content="website">
   <meta property="og:site_name" content="Discord.Net Docs">
-  <meta property="og:image" content="https://cdn.jsdelivr.net/gh/discord-net/Discord.Net/docs/marketing/logo/PackageLogo.png">
+  <meta property="og:image" content="https://raw.githubusercontent.com/Discord-Net-Labs/Discord.Net-Labs/release/3.x/docs/marketing/logo/PackageLogo.png">
   <meta property="og:image:alt" content="Discord.Net Logo">
   <meta name="theme-color" content="#995EA7"/>
   <meta name="generator" content="docfx {{_docfxVersion}}">

src/Discord.Net.Core/Entities/Guilds/GuildProperties.cs

@@ -108,5 +108,9 @@ namespace Discord
         ///     the value of <see cref="PreferredCulture"/> will be unused.
         /// </remarks>
         public Optional<CultureInfo> PreferredCulture { get; set; }
+        /// <summary>
+        ///     Gets or sets if the boost progress bar is enabled.
+        /// </summary>
+        public Optional<bool> IsBoostProgressBarEnabled { get; set; }
     }
 }

src/Discord.Net.Core/Entities/Guilds/IGuild.cs

@@ -339,6 +339,13 @@ namespace Discord
         ///     The preferred culture information of this guild.
         /// </returns>
         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>
         ///     Modifies this guild.

src/Discord.Net.Core/Entities/Users/IUser.cs

@@ -10,18 +10,7 @@ namespace Discord
         /// <summary>
         ///     Gets the identifier of this user's avatar.
         /// </summary>
-        string AvatarId { get; }
-        /// <summary>
-        ///     Gets the identifier of this user's banner.
-        /// </summary>
-        string BannerId { get; }
-        /// <summary>
-        ///     Gets the user's banner color.
-        /// </summary>
-        /// <returns>
-        ///     A <see cref="Color"/> struct representing the accent color of this user's banner.
-        /// </returns>
-        Color? AccentColor { get; }
+        string AvatarId { get; }     
         /// <summary>
         ///     Gets the avatar URL for this user.
         /// </summary>
@@ -46,16 +35,6 @@ namespace Discord
         /// </returns>
         string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128);
         /// <summary>
-        ///     Gets the banner URL for this user.
-        /// </summary>
-        /// <param name="format">The format to return.</param>
-        /// <param name="size">The size of the image to return in. This can be any power of two between 16 and 2048.
-        /// </param>
-        /// <returns>
-        ///     A string representing the user's avatar URL; <c>null</c> if the user does not have an banner in place.
-        /// </returns>
-        string GetBannerUrl(ImageFormat format = ImageFormat.Auto, ushort size = 256);
-        /// <summary>
         ///     Gets the default avatar URL for this user.
         /// </summary>
         /// <remarks>

src/Discord.Net.Rest/API/Common/Guild.cs

@@ -81,5 +81,7 @@ namespace Discord.API
         public NsfwLevel NsfwLevel { get; set; }
         [JsonProperty("stickers")]
         public Sticker[] Stickers { get; set; }
+        [JsonProperty("premium_progress_bar_enabled")]
+        public Optional<bool> IsBoostProgressBarEnabled { get; set; }
     }
 }

src/Discord.Net.Rest/API/Rest/ModifyGuildParams.cs

@@ -35,5 +35,7 @@ namespace Discord.API.Rest
         public Optional<SystemChannelMessageDeny> SystemChannelFlags { get; set; }
         [JsonProperty("preferred_locale")]
         public string PreferredLocale { get; set; }
+        [JsonProperty("premium_progress_bar_enabled")]
+        public Optional<bool> IsBoostProgressBarEnabled { get; set; }
     }
 }

src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs

@@ -36,7 +36,8 @@ namespace Discord.Rest
                 Banner = args.Banner.IsSpecified ? args.Banner.Value?.ToModel() : Optional.Create<ImageModel?>(),
                 VerificationLevel = args.VerificationLevel,
                 ExplicitContentFilter = args.ExplicitContentFilter,
-                SystemChannelFlags = args.SystemChannelFlags
+                SystemChannelFlags = args.SystemChannelFlags,
+                IsBoostProgressBarEnabled = args.IsBoostProgressBarEnabled
             };
 
             if (args.AfkChannel.IsSpecified)

src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs

@@ -88,6 +88,8 @@ namespace Discord.Rest
         public int? ApproximatePresenceCount { get; private set; }
         /// <inheritdoc />
         public NsfwLevel NsfwLevel { get; private set; }
+        /// <inheritdoc />
+        public bool IsBoostProgressBarEnabled { get; private set; }
 
         /// <inheritdoc />
         public CultureInfo PreferredCulture { get; private set; }
@@ -170,6 +172,8 @@ namespace Discord.Rest
                 ApproximateMemberCount = model.ApproximateMemberCount.Value;
             if (model.ApproximatePresenceCount.IsSpecified)
                 ApproximatePresenceCount = model.ApproximatePresenceCount.Value;
+            if (model.IsBoostProgressBarEnabled.IsSpecified)
+                IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value;
 
             if (model.Emojis != null)
             {

src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs

@@ -125,9 +125,10 @@ namespace Discord.WebSocket
         public int? MaxVideoChannelUsers { get; private set; }
         /// <inheritdoc />
         public NsfwLevel NsfwLevel { get; private set; }
-
         /// <inheritdoc />
         public CultureInfo PreferredCulture { get; private set; }
+        /// <inheritdoc />
+        public bool IsBoostProgressBarEnabled { get; private set; }
 
         /// <inheritdoc />
         public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
@@ -495,7 +496,8 @@ namespace Discord.WebSocket
                 MaxVideoChannelUsers = model.MaxVideoChannelUsers.Value;
             PreferredLocale = model.PreferredLocale;
             PreferredCulture = PreferredLocale == null ? null : new CultureInfo(PreferredLocale);
-
+            if (model.IsBoostProgressBarEnabled.IsSpecified)
+                IsBoostProgressBarEnabled = model.IsBoostProgressBarEnabled.Value;
             if (model.Emojis != null)
             {
                 var emojis = ImmutableArray.CreateBuilder<GuildEmote>(model.Emojis.Length);
@@ -1627,7 +1629,6 @@ namespace Discord.WebSocket
         int? IGuild.ApproximatePresenceCount => null;
         /// <inheritdoc />
         IReadOnlyCollection<ICustomSticker> IGuild.Stickers => Stickers;
-
         /// <inheritdoc />
         async Task<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(RequestOptions options)
             => await GetBansAsync(options).ConfigureAwait(false);

src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs

@@ -12,8 +12,6 @@ namespace Discord.WebSocket
         public override string Username { get; internal set; }
         public override ushort DiscriminatorValue { get; internal set; }
         public override string AvatarId { get; internal set; }
-        public override string BannerId { get; internal set; }
-        public override Color? AccentColor { get; internal set; }
         internal override SocketPresence Presence { get; set; }
 
         public override bool IsWebhook => false;

src/Discord.Net.WebSocket/Entities/Users/SocketGroupUser.cs

@@ -30,10 +30,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } }
         /// <inheritdoc />
-        public override string BannerId { get { return GlobalUser.BannerId; } internal set { GlobalUser.BannerId = value; } }
-        /// <inheritdoc />
-        public override Color? AccentColor { get { return GlobalUser.AccentColor; } internal set { GlobalUser.AccentColor = value; } }
-        /// <inheritdoc />
         internal override SocketPresence Presence { get { return GlobalUser.Presence; } set { GlobalUser.Presence = value; } }
 
         /// <inheritdoc />

src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs

@@ -40,10 +40,6 @@ namespace Discord.WebSocket
         public override ushort DiscriminatorValue { get { return GlobalUser.DiscriminatorValue; } internal set { GlobalUser.DiscriminatorValue = value; } }
         /// <inheritdoc />
         public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } }
-        /// <inheritdoc />
-        public override string BannerId { get { return GlobalUser.BannerId; } internal set { GlobalUser.BannerId = value; } }
-        /// <inheritdoc />
-        public override Color? AccentColor { get { return GlobalUser.AccentColor; } internal set { GlobalUser.AccentColor = value; } }
 
         /// <inheritdoc />
         public GuildPermissions GuildPermissions => new GuildPermissions(Permissions.ResolveGuild(Guild, this));

src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs

@@ -29,10 +29,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } }
         /// <inheritdoc />
-        public override string BannerId { get { return GlobalUser.BannerId; } internal set { GlobalUser.BannerId = value; } }
-        /// <inheritdoc />
-        public override Color? AccentColor { get { return GlobalUser.AccentColor; } internal set { GlobalUser.AccentColor = value; } }
-        /// <inheritdoc />
         internal override SocketPresence Presence { get { return GlobalUser.Presence; } set { GlobalUser.Presence = value; } }
         /// <inheritdoc />
         public UserProperties Flags { get; internal set; }

src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs

@@ -56,20 +56,6 @@ namespace Discord.WebSocket
         public string GuildAvatarId
             => GuildUser.GuildAvatarId;
 
-        /// <inheritdoc/>
-        public override string BannerId
-        {
-            get => GuildUser.BannerId;
-            internal set => GuildUser.BannerId = value;
-        }
-
-        /// <inheritdoc/>
-        public override Color? AccentColor
-        {
-            get => GuildUser.AccentColor;
-            internal set => GuildUser.AccentColor = value;
-        }
-
         /// <inheritdoc/>
         public override ushort DiscriminatorValue
         {

src/Discord.Net.WebSocket/Entities/Users/SocketUnknownUser.cs

@@ -20,12 +20,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public override string AvatarId { get; internal set; }
 
-        /// <inheritdoc />
-        public override string BannerId { get; internal set; }
-
-        /// <inheritdoc />
-        public override Color? AccentColor { get; internal set; }
-
         /// <inheritdoc />
         public override bool IsBot { get; internal set; }
 

src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

@@ -25,10 +25,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public abstract string AvatarId { get; internal set; }
         /// <inheritdoc />
-        public abstract string BannerId { get; internal set; }
-        /// <inheritdoc />
-        public abstract Color? AccentColor { get; internal set; }
-        /// <inheritdoc />
         public abstract bool IsWebhook { get; }
         /// <inheritdoc />
         public UserProperties? PublicFlags { get; private set; }
@@ -68,16 +64,6 @@ namespace Discord.WebSocket
                 AvatarId = model.Avatar.Value;
                 hasChanges = true;
             }
-            if (model.Banner.IsSpecified && model.Banner.Value != BannerId)
-            {
-                BannerId = model.Banner.Value;
-                hasChanges = true;
-            }
-            if (model.AccentColor.IsSpecified && model.AccentColor.Value != AccentColor?.RawValue)
-            {
-                AccentColor = model.AccentColor.Value;
-                hasChanges = true;
-            }
             if (model.Discriminator.IsSpecified)
             {
                 var newVal = ushort.Parse(model.Discriminator.Value, NumberStyles.None, CultureInfo.InvariantCulture);
@@ -113,10 +99,6 @@ namespace Discord.WebSocket
         public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
             => CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
 
-        /// <inheritdoc />
-        public string GetBannerUrl(ImageFormat format = ImageFormat.Auto, ushort size = 256)
-            => CDN.GetUserBannerUrl(Id, BannerId, size, format);
-
         /// <inheritdoc />
         public string GetDefaultAvatarUrl()
             => CDN.GetDefaultUserAvatarUrl(DiscriminatorValue);

src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs

@@ -26,21 +26,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public override string AvatarId { get; internal set; }
 
-        /// <inheritdoc />
-        /// <exception cref="NotSupportedException">Webhook users does not support banners.</exception>
-        public override string BannerId
-        {
-            get => throw new NotSupportedException("Webhook users does not support banners.");
-            internal set => throw new NotSupportedException("Webhook users does not support banners.");
-        }
-
-        /// <inheritdoc />
-        /// <exception cref="NotSupportedException">Webhook users does not support accent colors.</exception>
-        public override Color? AccentColor
-        {
-            get => throw new NotSupportedException("Webhook users does not support accent colors.");
-            internal set => throw new NotSupportedException("Webhook users does not support accent colors.");
-        }
 
         /// <inheritdoc />
         public override bool IsBot { get; internal set; }