From 13418771d1db30c6001f7d3fdfc98ea80ecab0f8 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Thu, 4 May 2023 21:56:34 -0400
Subject: [PATCH] Only use @ prefix in __str__ if the user is migrated

---
 discord/member.py | 2 +-
 discord/team.py   | 2 +-
 discord/user.py   | 8 +++++---
 discord/widget.py | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/discord/member.py b/discord/member.py
index 7f04f33a8..14c69bb64 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -243,7 +243,7 @@ class Member(discord.abc.Messageable, discord.abc.Connectable, _UserTag):
 
         .. describe:: str(x)
 
-            Returns the member's name with a ``@``.
+            Returns the member's handle (e.g. ``@user`` or ``user#discriminator``).
 
     Attributes
     ----------
diff --git a/discord/team.py b/discord/team.py
index 75ea25c00..480336632 100644
--- a/discord/team.py
+++ b/discord/team.py
@@ -497,7 +497,7 @@ class TeamMember(User):
 
         .. describe:: str(x)
 
-            Returns the team member's name with a ``@``.
+            Returns the team member's handle (e.g. ``@user`` or ``user#discriminator``).
 
     .. versionadded:: 1.3
 
diff --git a/discord/user.py b/discord/user.py
index 6957b3bea..179e224db 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -277,7 +277,9 @@ class BaseUser(_UserTag):
         )
 
     def __str__(self) -> str:
-        return f'@{self.name}'
+        if self.discriminator == '0':
+            return f'@{self.name}'
+        return f'{self.name}#{self.discriminator}'
 
     def __eq__(self, other: object) -> bool:
         return isinstance(other, _UserTag) and other.id == self.id
@@ -609,7 +611,7 @@ class ClientUser(BaseUser):
 
         .. describe:: str(x)
 
-            Returns the user's name with a ``@``.
+            Returns the user's handle (e.g. ``@user`` or ``user#discriminator``).
 
     .. versionchanged:: 2.0
         :attr:`Locale` is now a :class:`Locale` instead of a Optional[:class:`str`].
@@ -947,7 +949,7 @@ class User(BaseUser, discord.abc.Connectable, discord.abc.Messageable):
 
         .. describe:: str(x)
 
-            Returns the user's name with a ``@``.
+            Returns the user's handle (e.g. ``@user`` or ``user#discriminator``).
 
     Attributes
     -----------
diff --git a/discord/widget.py b/discord/widget.py
index 08e3fa0b1..56ae046ed 100644
--- a/discord/widget.py
+++ b/discord/widget.py
@@ -121,7 +121,7 @@ class WidgetMember(BaseUser):
 
         .. describe:: str(x)
 
-            Returns the widget member's name with a ``@``.
+            Returns the widget member's handle (e.g. ``@user`` or ``user#discriminator``).
 
     Attributes
     -----------