refactor: fix and optimize more chunks

Pycord-Development · May 14, 2023 · 36a96ad · 36a96ad
1 parent 691c05b
commit 36a96ad
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 61 deletions.
diff --git a/discord/team.py b/discord/team.py
@@ -124,7 +124,6 @@ class TeamMember(BaseUser):
         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`
@@ -146,18 +145,17 @@ def __init__(self, team: Team, state: ConnectionState, data: TeamMemberPayload):
         super().__init__(state=state, data=data["user"])
 
     def __repr__(self) -> str:
-        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:
+        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}>"
             )
-        else:
-            return (
-                f"<{self.__class__.__name__} id={self.id} name={self.name!r} "
-                f"discriminator={self.discriminator!r} 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}>"
+        )
diff --git a/discord/user.py b/discord/user.py
@@ -91,24 +91,23 @@ def __init__(self, *, state: ConnectionState, data: UserPayload) -> None:
         self._update(data)
 
     def __repr__(self) -> str:
-        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:
+        if self.is_migrated:
+            if 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}>"
+                )
             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}>"
-            )
+        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 (
@@ -117,7 +116,7 @@ def __str__(self) -> str:
             else (
                 f"{self.name} ({self.global_name})"
                 if self.global_name is not None
-                else f"{self.name}"
+                else self.name
             )
         )
 
@@ -378,24 +377,23 @@ def __init__(self, *, state: ConnectionState, data: UserPayload) -> None:
         super().__init__(state=state, data=data)
 
     def __repr__(self) -> str:
-        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:
+        if self.is_migrated:
+            if 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}>"
+                )
             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}>"
-            )
+        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)
@@ -504,18 +502,17 @@ def __init__(self, *, state: ConnectionState, data: UserPayload) -> None:
         self._stored: bool = False
 
     def __repr__(self) -> str:
-        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:
+        if self.is_migrated:
+            if 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}>"
+                )
             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}>"
-            )
+        return (
+            "<User"
+            f" id={self.id} name={self.name!r} discriminator={self.discriminator!r} bot={self.bot}>"
+        )
 
     def __del__(self) -> None:
         try:

diff --git a/discord/widget.py b/discord/widget.py
@@ -202,21 +202,20 @@ def __init__(
         self.connected_channel: WidgetChannel | None = connected_channel
 
     def __repr__(self) -> str:
-        if self.is_migrated and self.global_name is not None:
-            return (
-                f"<WidgetMember name={self.name!r} global_name={self.global_name!r}"
-                f" bot={self.bot} nick={self.nick!r}>"
-            )
-        elif self.is_migrated:
+        if self.is_migrated:
+            if self.global_name is not None:
+                return (
+                    f"<WidgetMember name={self.name!r} global_name={self.global_name!r}"
+                    f" bot={self.bot} nick={self.nick!r}>"
+                )
             return (
                 f"<WidgetMember name={self.name!r}"
                 f" bot={self.bot} nick={self.nick!r}>"
             )
-        else:
-            return (
-                f"<WidgetMember name={self.name!r} discriminator={self.discriminator!r}"
-                f" bot={self.bot} nick={self.nick!r}>"
-            )
+        return (
+            f"<WidgetMember name={self.name!r} discriminator={self.discriminator!r}"
+            f" bot={self.bot} nick={self.nick!r}>"
+        )
 
     @property
     def display_name(self) -> str: