From 17c332f57faac5d9e6058c740a69dd2419634fab Mon Sep 17 00:00:00 2001
From: HelpfulStranger999 <helpfulstranger999@gmail.com>
Date: Mon, 26 Mar 2018 14:49:40 -0500
Subject: [PATCH] Adds support for default avatars and resolves #971

---
 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 | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Discord.Net.Core/Entities/Users/IUser.cs b/src/Discord.Net.Core/Entities/Users/IUser.cs
index 9d06ca12a..817123625 100644
--- a/src/Discord.Net.Core/Entities/Users/IUser.cs
+++ b/src/Discord.Net.Core/Entities/Users/IUser.cs
@@ -6,10 +6,10 @@ namespace Discord
     {
         /// <summary> Gets the id of this user's avatar. </summary>
         string AvatarId { get; }
-        /// <summary> Gets the url to this user's avatar. </summary>
+        /// <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. </summary>
-        string GetCustomAvatarUrl(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>
diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
index f9eac20cc..bc7890c9b 100644
--- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs
+++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs
@@ -9,7 +9,6 @@ namespace Discord.Rest
     public class RestUser : RestEntity<ulong>, IUser, IUpdateable
     {
         public bool IsBot { get; private set; }
-        public bool HasCustomeAvatar { get; private set; }
         public string Username { get; private set; }
         public ushort DiscriminatorValue { get; private set; }
         public string AvatarId { get; private set; }
@@ -60,11 +59,11 @@ namespace Discord.Rest
             => UserHelper.CreateDMChannelAsync(this, Discord, options);
 
         public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
-            => GetCustomAvatarUrl(format, size) ?? GetDefaultAvatarUrl();
-
-        public string GetCustomAvatarUrl(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);
 
diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
index aa0b22f9c..3ac31207b 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
@@ -60,11 +60,11 @@ namespace Discord.WebSocket
             => GlobalUser.DMChannel ?? await UserHelper.CreateDMChannelAsync(this, Discord, options) as IDMChannel;
 
         public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
-            => GetCustomAvatarUrl(format, size) ?? GetDefaultAvatarUrl();
-
-        public string GetCustomAvatarUrl(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);