From 2c87e496e19c1af774e605851b91efe78c133178 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sun, 26 Jun 2016 01:55:33 -0300
Subject: [PATCH] Added IUser.DiscriminatorValue

---
 src/Discord.Net/Entities/Users/GuildUser.cs        | 1 +
 src/Discord.Net/Entities/Users/IUser.cs            | 4 ++--
 src/Discord.Net/Entities/Users/User.cs             | 6 +++---
 src/Discord.Net/Entities/WebSocket/CachedDMUser.cs | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Discord.Net/Entities/Users/GuildUser.cs b/src/Discord.Net/Entities/Users/GuildUser.cs
index 7f21ee279..31ea9f01c 100644
--- a/src/Discord.Net/Entities/Users/GuildUser.cs
+++ b/src/Discord.Net/Entities/Users/GuildUser.cs
@@ -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;
diff --git a/src/Discord.Net/Entities/Users/IUser.cs b/src/Discord.Net/Entities/Users/IUser.cs
index 44297f12e..5eef8231c 100644
--- a/src/Discord.Net/Entities/Users/IUser.cs
+++ b/src/Discord.Net/Entities/Users/IUser.cs
@@ -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>
diff --git a/src/Discord.Net/Entities/Users/User.cs b/src/Discord.Net/Entities/Users/User.cs
index fdfc06abf..490128e82 100644
--- a/src/Discord.Net/Entities/Users/User.cs
+++ b/src/Discord.Net/Entities/Users/User.cs
@@ -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;
         }
diff --git a/src/Discord.Net/Entities/WebSocket/CachedDMUser.cs b/src/Discord.Net/Entities/WebSocket/CachedDMUser.cs
index de69c7c91..78d78933f 100644
--- a/src/Discord.Net/Entities/WebSocket/CachedDMUser.cs
+++ b/src/Discord.Net/Entities/WebSocket/CachedDMUser.cs
@@ -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;