From 8d17aa23c958050ae0c04ae0dbfb1b49c1426a6e Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 19 May 2023 20:24:23 -0400
Subject: [PATCH] Remove @ prefix from usernames

Discord seemed to have backtracked on this display
---
 discord/member.py | 2 +-
 discord/team.py   | 2 +-
 discord/user.py   | 6 +++---
 discord/widget.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/discord/member.py b/discord/member.py
index a45fcae43..b2a819732 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -274,7 +274,7 @@ class Member(discord.abc.Messageable, _UserTag):
 
         .. describe:: str(x)
 
-            Returns the member's handle (e.g. ``@user`` or ``user#discriminator``).
+            Returns the member's handle (e.g. ``name`` or ``name#discriminator``).
 
     Attributes
     ----------
diff --git a/discord/team.py b/discord/team.py
index 89bc2cfa1..6d441078e 100644
--- a/discord/team.py
+++ b/discord/team.py
@@ -108,7 +108,7 @@ class TeamMember(BaseUser):
 
         .. describe:: str(x)
 
-            Returns the team member's handle (e.g. ``@user`` or ``user#discriminator``).
+            Returns the team member's handle (e.g. ``name`` or ``name#discriminator``).
 
     .. versionadded:: 1.3
 
diff --git a/discord/user.py b/discord/user.py
index 6b3a041bb..04efd9653 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -100,7 +100,7 @@ class BaseUser(_UserTag):
 
     def __str__(self) -> str:
         if self.discriminator == '0':
-            return f'@{self.name}'
+            return self.name
         return f'{self.name}#{self.discriminator}'
 
     def __eq__(self, other: object) -> bool:
@@ -319,7 +319,7 @@ class ClientUser(BaseUser):
 
         .. describe:: str(x)
 
-            Returns the user's handle (e.g. ``@user`` or ``user#discriminator``).
+            Returns the user's handle (e.g. ``name`` or ``name#discriminator``).
 
     Attributes
     -----------
@@ -459,7 +459,7 @@ class User(BaseUser, discord.abc.Messageable):
 
         .. describe:: str(x)
 
-            Returns the user's handle (e.g. ``@user`` or ``user#discriminator``).
+            Returns the user's handle (e.g. ``name`` or ``name#discriminator``).
 
     Attributes
     -----------
diff --git a/discord/widget.py b/discord/widget.py
index 268173585..822008665 100644
--- a/discord/widget.py
+++ b/discord/widget.py
@@ -121,7 +121,7 @@ class WidgetMember(BaseUser):
 
         .. describe:: str(x)
 
-            Returns the widget member's handle (e.g. ``@user`` or ``user#discriminator``).
+            Returns the widget member's handle (e.g. ``name`` or ``name#discriminator``).
 
     Attributes
     -----------