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; }
/// Gets the url to this user's custom avatar.
string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128);
- /// Get the url to this user's custom avatar, if set, else this user's default avatar.
- string GetEffectiveAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128);
- /// Get the url to this user's default avatar.
- string GetDefaultAvatarUrl();
/// Gets the per-username unique id for this user.
string Discriminator { get; }
/// Gets the per-username unique id for this user.
@@ -20,8 +16,6 @@ namespace Discord
bool IsBot { get; }
/// Returns true if this user is a webhook user.
bool IsWebhook { get; }
- /// Returns true if this user has set a custom avatar.
- bool HasCustomAvatar { get; }
/// Gets the username for this user.
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;