From 031d17830363a9b4364a398f002f95e245bd475d Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sun, 12 Jun 2016 20:30:10 -0300
Subject: [PATCH] Added nick to PRESENCE_UPDATE

---
 src/Discord.Net/API/Common/Presence.cs      | 7 +++++--
 src/Discord.Net/DiscordSocketClient.cs      | 2 +-
 src/Discord.Net/Entities/Users/GuildUser.cs | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Discord.Net/API/Common/Presence.cs b/src/Discord.Net/API/Common/Presence.cs
index 9cf5e1d5b..16462fa30 100644
--- a/src/Discord.Net/API/Common/Presence.cs
+++ b/src/Discord.Net/API/Common/Presence.cs
@@ -8,11 +8,14 @@ namespace Discord.API
         public User User { get; set; }
         [JsonProperty("guild_id")]
         public Optional<ulong> GuildId { get; set; }
-        [JsonProperty("roles")]
-        public Optional<ulong[]> Roles { get; set; }
         [JsonProperty("status")]
         public UserStatus Status { get; set; }
         [JsonProperty("game")]
         public Game Game { get; set; }
+
+        [JsonProperty("roles")]
+        public Optional<ulong[]> Roles { get; set; }
+        [JsonProperty("nick")]
+        public Optional<string> Nick { get; set; }
     }
 }
diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs
index 98cbf3ff3..4255a8fa2 100644
--- a/src/Discord.Net/DiscordSocketClient.cs
+++ b/src/Discord.Net/DiscordSocketClient.cs
@@ -853,7 +853,7 @@ namespace Discord
                                         else
                                         {
                                             guild.AddOrUpdatePresence(data);
-                                            if (data.Roles.IsSpecified) //Happens when a user we haven't seen before logs in
+                                            if (data.Roles.IsSpecified || data.Nick.IsSpecified) //Happens when a user we haven't seen before logs in
                                             {
                                                 CachedGuildUser user = guild.GetUser(data.User.Id);
                                                 if (user == null)
diff --git a/src/Discord.Net/Entities/Users/GuildUser.cs b/src/Discord.Net/Entities/Users/GuildUser.cs
index b95b943a7..7e215c170 100644
--- a/src/Discord.Net/Entities/Users/GuildUser.cs
+++ b/src/Discord.Net/Entities/Users/GuildUser.cs
@@ -74,6 +74,8 @@ namespace Discord
             
             if (model.Roles.IsSpecified)
                 UpdateRoles(model.Roles.Value);
+            if (model.Nick.IsSpecified)
+                Nickname = model.Nick.Value;
         }
         public void Update(VoiceStateModel model, UpdateSource source)
         {