Merge pull request #436 from RogueException/feature/new-avatars

Replace IUser.AvatarUrl with IUser#GetAvatarUrl(size)

src/Discord.Net.Core/CDN.cs

@@ -4,8 +4,8 @@
     {
         public static string GetApplicationIconUrl(ulong appId, string iconId)
             => iconId != null ? $"{DiscordConfig.CDNUrl}app-icons/{appId}/{iconId}.jpg" : null;
-        public static string GetUserAvatarUrl(ulong userId, string avatarId)
-            => avatarId != null ? $"{DiscordConfig.CDNUrl}avatars/{userId}/{avatarId}.jpg" : null;
+        public static string GetUserAvatarUrl(ulong userId, string avatarId, ushort size, AvatarFormat format)
+            => avatarId != null ? $"{DiscordConfig.CDNUrl}avatars/{userId}/{avatarId}.{format.ToString().ToLower()}?size={size}" : null;
         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)

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

@@ -0,0 +1,10 @@
+namespace Discord
+{
+    public enum AvatarFormat
+    {
+        WebP,
+        Png,
+        Jpeg,
+        Gif,
+    }
+}

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

@@ -7,7 +7,7 @@ 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>
-        string AvatarUrl { get; }
+        string GetAvatarUrl(AvatarFormat format = AvatarFormat.Png, ushort size = 128);
         /// <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>

src/Discord.Net.Rest/Entities/Users/RestUser.cs

@@ -13,7 +13,7 @@ namespace Discord.Rest
         public ushort DiscriminatorValue { get; private set; }
         public string AvatarId { get; private set; }
 
-        public string AvatarUrl => CDN.GetUserAvatarUrl(Id, AvatarId);
+        public string GetAvatarUrl(AvatarFormat format = AvatarFormat.Png, ushort size = 128) => CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
         public DateTimeOffset CreatedAt => DateTimeUtils.FromSnowflake(Id);
         public string Discriminator => DiscriminatorValue.ToString("D4");
         public string Mention => MentionUtils.MentionUser(Id);

src/Discord.Net.Rpc/Entities/Users/RpcUser.cs

@@ -14,7 +14,7 @@ namespace Discord.Rpc
         public ushort DiscriminatorValue { get; private set; }
         public string AvatarId { get; private set; }
 
-        public string AvatarUrl => CDN.GetUserAvatarUrl(Id, AvatarId);
+        public string GetAvatarUrl(AvatarFormat format = AvatarFormat.Png, ushort size = 128) => CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
         public DateTimeOffset CreatedAt => DateTimeUtils.FromSnowflake(Id);
         public string Discriminator => DiscriminatorValue.ToString("D4");
         public string Mention => MentionUtils.MentionUser(Id);

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

@@ -15,7 +15,7 @@ namespace Discord.WebSocket
         internal abstract SocketGlobalUser GlobalUser { get; }
         internal abstract SocketPresence Presence { get; set; }
 
-        public string AvatarUrl => CDN.GetUserAvatarUrl(Id, AvatarId);
+        public string GetAvatarUrl(AvatarFormat format = AvatarFormat.Png, ushort size = 128) => CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
         public DateTimeOffset CreatedAt => DateTimeUtils.FromSnowflake(Id);
         public string Discriminator => DiscriminatorValue.ToString("D4");
         public string Mention => MentionUtils.MentionUser(Id);