feat!: pomelo

discord/abc.py

@@ -215,6 +215,14 @@ class User(Snowflake, Protocol):
         The user's username.
     discriminator: :class:`str`
         The user's discriminator.
+
+        .. note::
+
+            If the user has migrated to the new username system, this will always be "0".
+    global_name: :class:`str`
+        The user's global name.
+
+        .. versionadded:: 2.5
     avatar: :class:`~discord.Asset`
         The avatar asset the user has.
     bot: :class:`bool`
@@ -225,6 +233,7 @@ class User(Snowflake, Protocol):
 
     name: str
     discriminator: str
+    global_name: str | None
     avatar: Asset
     bot: bool
 

discord/enums.py

@@ -37,7 +37,6 @@
     "VerificationLevel",
     "ContentFilter",
     "Status",
-    "DefaultAvatar",
     "AuditLogAction",
     "AuditLogActionCategory",
     "UserFlags",
@@ -354,20 +353,6 @@ def __str__(self):
         return self.value
 
 
-class DefaultAvatar(Enum):
-    """Default avatar"""
-
-    blurple = 0
-    grey = 1
-    gray = 1
-    green = 2
-    orange = 3
-    red = 4
-
-    def __str__(self):
-        return self.name
-
-
 class NotificationLevel(Enum, comparable=True):
     """Notification level"""
 

discord/ext/commands/converter.py

@@ -199,11 +199,11 @@ async def query_member_named(self, guild, argument):
             return discord.utils.get(
                 members, name=username, discriminator=discriminator
             )
-        else:
-            members = await guild.query_members(argument, limit=100, cache=cache)
-            return discord.utils.find(
-                lambda m: m.name == argument or m.nick == argument, members
-            )
+        members = await guild.query_members(argument, limit=100, cache=cache)
+        return discord.utils.find(
+            lambda m: argument in (m.nick, m.name, m.global_name),
+            members,
+        )
 
     async def query_member_by_id(self, bot, guild, user_id):
         ws = bot._get_websocket(shard_id=guild.shard_id)
@@ -320,7 +320,7 @@ async def convert(self, ctx: Context, argument: str) -> discord.User:
             if result is not None:
                 return result
 
-        predicate = lambda u: u.name == arg
+        predicate = lambda u: arg in (u.name, u.global_name)
         result = discord.utils.find(predicate, state._users.values())
 
         if result is None:

discord/guild.py

@@ -1068,10 +1068,7 @@
             if result is not None:
                 return result
 
-        def pred(m: Member) -> bool:
-            return m.nick == name or m.name == name
-
-        return utils.find(pred, members)
+        return utils.find(lambda m: name in (m.nick, m.name, m.global_name), members)
 
     def _create_channel(
         self,

discord/member.py

@@ -230,7 +230,7 @@
 
         .. describe:: str(x)
 
-            Returns the member's name with the discriminator.
+            Returns the member's name with the discriminator or global_name.
 
     Attributes
     ----------
@@ -322,6 +322,19 @@
         return str(self._user)
 
     def __repr__(self) -> str:
+        if self._user.is_migrated:
+            if self.global_name is not None:
+                return (
+                    "<Member"
+                    f" id={self._user.id} name={self._user.name!r} global_name={self.global_name!r}"
+                    f" bot={self._user.bot} nick={self.nick!r} guild={self.guild!r}>"
+                )
+            else:
+                return (
+                    "<Member"
+                    f" id={self._user.id} name={self._user.name!r}"
+                    f" bot={self._user.bot} nick={self.nick!r} guild={self.guild!r}>"
+                )
         return (
             "<Member"
             f" id={self._user.id} name={self._user.name!r} discriminator={self._user.discriminator!r}"
@@ -427,17 +440,24 @@
 
     def _update_inner_user(self, user: UserPayload) -> tuple[User, User] | None:
         u = self._user
-        original = (u.name, u._avatar, u.discriminator, u._public_flags)
+        original = (u.name, u._avatar, u.discriminator, u.global_name, u._public_flags)
         # These keys seem to always be available
         modified = (
             user["username"],
             user["avatar"],
             user["discriminator"],
+            user.get("global_name", None) or None,
             user.get("public_flags", 0),
         )
         if original != modified:
             to_return = User._copy(self._user)
-            u.name, u._avatar, u.discriminator, u._public_flags = modified
+            (
+                u.name,
+                u._avatar,
+                u.discriminator,
+                u.global_name,
+                u._public_flags,
+            ) = modified
             # Signal to dispatch on_user_update
             return to_return, u
 
@@ -476,6 +496,11 @@
         """The member's status on the web client, if applicable."""
         return try_enum(Status, self._client_status.get("web", "offline"))
 
+    @property
+    def global_name(self) -> str | None:
+        """The member's global name, if applicable."""
+        return self._user.global_name
+
     def is_on_mobile(self) -> bool:
         """A helper function that determines if a member is active on a mobile device."""
         return "mobile" in self._client_status
@@ -535,12 +560,9 @@
     @property
     def display_name(self) -> str:
         """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.
+        This will either be their guild specific nickname, global name or username.
         """
-        return self.nick or self.name
+        return self.nick or self.global_name or self.name
 
     @property
     def display_avatar(self) -> Asset:

discord/team.py

@@ -108,7 +108,7 @@
 
         .. describe:: str(x)
 
-            Returns the team member's name with discriminator.
+            Returns the team member's name with discriminator or global_name.
 
     .. versionadded:: 1.3
 
@@ -120,6 +120,14 @@
         The team member's unique ID.
     discriminator: :class:`str`
         The team member's discriminator. This is given when the username has conflicts.
+
+        .. note::
+
+            If the user has migrated to the new username system, this will always be "0".
+    global_name: :class:`str`
+        The team member's global name.
+
+        .. versionadded:: 2.5
     avatar: Optional[:class:`str`]
         The avatar hash the team member has. Could be ``None``.
     bot: :class:`bool`
@@ -141,6 +149,16 @@
         super().__init__(state=state, data=data["user"])
 
     def __repr__(self) -> str:
+        if self.is_migrated:
+            if self.global_name is not None:
+                return (
+                    f"<{self.__class__.__name__} id={self.id} username={self.name!r} "
+                    f"global_name={self.global_name!r} membership_state={self.membership_state!r}>"
+                )
+            return (
+                f"<{self.__class__.__name__} id={self.id} username={self.name!r} "
+                f"membership_state={self.membership_state!r}>"
+            )
         return (
             f"<{self.__class__.__name__} id={self.id} name={self.name!r} "
             f"discriminator={self.discriminator!r} membership_state={self.membership_state!r}>"

discord/types/user.py

@@ -33,10 +33,11 @@ class PartialUser(TypedDict):
     id: Snowflake
     username: str
     discriminator: str
+    global_name: str | None
     avatar: str | None
 
 
-PremiumType = Literal[0, 1, 2]
+PremiumType = Literal[0, 1, 2, 3]
 
 
 class User(PartialUser, total=False):