From 244fcb9d1fbe9a2662f30afdca16638ff7962c58 Mon Sep 17 00:00:00 2001 From: Liege72 <65319395+Liege72@users.noreply.github.com> Date: Tue, 26 Oct 2021 20:54:57 -0400 Subject: [PATCH] Removed BannerId and AccentColor (#260) * Removed BannerId property, GetBannerURL method, and AccentColor property from IUser and socket entities. * Fixed errors in IUser.cs * Added back summary for GetAvatarUrl method in IUser.cs --- src/Discord.Net.Core/Entities/Users/IUser.cs | 23 +------------------ .../Entities/Users/SocketGlobalUser.cs | 2 -- .../Entities/Users/SocketGroupUser.cs | 4 ---- .../Entities/Users/SocketGuildUser.cs | 4 ---- .../Entities/Users/SocketSelfUser.cs | 4 ---- .../Entities/Users/SocketThreadUser.cs | 14 ----------- .../Entities/Users/SocketUnknownUser.cs | 6 ----- .../Entities/Users/SocketUser.cs | 18 --------------- .../Entities/Users/SocketWebhookUser.cs | 15 ------------ 9 files changed, 1 insertion(+), 89 deletions(-) diff --git a/src/Discord.Net.Core/Entities/Users/IUser.cs b/src/Discord.Net.Core/Entities/Users/IUser.cs index f265bb938..2f79450f3 100644 --- a/src/Discord.Net.Core/Entities/Users/IUser.cs +++ b/src/Discord.Net.Core/Entities/Users/IUser.cs @@ -10,18 +10,7 @@ namespace Discord /// /// Gets the identifier of this user's avatar. /// - string AvatarId { get; } - /// - /// Gets the identifier of this user's banner. - /// - string BannerId { get; } - /// - /// Gets the user's banner color. - /// - /// - /// A struct representing the accent color of this user's banner. - /// - Color? AccentColor { get; } + string AvatarId { get; } /// /// Gets the avatar URL for this user. /// @@ -46,16 +35,6 @@ namespace Discord /// string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128); /// - /// Gets the banner URL for this user. - /// - /// The format to return. - /// The size of the image to return in. This can be any power of two between 16 and 2048. - /// - /// - /// A string representing the user's avatar URL; null if the user does not have an banner in place. - /// - string GetBannerUrl(ImageFormat format = ImageFormat.Auto, ushort size = 256); - /// /// Gets the default avatar URL for this user. /// /// diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs index b1bce5934..3a1ad23b6 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs +++ b/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; diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGroupUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGroupUser.cs index ae72b5d47..fe19a41ec 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGroupUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGroupUser.cs @@ -30,10 +30,6 @@ namespace Discord.WebSocket /// public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } } /// - public override string BannerId { get { return GlobalUser.BannerId; } internal set { GlobalUser.BannerId = value; } } - /// - public override Color? AccentColor { get { return GlobalUser.AccentColor; } internal set { GlobalUser.AccentColor = value; } } - /// internal override SocketPresence Presence { get { return GlobalUser.Presence; } set { GlobalUser.Presence = value; } } /// diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs index 314471b17..147456cb0 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs +++ b/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; } } /// public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } } - /// - public override string BannerId { get { return GlobalUser.BannerId; } internal set { GlobalUser.BannerId = value; } } - /// - public override Color? AccentColor { get { return GlobalUser.AccentColor; } internal set { GlobalUser.AccentColor = value; } } /// public GuildPermissions GuildPermissions => new GuildPermissions(Permissions.ResolveGuild(Guild, this)); diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs index e821238ee..7b11257a3 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs @@ -29,10 +29,6 @@ namespace Discord.WebSocket /// public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } } /// - public override string BannerId { get { return GlobalUser.BannerId; } internal set { GlobalUser.BannerId = value; } } - /// - public override Color? AccentColor { get { return GlobalUser.AccentColor; } internal set { GlobalUser.AccentColor = value; } } - /// internal override SocketPresence Presence { get { return GlobalUser.Presence; } set { GlobalUser.Presence = value; } } /// public UserProperties Flags { get; internal set; } diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs index 42fb807a1..b2311dd7d 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs @@ -56,20 +56,6 @@ namespace Discord.WebSocket public string GuildAvatarId => GuildUser.GuildAvatarId; - /// - public override string BannerId - { - get => GuildUser.BannerId; - internal set => GuildUser.BannerId = value; - } - - /// - public override Color? AccentColor - { - get => GuildUser.AccentColor; - internal set => GuildUser.AccentColor = value; - } - /// public override ushort DiscriminatorValue { diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUnknownUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUnknownUser.cs index 180e60a3b..a15f7e747 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketUnknownUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUnknownUser.cs @@ -20,12 +20,6 @@ namespace Discord.WebSocket /// public override string AvatarId { get; internal set; } - /// - public override string BannerId { get; internal set; } - - /// - public override Color? AccentColor { get; internal set; } - /// public override bool IsBot { get; internal set; } diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs index c50fbee4f..025daf29a 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs @@ -25,10 +25,6 @@ namespace Discord.WebSocket /// public abstract string AvatarId { get; internal set; } /// - public abstract string BannerId { get; internal set; } - /// - public abstract Color? AccentColor { get; internal set; } - /// public abstract bool IsWebhook { get; } /// 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); - /// - public string GetBannerUrl(ImageFormat format = ImageFormat.Auto, ushort size = 256) - => CDN.GetUserBannerUrl(Id, BannerId, size, format); - /// public string GetDefaultAvatarUrl() => CDN.GetDefaultUserAvatarUrl(DiscriminatorValue); diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs index 7cc7d5a44..bccfe1a29 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs @@ -26,21 +26,6 @@ namespace Discord.WebSocket /// public override string AvatarId { get; internal set; } - /// - /// Webhook users does not support banners. - 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."); - } - - /// - /// Webhook users does not support accent colors. - 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."); - } /// public override bool IsBot { get; internal set; }