From c81ea9441c49505801f2990114259dc4f8d2d92d Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 21 May 2017 20:49:34 +0200
Subject: [PATCH] user update fixes

---
 Maki/Discord.cs               | 9 +++++++++
 Maki/DiscordUser.cs           | 6 +++---
 Maki/Structures/Users/User.cs | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Maki/Discord.cs b/Maki/Discord.cs
index 5d81cd2..4fe95ec 100644
--- a/Maki/Discord.cs
+++ b/Maki/Discord.cs
@@ -723,6 +723,15 @@ namespace Maki
         {
             DiscordMember member = members.Find(x => x.User.Id == presence.User.Id && x.Server.Id == presence.Guild);
 
+            if (!string.IsNullOrEmpty(presence.User.Username))
+                member.User.Username = presence.User.Username;
+
+            if (presence.User.Tag.HasValue)
+                member.User.Tag = presence.User.Tag.Value;
+
+            if (!string.IsNullOrEmpty(presence.User.AvatarHash))
+                member.User.avatarHash = presence.User.AvatarHash;
+
             member.User.Game = presence.Game.HasValue ? new DiscordGame(presence.Game.Value) : null;
 
             if (presence.Roles != null)
diff --git a/Maki/DiscordUser.cs b/Maki/DiscordUser.cs
index 99d9b8a..432c76e 100644
--- a/Maki/DiscordUser.cs
+++ b/Maki/DiscordUser.cs
@@ -20,11 +20,11 @@ namespace Maki
         public DiscordUserStatus Status { get; internal set; }
         public DiscordGame Game { get; internal set; }
 
+        internal string avatarHash;
+
         public string NameWithTag => $"{Username}#{Tag:0000}";
         public override string ToString() => $"<@{Id}>";
 
-        private string avatarHash;
-
         public string Avatar(string ext = @"png", int size = 128) => RestEndpoints.CDN_URL + $@"/avatars/{Id}/{avatarHash}.{ext}?size={size}";
 
         internal DiscordUser(Discord discord, User user)
@@ -33,7 +33,7 @@ namespace Maki
             Id = user.Id;
             Created = Utility.FromDiscordTimeMilliseconds((long) Id >> 22);
             Username = user.Username;
-            Tag = user.Tag;
+            Tag = user.Tag.Value;
             IsBot = user.IsBot;
             HasMFA = user.HasMFA;
             IsVerified = user.IsVerified;
diff --git a/Maki/Structures/Users/User.cs b/Maki/Structures/Users/User.cs
index 9ebd6d2..730af20 100644
--- a/Maki/Structures/Users/User.cs
+++ b/Maki/Structures/Users/User.cs
@@ -29,7 +29,7 @@ namespace Maki.Structures.Users
         /// the user's 4-digit discord-tag
         /// </summary>
         [JsonProperty("discriminator")]
-        public ushort Tag;
+        public ushort? Tag;
 
         /// <summary>
         /// the user's avatar hash