From 2b8184f1ae151291e59145d68ec15d67bf543e00 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Fri, 11 Dec 2015 09:33:11 -0400
Subject: [PATCH] Removed trackactivity conditionals

---
 src/Discord.Net/DiscordClient.Messages.cs | 19 ++++++------
 src/Discord.Net/DiscordClient.cs          | 36 +++++++----------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs
index 7a853b1d8..a21fcbddc 100644
--- a/src/Discord.Net/DiscordClient.Messages.cs
+++ b/src/Discord.Net/DiscordClient.Messages.cs
@@ -275,9 +275,7 @@ namespace Discord
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (count < 0) throw new ArgumentNullException(nameof(count));
 			CheckReady();
-
-			bool trackActivity = Config.TrackActivity;
-
+            
 			if (count == 0) return new Message[0];
 			if (channel != null && channel.Type == ChannelType.Text)
 			{
@@ -290,12 +288,9 @@ namespace Discord
 						if (useCache)
 						{
 							msg = _messages.GetOrAdd(x.Id, x.ChannelId, x.Author.Id);
-							if (trackActivity)
-							{
-								var user = msg.User;
-								if (user != null)
-									user.UpdateActivity(msg.EditedTimestamp ?? msg.Timestamp);
-							}
+							var user = msg.User;
+							if (user != null)
+								user.UpdateActivity(msg.EditedTimestamp ?? msg.Timestamp);
 						}
 						else
 							msg = /*_messages[x.Id] ??*/ new Message(this, x.Id, x.ChannelId, x.Author.Id);
@@ -338,6 +333,12 @@ namespace Discord
 				})
 				.ToDictionary(x => x.Id);
 			_messages.Import(dic);
+            foreach (var msg in dic.Values)
+            {
+                var user = msg.User;
+                if (user != null)
+                    user.UpdateActivity(msg.EditedTimestamp ?? msg.Timestamp);
+            }
 			return dic.Values;
 		}
 
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index cf603f0b4..f7797dd57 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -147,7 +147,7 @@ namespace Discord
                 RaiseDisconnected(e);
             };
 
-            _webSocket.ReceivedDispatch += async (s, e) => await OnReceivedEvent(e).ConfigureAwait(false);
+            _webSocket.ReceivedDispatch += (s, e) => OnReceivedEvent(e);
 
             _api = new DiscordAPIClient(_config);
 			if (Config.UseMessageQueue)
@@ -419,7 +419,7 @@ namespace Discord
 			_privateUser = null;
 		}
 		
-		private async Task OnReceivedEvent(WebSocketEventEventArgs e)
+		private void OnReceivedEvent(WebSocketEventEventArgs e)
 		{
 			try
 			{
@@ -533,8 +533,7 @@ namespace Discord
 							var data = e.Payload.ToObject<MemberAddEvent>(_webSocket.Serializer);
 							var user = _users.GetOrAdd(data.User.Id, data.GuildId);
 							user.Update(data);
-							if (Config.TrackActivity)
-								user.UpdateActivity();
+							user.UpdateActivity();
 							RaiseUserJoined(user);
 						}
 						break;
@@ -653,16 +652,9 @@ namespace Discord
                             }
 
 							msg.Update(data);
-							if (Config.TrackActivity)
-							{
-								var channel = msg.Channel;
-								if (channel?.IsPrivate == false)
-								{
-									var user = msg.User;
-									if (user != null)
-										user.UpdateActivity(data.Timestamp);
-								}
-							}
+							var user = msg.User;
+                            if (user != null)
+                                user.UpdateActivity();// data.Timestamp);
 
                             //Remapped queued message
                             if (nonce != 0)
@@ -726,18 +718,10 @@ namespace Discord
 								if (user != null)
 								{
 									if (channel != null)
-										RaiseUserIsTyping(user, channel);
-								}
-
-								if (Config.TrackActivity)
-								{
-									if (!channel.IsPrivate)
-									{
-										if (user != null)
-											user.UpdateActivity();
-									}
-								}
-							}
+										RaiseUserIsTyping(user, channel);                                
+									user.UpdateActivity();
+                                }
+                            }
 						}
 						break;