Browse Source

Amendment

pull/1000/head
HelpfulStranger999 8 years ago
parent
commit
086267487c
4 changed files with 0 additions and 22 deletions
  1. +0
    -2
      src/Discord.Net.Core/CDN.cs
  2. +0
    -6
      src/Discord.Net.Core/Entities/Users/IUser.cs
  3. +0
    -7
      src/Discord.Net.Rest/Entities/Users/RestUser.cs
  4. +0
    -7
      src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

+ 0
- 2
src/Discord.Net.Core/CDN.cs View File

@@ -13,8 +13,6 @@ namespace Discord
string extension = FormatToExtension(format, avatarId); string extension = FormatToExtension(format, avatarId);
return $"{DiscordConfig.CDNUrl}avatars/{userId}/{avatarId}.{extension}?size={size}"; 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) 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)


+ 0
- 6
src/Discord.Net.Core/Entities/Users/IUser.cs View File

@@ -8,10 +8,6 @@ namespace Discord
string AvatarId { get; } string AvatarId { get; }
/// <summary> Gets the url to this user's custom avatar. </summary> /// <summary> Gets the url to this user's custom avatar. </summary>
string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128); 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> /// <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>
@@ -20,8 +16,6 @@ namespace Discord
bool IsBot { get; } bool IsBot { get; }
/// <summary> Returns true if this user is a webhook user. </summary> /// <summary> Returns true if this user is a webhook user. </summary>
bool IsWebhook { get; } 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> /// <summary> Gets the username for this user. </summary>
string Username { get; } string Username { get; }




+ 0
- 7
src/Discord.Net.Rest/Entities/Users/RestUser.cs View File

@@ -19,7 +19,6 @@ namespace Discord.Rest
public virtual IActivity Activity => null; public virtual IActivity Activity => null;
public virtual UserStatus Status => UserStatus.Offline; public virtual UserStatus Status => UserStatus.Offline;
public virtual bool IsWebhook => false; public virtual bool IsWebhook => false;
public bool HasCustomAvatar => AvatarId != null;


internal RestUser(BaseDiscordClient discord, ulong id) internal RestUser(BaseDiscordClient discord, ulong id)
: base(discord, id) : base(discord, id)
@@ -61,12 +60,6 @@ namespace Discord.Rest
public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128) public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
=> CDN.GetUserAvatarUrl(Id, AvatarId, size, format); => 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}"; public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})"; private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";




+ 0
- 7
src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs View File

@@ -20,7 +20,6 @@ namespace Discord.WebSocket
public string Mention => MentionUtils.MentionUser(Id); public string Mention => MentionUtils.MentionUser(Id);
public IActivity Activity => Presence.Activity; public IActivity Activity => Presence.Activity;
public UserStatus Status => Presence.Status; public UserStatus Status => Presence.Status;
public bool HasCustomAvatar => AvatarId != null;


internal SocketUser(DiscordSocketClient discord, ulong id) internal SocketUser(DiscordSocketClient discord, ulong id)
: base(discord, id) : base(discord, id)
@@ -62,12 +61,6 @@ namespace Discord.WebSocket
public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128) public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
=> CDN.GetUserAvatarUrl(Id, AvatarId, size, format); => 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}"; public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})"; private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
internal SocketUser Clone() => MemberwiseClone() as SocketUser; internal SocketUser Clone() => MemberwiseClone() as SocketUser;


Loading…
Cancel
Save