From 41125c41db7dae874dc7ad62d3b064342db4c14f Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 16 Feb 2016 16:40:24 -0400
Subject: [PATCH] Fixed Channel.GetUser

---
 src/Discord.Net/Models/Channel.cs | 34 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs
index 3023c76e3..02bd78b0b 100644
--- a/src/Discord.Net/Models/Channel.cs
+++ b/src/Discord.Net/Models/Channel.cs
@@ -547,35 +547,31 @@ namespace Discord
         }
         public User GetUser(ulong id)
         {
-            if (!Client.Config.UsePermissionsCache)
+            if (IsPrivate)
             {
-                if (Server != null)
-                {
-                    var user = Server.GetUser(id);
-                    if (user != null)
-                    {
-                        ChannelPermissions perms = new ChannelPermissions();
-                        UpdatePermissions(user, ref perms);
-                        if (perms.ReadMessages)
-                            return user;
-                    }
-                }
-                else
+                if (id == Recipient.Id)
+                    return Recipient;
+                else if (id == Client.PrivateUser.Id)
+                    return Client.PrivateUser;
+            }
+            else if (!Client.Config.UsePermissionsCache)
+            {
+                var user = Server.GetUser(id);
+                if (user != null)
                 {
-                    if (id == Recipient.Id)
-                        return Recipient;
-                    else if (id == Client.PrivateUser.Id)
-                        return Client.PrivateUser;
+                    ChannelPermissions perms = new ChannelPermissions();
+                    UpdatePermissions(user, ref perms);
+                    if (perms.ReadMessages)
+                        return user;
                 }
-                return null;
             }
             else
             {
                 Member result;
                 if (_users.TryGetValue(id, out result))
                     return result.User;
-                return null;
             }
+            return null;
         }
         #endregion