From bfe2b4fc031f92153da777225a691f99c34aad76 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 10 Feb 2017 03:10:30 -0500
Subject: [PATCH] Fix Member.display_name to work.

---
 discord/member.py | 10 ++++++++++
 discord/user.py   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/discord/member.py b/discord/member.py
index 054328918..2100e5ff3 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -246,6 +246,16 @@ class Member(discord.abc.Messageable):
             return '<@!{}>'.format(self.id)
         return '<@{}>'.format(self.id)
 
+    @property
+    def display_name(self):
+        """Returns the user's display name.
+
+        For regular users this is just their username, but
+        if they have a guild specific nickname then that
+        is returned instead.
+        """
+        return self.nick if self.nick is not None else self.name
+
     def mentioned_in(self, message):
         """Checks if the member is mentioned in the specified message.
 
diff --git a/discord/user.py b/discord/user.py
index cadf84dbe..0cde6ea07 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -120,7 +120,7 @@ class BaseUser:
         if they have a guild specific nickname then that
         is returned instead.
         """
-        return getattr(self, 'nick', None) or self.name
+        return self.name
 
     def mentioned_in(self, message):
         """Checks if the user is mentioned in the specified message.