From d7928622f3436b49877a8ad97809a2a6d0db5cbc Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Mon, 3 Apr 2017 20:41:05 -0300
Subject: [PATCH] Guild presence should update global. Cleaned up.

---
 .../Entities/Users/SocketGlobalUser.cs                     | 6 ++++++
 .../Entities/Users/SocketGuildUser.cs                      | 7 ++++---
 src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs     | 6 ------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs
index 496ca7073..0cd5f749e 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using Model = Discord.API.User;
+using PresenceModel = Discord.API.Presence;
 
 namespace Discord.WebSocket
 {
@@ -47,6 +48,11 @@ namespace Discord.WebSocket
             }
         }
         
+        internal void Update(ClientState state, PresenceModel model)
+        {
+            Presence = SocketPresence.Create(model);
+        }
+        
         internal new SocketGlobalUser Clone() => MemberwiseClone() as SocketGlobalUser;
     }
 }
diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
index 63dc64dbf..f3c9166c4 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
@@ -99,12 +99,13 @@ namespace Discord.WebSocket
             if (model.Roles.IsSpecified)
                 UpdateRoles(model.Roles.Value);
         }
-        internal override void Update(ClientState state, PresenceModel model)
-            => Update(state, model, true);
         internal void Update(ClientState state, PresenceModel model, bool updatePresence)
         {
             if (updatePresence)
-                base.Update(state, model);
+            {
+                Presence = SocketPresence.Create(model);
+                GlobalUser.Update(state, model);
+            }
             if (model.Nick.IsSpecified)
                 Nickname = model.Nick.Value;
             if (model.Roles.IsSpecified)
diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
index 12f1b2b30..da15ccbf9 100644
--- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
+++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Threading.Tasks;
 using Model = Discord.API.User;
-using PresenceModel = Discord.API.Presence;
 
 namespace Discord.WebSocket
 {
@@ -55,11 +54,6 @@ namespace Discord.WebSocket
             }
             return hasChanges;
         }
-        internal virtual void Update(ClientState state, PresenceModel model)
-        {
-            Presence = SocketPresence.Create(model);
-            //Update(state, model.User);
-        }
 
         public Task<RestDMChannel> CreateDMChannelAsync(RequestOptions options = null)
             => UserHelper.CreateDMChannelAsync(this, Discord, options);