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

Added IUser.DiscriminatorValue

Browse Source
This commit is contained in:
RogueException
2016-06-26 01:55:33 -03:00
parent 250a7deba7
commit 2c87e496e1
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Discord.Net/Entities/Users/GuildUser.cs
View File

@@ -27,6 +27,7 @@ namespace Discord
public string AvatarUrl => User.AvatarUrl;
public DateTimeOffset CreatedAt => User.CreatedAt;
public string Discriminator => User.Discriminator;
public ushort DiscriminatorValue => User.DiscriminatorValue;
public bool IsAttached => User.IsAttached;
public bool IsBot => User.IsBot;
public string Mention => User.Mention;

4
src/Discord.Net/Entities/Users/IUser.cs
View File

@@ -1,5 +1,3 @@
using System.Threading.Tasks;
namespace Discord
{
public interface IUser : ISnowflakeEntity, IMentionable, IPresence
@@ -8,6 +6,8 @@ namespace Discord
string AvatarUrl { get; }
/// <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>
ushort DiscriminatorValue { get; }
/// <summary> Returns true if this user is a bot account. </summary>
bool IsBot { get; }
/// <summary> Gets the username for this user. </summary>

6
src/Discord.Net/Entities/Users/User.cs
View File

@@ -8,15 +8,15 @@ namespace Discord
internal class User : SnowflakeEntity, IUser
{
private string _avatarId;
private ushort _discriminator;
public bool IsBot { get; private set; }
public string Username { get; private set; }
public ushort DiscriminatorValue { get; private set; }
public override DiscordClient Discord { get { throw new NotSupportedException(); } }
public string AvatarUrl => API.CDN.GetUserAvatarUrl(Id, _avatarId);
public string Discriminator => _discriminator.ToString("D4");
public string Discriminator => DiscriminatorValue.ToString("D4");
public string Mention => MentionUtils.Mention(this, false);
public string NicknameMention => MentionUtils.Mention(this, true);
public virtual Game Game => null;
@@ -32,7 +32,7 @@ namespace Discord
if (source == UpdateSource.Rest && IsAttached) return;
_avatarId = model.Avatar;
_discriminator = ushort.Parse(model.Discriminator);
DiscriminatorValue = ushort.Parse(model.Discriminator);
IsBot = model.Bot;
Username = model.Username;
}

1
src/Discord.Net/Entities/WebSocket/CachedDMUser.cs
View File

@@ -16,6 +16,7 @@ namespace Discord
public string AvatarUrl => User.AvatarUrl;
public DateTimeOffset CreatedAt => User.CreatedAt;
public string Discriminator => User.Discriminator;
public ushort DiscriminatorValue => User.DiscriminatorValue;
public bool IsAttached => User.IsAttached;
public bool IsBot => User.IsBot;
public string Mention => User.Mention;