From 7fd17420d3b0667abd1f9d4c7819b7f5677eb7f0 Mon Sep 17 00:00:00 2001
From: EdVraz <88881326+EdVraz@users.noreply.github.com>
Date: Thu, 21 Apr 2022 21:22:36 +0200
Subject: [PATCH 1/4] feat: implement name property for the member object

---
 interactions/api/models/member.py  | 12 +++++++++++-
 interactions/api/models/member.pyi |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/interactions/api/models/member.py b/interactions/api/models/member.py
index e49f63af6..20c49d630 100644
--- a/interactions/api/models/member.py
+++ b/interactions/api/models/member.py
@@ -83,7 +83,7 @@ def __init__(self, **kwargs):
             self.avatar = self.user.avatar
 
     def __repr__(self) -> str:
-        return self.user.username if self.user else self.nick
+        return self.nick or (self.user.username if self.user else None)
 
     @property
     def id(self) -> Snowflake:
@@ -105,6 +105,16 @@ def mention(self) -> str:
         """
         return f"<@!{self.user.id}>" if self.nick else f"<@{self.user.id}>"
 
+    @property
+    def name(self) -> str:
+        """
+        Returns a string of whether the users nickname or its username, if a nickname isn't present
+
+        :return: The name of the member
+        :rtype: str
+        """
+        return self.nick or (self.user.username if self.user else None)
+
     async def ban(
         self,
         guild_id: int,
diff --git a/interactions/api/models/member.pyi b/interactions/api/models/member.pyi
index 475dc40d6..2224933ac 100644
--- a/interactions/api/models/member.pyi
+++ b/interactions/api/models/member.pyi
@@ -33,6 +33,8 @@ class Member(DictSerializerMixin):
     def mention(self) -> str: ...
     @property
     def id(self) -> Snowflake: ...
+    @property
+    def name(self) -> str: ...
     async def ban(
         self,
         guild_id: int,

From 3574ca97054576882bfa9988de7ec8bcbd361907 Mon Sep 17 00:00:00 2001
From: EdVraz <88881326+EdVraz@users.noreply.github.com>
Date: Fri, 22 Apr 2022 18:13:19 +0200
Subject: [PATCH 2/4] Apply suggestions from code review

Co-authored-by: Toricane <73972068+Toricane@users.noreply.github.com>
---
 interactions/api/models/member.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interactions/api/models/member.py b/interactions/api/models/member.py
index 20c49d630..224c08cb6 100644
--- a/interactions/api/models/member.py
+++ b/interactions/api/models/member.py
@@ -108,7 +108,7 @@ def mention(self) -> str:
     @property
     def name(self) -> str:
         """
-        Returns a string of whether the users nickname or its username, if a nickname isn't present
+        returns the string of either the user's nickname or username
 
         :return: The name of the member
         :rtype: str

From 491bf27e09792c18f633870af9a24002fd3eb1ad Mon Sep 17 00:00:00 2001
From: EdVraz <88881326+EdVraz@users.noreply.github.com>
Date: Fri, 22 Apr 2022 18:13:42 +0200
Subject: [PATCH 3/4] Apply suggestions from code review

---
 interactions/api/models/member.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interactions/api/models/member.py b/interactions/api/models/member.py
index 224c08cb6..d0152fda7 100644
--- a/interactions/api/models/member.py
+++ b/interactions/api/models/member.py
@@ -108,7 +108,7 @@ def mention(self) -> str:
     @property
     def name(self) -> str:
         """
-        returns the string of either the user's nickname or username
+        Returns the string of either the user's nickname or username.
 
         :return: The name of the member
         :rtype: str

From b38014886c12b06e1e90c3c8aa2ea6c7fdc072eb Mon Sep 17 00:00:00 2001
From: EdVraz <88881326+EdVraz@users.noreply.github.com>
Date: Sun, 24 Apr 2022 21:31:48 +0200
Subject: [PATCH 4/4] Update interactions/api/models/member.py

---
 interactions/api/models/member.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interactions/api/models/member.py b/interactions/api/models/member.py
index d0152fda7..42bd0ea2e 100644
--- a/interactions/api/models/member.py
+++ b/interactions/api/models/member.py
@@ -83,7 +83,7 @@ def __init__(self, **kwargs):
             self.avatar = self.user.avatar
 
     def __repr__(self) -> str:
-        return self.nick or (self.user.username if self.user else None)
+        return self.name
 
     @property
     def id(self) -> Snowflake: