fix: Incorrect merges

Author: Paillat-dev

discord/member.py

@@ -132,18 +132,18 @@ class VoiceState:
     )
 
     def __init__(
-        self,
-        *,
-        data: VoiceStatePayload | GuildVoiceStatePayload,
-        channel: VocalGuildChannel | None = None,
+            self,
+            *,
+            data: VoiceStatePayload | GuildVoiceStatePayload,
+            channel: VocalGuildChannel | None = None,
     ):
         self.session_id: str = data.get("session_id")
         self._update(data, channel)
 
     def _update(
-        self,
-        data: VoiceStatePayload | GuildVoiceStatePayload,
-        channel: VocalGuildChannel | None,
+            self,
+            data: VoiceStatePayload | GuildVoiceStatePayload,
+            channel: VocalGuildChannel | None,
     ):
         self.self_mute: bool = data.get("self_mute", False)
         self.self_deaf: bool = data.get("self_deaf", False)
@@ -187,7 +187,7 @@ def _create_default(cls, channel: VocalGuildChannel, client: Client) -> VoiceSta
 
 def flatten_user(cls):
     for attr, value in itertools.chain(
-        BaseUser.__dict__.items(), User.__dict__.items()
+            BaseUser.__dict__.items(), User.__dict__.items()
     ):
         # ignore private/special methods
         if attr.startswith("_"):
@@ -335,7 +335,7 @@ class Member(discord.abc.Messageable, _UserTag):
         avatar_decoration: Asset | None
 
     def __init__(
-        self, *, data: MemberWithUserPayload, guild: Guild, state: ConnectionState
+            self, *, data: MemberWithUserPayload, guild: Guild, state: ConnectionState
     ):
         self._state: ConnectionState = state
         self._user: User = state.store_user(data["user"])
@@ -405,11 +405,11 @@ def _update_from_message(self, data: MemberPayload) -> None:
 
     @classmethod
     def _try_upgrade(
-        cls: type[M],
-        *,
-        data: UserWithMemberPayload,
-        guild: Guild,
-        state: ConnectionState,
+            cls: type[M],
+            *,
+            data: UserWithMemberPayload,
+            guild: Guild,
+            state: ConnectionState,
     ) -> User | M:
         # A User object with a 'member' key
         try:
@@ -472,7 +472,7 @@ def _update(self, data: MemberPayload | MemberUpdateEventPayload) -> None:
         self._avatar_decoration = data.get("avatar_decoration_data")
 
     def _presence_update(
-        self, data: PartialPresenceUpdate, user: UserPayload
+            self, data: PartialPresenceUpdate, user: UserPayload
     ) -> tuple[User, User] | None:
         self.activities = tuple(map(create_activity, data["activities"]))
         self._client_status = {
@@ -499,7 +499,7 @@ def _update_inner_user(self, user: UserPayload) -> tuple[User, User] | None:
         )
         # These keys seem to always be available
         if (
-            new_primary_guild_data := user.get("primary_guild")
+                new_primary_guild_data := user.get("primary_guild")
         ) and new_primary_guild_data.get("identity_enabled"):
             new_primary_guild: PrimaryGuild | None = PrimaryGuild(
                 new_primary_guild_data, state=self._state
@@ -663,8 +663,9 @@ def display_name(self) -> str:
     def display_avatar(self) -> Asset:
         """Returns the member's display avatar.
 
-        Returns the user's guild avatar.
-        If the user does not have a guild avatar, their global avatar is returned instead.
+        For regular members this is just their avatar, but
+        if they have a guild specific avatar then that
+        is returned instead.
 
         .. versionadded:: 2.0
         """
@@ -687,8 +688,9 @@ def guild_avatar(self) -> Asset | None:
     def display_avatar_decoration(self) -> Asset | None:
         """Returns the member's displayed avatar decoration.
 
-        Returns the user's guild avatar decoration.
-        If the user does not have a guild avatar decoration, their global avatar decoration is returned instead.
+        For regular members this is just their avatar decoration, but
+        if they have a guild specific avatar decoration then that
+        is returned instead.
 
         .. versionadded:: 2.8
         """
@@ -711,8 +713,9 @@ def guild_avatar_decoration(self) -> Asset | None:
     def display_banner(self) -> Asset | None:
         """Returns the member's display banner.
 
-        Returns the user's guild banner.
-        If the user does not have a guild banner, their global banner is returned instead.
+        For regular members this is just their banner, but
+        if they have a guild specific banner then that
+        is returned instead.
 
         .. versionadded:: 2.7
         """
@@ -820,16 +823,16 @@ def timed_out(self) -> bool:
         .. versionadded:: 2.0
         """
         return (
-            self.communication_disabled_until is not None
-            and self.communication_disabled_until
-            > datetime.datetime.now(datetime.timezone.utc)
+                self.communication_disabled_until is not None
+                and self.communication_disabled_until
+                > datetime.datetime.now(datetime.timezone.utc)
         )
 
     async def ban(
-        self,
-        *,
-        delete_message_seconds: int | None = None,
-        reason: str | None = None,
+            self,
+            *,
+            delete_message_seconds: int | None = None,
+            reason: str | None = None,
     ) -> None:
         """|coro|
 
@@ -856,20 +859,20 @@ async def kick(self, *, reason: str | None = None) -> None:
         await self.guild.kick(self, reason=reason)
 
     async def edit(
-        self,
-        *,
-        nick: str | None = MISSING,
-        mute: bool = MISSING,
-        deafen: bool = MISSING,
-        suppress: bool = MISSING,
-        roles: list[discord.abc.Snowflake] = MISSING,
-        voice_channel: VocalGuildChannel | None = MISSING,
-        reason: str | None = None,
-        communication_disabled_until: datetime.datetime | None = MISSING,
-        bypass_verification: bool | None = MISSING,
-        banner: bytes | None = MISSING,
-        avatar: bytes | None = MISSING,
-        bio: str | None = MISSING,
+            self,
+            *,
+            nick: str | None = MISSING,
+            mute: bool = MISSING,
+            deafen: bool = MISSING,
+            suppress: bool = MISSING,
+            roles: list[discord.abc.Snowflake] = MISSING,
+            voice_channel: VocalGuildChannel | None = MISSING,
+            reason: str | None = None,
+            communication_disabled_until: datetime.datetime | None = MISSING,
+            bypass_verification: bool | None = MISSING,
+            banner: bytes | None = MISSING,
+            avatar: bytes | None = MISSING,
+            bio: str | None = MISSING,
     ) -> Member | None:
         """|coro|
 
@@ -1072,7 +1075,7 @@ async def edit(
         return Member(data=data, guild=self.guild, state=self._state)
 
     async def timeout(
-        self, until: datetime.datetime | None, *, reason: str | None = None
+            self, until: datetime.datetime | None, *, reason: str | None = None
     ) -> None:
         """|coro|
 
@@ -1097,7 +1100,7 @@ async def timeout(
         await self.edit(communication_disabled_until=until, reason=reason)
 
     async def timeout_for(
-        self, duration: datetime.timedelta, *, reason: str | None = None
+            self, duration: datetime.timedelta, *, reason: str | None = None
     ) -> None:
         """|coro|
 
@@ -1182,7 +1185,7 @@ async def request_to_speak(self) -> None:
             await self._state.http.edit_my_voice_state(self.guild.id, payload)
 
     async def move_to(
-        self, channel: VocalGuildChannel | None, *, reason: str | None = None
+            self, channel: VocalGuildChannel | None, *, reason: str | None = None
     ) -> None:
         """|coro|
 
@@ -1207,7 +1210,7 @@ async def move_to(
         await self.edit(voice_channel=channel, reason=reason)
 
     async def add_roles(
-        self, *roles: Snowflake, reason: str | None = None, atomic: bool = True
+            self, *roles: Snowflake, reason: str | None = None, atomic: bool = True
     ) -> None:
         r"""|coro|
 
@@ -1250,7 +1253,7 @@ async def add_roles(
                 await req(guild_id, user_id, role.id, reason=reason)
 
     async def remove_roles(
-        self, *roles: Snowflake, reason: str | None = None, atomic: bool = True
+            self, *roles: Snowflake, reason: str | None = None, atomic: bool = True
     ) -> None:
         r"""|coro|
 

discord/user.py

@@ -50,7 +50,6 @@
     from .types.user import PartialUser as PartialUserPayload
     from .types.user import User as UserPayload
 
-
 __all__ = (
     "User",
     "ClientUser",
@@ -100,7 +99,7 @@ class BaseUser(_UserTag):
         collectibles: Collectibles
 
     def __init__(
-        self, *, state: ConnectionState, data: UserPayload | PartialUserPayload
+            self, *, state: ConnectionState, data: UserPayload | PartialUserPayload
     ) -> None:
         self._state = state
         self._update(data)
@@ -249,9 +248,8 @@ def default_avatar(self) -> Asset:
 
     @property
     def display_avatar(self) -> Asset:
-        """Returns the user's display avatar.
+        """Returns the user's uploaded avatar.
 
-        Returns the user's uploaded avatar.
         If the user has not uploaded any avatar, their default avatar is returned instead.
 
         .. versionadded:: 2.0
@@ -467,11 +465,11 @@ def _update(self, data: UserPayload) -> None:
 
     # TODO: Username might not be able to edit anymore.
     async def edit(
-        self,
-        *,
-        username: str = MISSING,
-        avatar: bytes = MISSING,
-        banner: bytes = MISSING,
+            self,
+            *,
+            username: str = MISSING,
+            avatar: bytes = MISSING,
+            banner: bytes = MISSING,
     ) -> ClientUser:
         """|coro|
 
@@ -686,12 +684,12 @@ async def create_test_entitlement(self, sku: discord.abc.Snowflake) -> Entitleme
         return Entitlement(data=data, state=self._state)
 
     def entitlements(
-        self,
-        skus: list[Snowflake] | None = None,
-        before: SnowflakeTime | None = None,
-        after: SnowflakeTime | None = None,
-        limit: int | None = 100,
-        exclude_ended: bool = False,
+            self,
+            skus: list[Snowflake] | None = None,
+            before: SnowflakeTime | None = None,
+            after: SnowflakeTime | None = None,
+            limit: int | None = 100,
+            exclude_ended: bool = False,
     ) -> EntitlementIterator:
         """Returns an :class:`.AsyncIterator` that enables fetching the user's entitlements.