github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatic animated avatar detection

Browse Source
This commit is contained in:
james7132
2017-03-15 00:33:07 +00:00
parent 506b4ff36a
commit bfc4fd686e
6 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Discord.Net.Core/CDN.cs
View File

@@ -4,8 +4,15 @@
{ {
public static string GetApplicationIconUrl(ulong appId, string iconId) public static string GetApplicationIconUrl(ulong appId, string iconId)
=> iconId != null ? $"{DiscordConfig.CDNUrl}app-icons/{appId}/{iconId}.jpg" : null; => iconId != null ? $"{DiscordConfig.CDNUrl}app-icons/{appId}/{iconId}.jpg" : null;
public static string GetUserAvatarUrl(ulong userId, string avatarId, ushort size, AvatarFormat format) 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; if (avatarId == null)
return null;
var base = $"{DiscordConfig.CDNUrl}avatars/{userId}/{avatarId}";
if (format == AvatarFormat.Auto)
return base + (avatarId.StartsWith("a_") ? "gif" : "png") + $"?size={size}";
else
return base + format.ToString().ToLower() + $"?size={size}";
}
public static string GetGuildIconUrl(ulong guildId, string iconId) public static string GetGuildIconUrl(ulong guildId, string iconId)
=> iconId != null ? $"{DiscordConfig.CDNUrl}icons/{guildId}/{iconId}.jpg" : null; => iconId != null ? $"{DiscordConfig.CDNUrl}icons/{guildId}/{iconId}.jpg" : null;
public static string GetGuildSplashUrl(ulong guildId, string splashId) public static string GetGuildSplashUrl(ulong guildId, string splashId)

1
src/Discord.Net.Core/Entities/Users/AvatarFormat.cs
View File

@@ -2,6 +2,7 @@
{ {
public enum AvatarFormat public enum AvatarFormat
{ {
Auto,
WebP, WebP,
Png, Png,
Jpeg, Jpeg,

2
src/Discord.Net.Core/Entities/Users/IUser.cs
View File

@@ -7,7 +7,7 @@ namespace Discord
/// <summary> Gets the id of this user's avatar. </summary> /// <summary> Gets the id of this user's avatar. </summary>
string AvatarId { get; } string AvatarId { get; }
/// <summary> Gets the url to this user's avatar. </summary> /// <summary> Gets the url to this user's avatar. </summary>
string GetAvatarUrl(AvatarFormat format = AvatarFormat.Png, ushort size = 128); string GetAvatarUrl(AvatarFormat format = AvatarFormat.Auto, ushort size = 128);
/// <summary> Gets the per-username unique id for this user. </summary> /// <summary> Gets the per-username unique id for this user. </summary>
string Discriminator { get; } string Discriminator { get; }
/// <summary> Gets the per-username unique id for this user. </summary> /// <summary> Gets the per-username unique id for this user. </summary>

2
src/Discord.Net.Rest/Entities/Users/RestUser.cs
View File

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

2
src/Discord.Net.Rpc/Entities/Users/RpcUser.cs
View File

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

2
src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
View File

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