From 086267487c3933f42d2165eefc96f2c106e141ea Mon Sep 17 00:00:00 2001
From: HelpfulStranger999 <helpfulstranger999@gmail.com>
Date: Mon, 26 Mar 2018 15:20:31 -0500
Subject: [PATCH] Amendment

---
 src/Discord.Net.Core/CDN.cs                            | 2 --
 src/Discord.Net.Core/Entities/Users/IUser.cs           | 6 ------
 src/Discord.Net.Rest/Entities/Users/RestUser.cs        | 7 -------
 src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs | 7 -------
 4 files changed, 22 deletions(-)

diff --git a/src/Discord.Net.Core/CDN.cs b/src/Discord.Net.Core/CDN.cs
index 6c7a4af89..f23f55238 100644
--- a/src/Discord.Net.Core/CDN.cs
+++ b/src/Discord.Net.Core/CDN.cs
@@ -13,8 +13,6 @@ namespace Discord
             string extension = FormatToExtension(format, avatarId);
             return $"{DiscordConfig.CDNUrl}avatars/{userId}/{avatarId}.{extension}?size={size}";
         }
-        public static string GetUserDefaultAvatarUrl(ushort discrim)
-            => $"{DiscordConfig.CDNUrl}embed/avatars/{discrim}.png";
         public static string GetGuildIconUrl(ulong guildId, string iconId)
             => iconId != null ? $"{DiscordConfig.CDNUrl}icons/{guildId}/{iconId}.jpg" : null;
         public static string GetGuildSplashUrl(ulong guildId, string splashId)
diff --git a/src/Discord.Net.Core/Entities/Users/IUser.cs b/src/Discord.Net.Core/Entities/Users/IUser.cs
index 817123625..a99db1bc5 100644
--- a/src/Discord.Net.Core/Entities/Users/IUser.cs
+++ b/src/Discord.Net.Core/Entities/Users/IUser.cs
@@ -8,10 +8,6 @@ namespace Discord
         string AvatarId { get; }
         /// <summary> Gets the url to this user's custom avatar. </summary>
         string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128);
-        /// <summary> Get the url to this user's custom avatar, if set, else this user's default avatar. </summary>
-        string GetEffectiveAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128);
-        /// <summary> Get the url to this user's default avatar. </summary>
-        string GetDefaultAvatarUrl();
         /// <summary> Gets the per-username unique id for this user. </summary>
         string Discriminator { get; }
         /// <summary> Gets the per-username unique id for this user. </summary>
@@ -20,8 +16,6 @@ namespace Discord
         bool IsBot { get; }
         /// <summary> Returns true if this user is a webhook user. </summary>
         bool IsWebhook { get; }
-        /// <summary> Returns true if this user has set a custom avatar. </summary>
-        bool HasCustomAvatar { get; }
         /// <summary> Gets the username for this user. </summary>
         string Username { get; }
 
diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
index bc7890c9b..f4580388d 100644
--- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs
+++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
@@ -19,7 +19,6 @@ namespace Discord.Rest
         public virtual IActivity Activity => null;
         public virtual UserStatus Status => UserStatus.Offline;
         public virtual bool IsWebhook => false;
-        public bool HasCustomAvatar => AvatarId != null;
 
         internal RestUser(BaseDiscordClient discord, ulong id)
             : base(discord, id)
@@ -61,12 +60,6 @@ namespace Discord.Rest
         public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
             => CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
 
-        public string GetEffectiveAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
-            => GetAvatarUrl(format, size) ?? GetDefaultAvatarUrl();
-
-        public string GetDefaultAvatarUrl()
-            => CDN.GetUserDefaultAvatarUrl(DiscriminatorValue);
-
         public override string ToString() => $"{Username}#{Discriminator}";
         private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
 
diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
index 3ac31207b..29b406d75 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
@@ -20,7 +20,6 @@ namespace Discord.WebSocket
         public string Mention => MentionUtils.MentionUser(Id);
         public IActivity Activity => Presence.Activity;
         public UserStatus Status => Presence.Status;
-        public bool HasCustomAvatar => AvatarId != null;
 
         internal SocketUser(DiscordSocketClient discord, ulong id)
             : base(discord, id)
@@ -62,12 +61,6 @@ namespace Discord.WebSocket
         public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
             => CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
 
-        public string GetEffectiveAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
-            => GetAvatarUrl(format, size) ?? GetDefaultAvatarUrl();
-
-        public string GetDefaultAvatarUrl()
-            => CDN.GetUserDefaultAvatarUrl(DiscriminatorValue);
-
         public override string ToString() => $"{Username}#{Discriminator}";
         private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
         internal SocketUser Clone() => MemberwiseClone() as SocketUser;