feat!: pomelo

discord/member.py

@@ -282,6 +282,7 @@ class Member(discord.abc.Messageable, _UserTag):
         name: str
         id: int
         discriminator: str
+        global_name: str | None
         bot: bool
         system: bool
         created_at: datetime.datetime
@@ -540,7 +541,11 @@ def display_name(self) -> str:
         if they have a guild specific nickname then that
         is returned instead.
         """
-        return self.nick or self.name
+        return (
+            self.nick or self.global_name
+            if self._user.is_migrated
+            else self.name or self.name
+        )
 
     @property
     def display_avatar(self) -> Asset:

discord/team.py

@@ -120,6 +120,11 @@ class TeamMember(BaseUser):
         The team member's unique ID.
     discriminator: :class:`str`
         The team member's discriminator. This is given when the username has conflicts.
+    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,7 +146,18 @@ def __init__(self, team: Team, state: ConnectionState, data: TeamMemberPayload):
         super().__init__(state=state, data=data["user"])
 
     def __repr__(self) -> str:
-        return (
-            f"<{self.__class__.__name__} id={self.id} name={self.name!r} "
-            f"discriminator={self.discriminator!r} membership_state={self.membership_state!r}>"
-        )
+        if self.is_migrated and 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}>"
+            )
+        elif self.is_migrated:
+            return (
+                f"<{self.__class__.__name__} id={self.id} username={self.name!r} "
+                f"membership_state={self.membership_state!r}>"
+            )
+        else:
+            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):

discord/user.py

@@ -64,6 +64,7 @@ class BaseUser(_UserTag):
         "name",
         "id",
         "discriminator",
+        "global_name",
         "_avatar",
         "_banner",
         "_accent_colour",
@@ -77,6 +78,7 @@ class BaseUser(_UserTag):
         name: str
         id: int
         discriminator: str
+        global_name: str | None
         bot: bool
         system: bool
         _state: ConnectionState
@@ -90,11 +92,24 @@ def __init__(self, *, state: ConnectionState, data: UserPayload) -> None:
         self._update(data)
 
     def __repr__(self) -> str:
-        return (
-            "<BaseUser"
-            f" id={self.id} name={self.name!r} discriminator={self.discriminator!r}"
-            f" bot={self.bot} system={self.system}>"
-        )
+        if self.is_migrated and self.global_name is not None:
+            return (
+                "<BaseUser"
+                f" id={self.id} username={self.name!r} global_name={self.global_name!r}"
+                f" bot={self.bot} system={self.system}>"
+            )
+        elif self.is_migrated:
+            return (
+                "<BaseUser"
+                f" id={self.id} username={self.name!r}"
+                f" bot={self.bot} system={self.system}>"
+            )
+        else:
+            return (
+                "<BaseUser"
+                f" id={self.id} name={self.name!r} discriminator={self.discriminator!r}"
+                f" bot={self.bot} system={self.system}>"
+            )
 
     def __str__(self) -> str:
         return f"{self.name}#{self.discriminator}"
@@ -112,6 +127,7 @@ def _update(self, data: UserPayload) -> None:
         self.name = data["username"]
         self.id = int(data["id"])
         self.discriminator = data["discriminator"]
+        self.global_name = data.get("global_name", None)
         self._avatar = data["avatar"]
         self._banner = data.get("banner", None)
         self._accent_colour = data.get("accent_color", None)
@@ -126,6 +142,7 @@ def _copy(cls: type[BU], user: BU) -> BU:
         self.name = user.name
         self.id = user.id
         self.discriminator = user.discriminator
+        self.global_name = user.global_name
         self._avatar = user._avatar
         self._banner = user._banner
         self._accent_colour = user._accent_colour
@@ -141,6 +158,7 @@ def _to_minimal_user_json(self) -> dict[str, Any]:
             "id": self.id,
             "avatar": self._avatar,
             "discriminator": self.discriminator,
+            "global_name": self.global_name,
             "bot": self.bot,
         }
 
@@ -290,6 +308,12 @@ def mentioned_in(self, message: Message) -> bool:
 
         return any(user.id == self.id for user in message.mentions)
 
+    @property
+    def is_migrated(self) -> bool:
+        """Checks whether the user is already migrated to global name"""
+
+        return self.discriminator == "0"
+
 
 class ClientUser(BaseUser):
     """Represents your Discord user.
@@ -320,6 +344,11 @@ class ClientUser(BaseUser):
         The user's unique ID.
     discriminator: :class:`str`
         The user's discriminator. This is given when the username has conflicts.
+    global_name: :class: `str`
+        The user's global name.
+
+        .. versionadded:: 2.5
+
     bot: :class:`bool`
         Specifies if the user is a bot account.
     system: :class:`bool`
@@ -347,11 +376,24 @@ def __init__(self, *, state: ConnectionState, data: UserPayload) -> None:
         super().__init__(state=state, data=data)
 
     def __repr__(self) -> str:
-        return (
-            "<ClientUser"
-            f" id={self.id} name={self.name!r} discriminator={self.discriminator!r}"
-            f" bot={self.bot} verified={self.verified} mfa_enabled={self.mfa_enabled}>"
-        )
+        if self.is_migrated and self.global_name is not None:
+            return (
+                "<ClientUser"
+                f" id={self.id} username={self.name!r} global_name={self.global_name!r}"
+                f" bot={self.bot} verified={self.verified} mfa_enabled={self.mfa_enabled}>"
+            )
+        elif self.is_migrated:
+            return (
+                "<ClientUser"
+                f" id={self.id} username={self.name!r}"
+                f" bot={self.bot} verified={self.verified} mfa_enabled={self.mfa_enabled}>"
+            )
+        else:
+            return (
+                "<ClientUser"
+                f" id={self.id} name={self.name!r} discriminator={self.discriminator!r}"
+                f" bot={self.bot} verified={self.verified} mfa_enabled={self.mfa_enabled}>"
+            )
 
     def _update(self, data: UserPayload) -> None:
         super()._update(data)
@@ -361,6 +403,7 @@ def _update(self, data: UserPayload) -> None:
         self._flags = data.get("flags", 0)
         self.mfa_enabled = data.get("mfa_enabled", False)
 
+    # TODO: Username might not be able to edit anymore.
     async def edit(
         self, *, username: str = MISSING, avatar: bytes = MISSING
     ) -> ClientUser:
@@ -442,6 +485,12 @@ class User(BaseUser, discord.abc.Messageable):
         The user's unique ID.
     discriminator: :class:`str`
         The user's discriminator. This is given when the username has conflicts.
+
+    global_name: :class: `str`
+        The user's global name.
+
+        .. versionadded:: 2.5
+
     bot: :class:`bool`
         Specifies if the user is a bot account.
     system: :class:`bool`
@@ -455,10 +504,18 @@ def __init__(self, *, state: ConnectionState, data: UserPayload) -> None:
         self._stored: bool = False
 
     def __repr__(self) -> str:
-        return (
-            "<User"
-            f" id={self.id} name={self.name!r} discriminator={self.discriminator!r} bot={self.bot}>"
-        )
+        if self.is_migrated and self.global_name is not None:
+            return (
+                "<User"
+                f" id={self.id} username={self.name!r} global_name={self.global_name!r} bot={self.bot}>"
+            )
+        elif self.is_migrated:
+            return "<User" f" id={self.id} username={self.name!r} bot={self.bot}>"
+        else:
+            return (
+                "<User"
+                f" id={self.id} name={self.name!r} discriminator={self.discriminator!r} bot={self.bot}>"
+            )
 
     def __del__(self) -> None:
         try: