From 133e8d3a447d7bb012cb8a97b0aeef12d4ac9025 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 29 Apr 2016 06:39:21 -0400
Subject: Add support for server specific nicknames.

---
 discord/user.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'discord/user.py')

diff --git a/discord/user.py b/discord/user.py
index 822f7be1..b1cc0b4c 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -125,3 +125,14 @@ class User:
         This is when the user's discord account was created."""
         return snowflake_time(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 server specific nickname then that
+        is returned instead.
+        """
+        nickname = getattr(self, 'nick', None)
+        return nickname if nickname is not None else self.name
+
-- 
cgit v1.2.3