fix(gateway): fix missing user_update event for new attributes, missing attributes in member_update event (#1350)

Author: shiftinv

changelog/1350.bugfix.rst

@@ -0,0 +1 @@
+Fix missing :attr:`~Member.avatar_decoration` on the old :class:`Member` in :func:`on_member_update` events.

disnake/member.py

@@ -298,6 +298,7 @@ class Member(disnake.abc.Messageable, _UserTag):
         banner: Optional[Asset]
         accent_color: Optional[Colour]
         accent_colour: Optional[Colour]
+        avatar_decoration: Optional[Asset]
         collectibles: Collectibles
         primary_guild: Optional[PrimaryGuild]
 
@@ -421,6 +422,7 @@ def _copy(cls, member: Member) -> Self:
         self._banner = member._banner
         self._communication_disabled_until = member.current_timeout
         self._flags = member._flags
+        self._avatar_decoration_data = member._avatar_decoration_data
 
         # Reference will not be copied unless necessary by PRESENCE_UPDATE
         # See below
@@ -471,32 +473,35 @@ def _update_inner_user(self, user: UserPayload) -> Optional[Tuple[User, User]]:
         u = self._user
         original = (
             u.name,
-            u._avatar,
             u.discriminator,
             u.global_name,
-            u._public_flags,
+            u._avatar,
             u._avatar_decoration_data,
+            u._public_flags,
+            u._collectibles,
             u._primary_guild,
         )
         # These keys seem to always be available
         modified = (
             user["username"],
-            user["avatar"],
             user["discriminator"],
             user.get("global_name"),
+            user["avatar"],
+            user.get("avatar_decoration_data"),
             user.get("public_flags", 0),
-            user.get("avatar_decoration_data", None),
+            user.get("collectibles"),
             user.get("primary_guild"),
         )
         if original != modified:
             to_return = User._copy(self._user)
             (
                 u.name,
-                u._avatar,
                 u.discriminator,
                 u.global_name,
-                u._public_flags,
+                u._avatar,
                 u._avatar_decoration_data,
+                u._public_flags,
+                u._collectibles,
                 u._primary_guild,
             ) = modified
             # Signal to dispatch on_user_update

disnake/types/user.py

@@ -53,6 +53,7 @@ class PartialUser(TypedDict):
     discriminator: str  # may be removed in future API versions
     global_name: NotRequired[Optional[str]]
     avatar: Optional[str]
+    avatar_decoration_data: NotRequired[Optional[AvatarDecorationData]]
     collectibles: NotRequired[Optional[Collectibles]]
     primary_guild: NotRequired[Optional[UserPrimaryGuild]]
 
@@ -72,4 +73,3 @@ class User(PartialUser, total=False):
     flags: int
     premium_type: PremiumType
     public_flags: int
-    avatar_decoration_data: Optional[AvatarDecorationData]

disnake/user.py

@@ -58,33 +58,17 @@ class BaseUser(_UserTag):
         "_avatar",
         "_banner",
         "_avatar_decoration_data",
-        "_collectibles",
         "_accent_colour",
         "_public_flags",
-        "_state",
+        "_collectibles",
         "_primary_guild",
+        "_state",
     )
 
-    if TYPE_CHECKING:
-        name: str
-        id: int
-        discriminator: str
-        global_name: Optional[str]
-        bot: bool
-        system: bool
-        _state: ConnectionState
-        _avatar: Optional[str]
-        _banner: Optional[str]
-        _avatar_decoration_data: Optional[AvatarDecorationDataPayload]
-        _collectibles: Optional[CollectiblesPayload]
-        _accent_colour: Optional[int]
-        _public_flags: int
-        _primary_guild: Optional[UserPrimaryGuildPayload]
-
     def __init__(
         self, *, state: ConnectionState, data: Union[UserPayload, PartialUserPayload]
     ) -> None:
-        self._state = state
+        self._state: ConnectionState = state
         self._update(data)
 
     def __repr__(self) -> str:
@@ -110,24 +94,27 @@ def __hash__(self) -> int:
         return self.id >> 22
 
     def _update(self, data: Union[UserPayload, PartialUserPayload]) -> None:
-        self.name = data["username"]
-        self.id = int(data["id"])
-        self.discriminator = data["discriminator"]
-        self.global_name = data.get("global_name")
-        self._avatar = data["avatar"]
-        self._banner = data.get("banner", None)
-        self._avatar_decoration_data = data.get("avatar_decoration_data", None)
-        self._collectibles = data.get("collectibles")
-        self._accent_colour = data.get("accent_color", None)
-        self._public_flags = data.get("public_flags", 0)
-        self.bot = data.get("bot", False)
-        self.system = data.get("system", False)
-        self._primary_guild = data.get("primary_guild")
+        self.name: str = data["username"]
+        self.id: int = int(data["id"])
+        self.discriminator: str = data["discriminator"]
+        self.global_name: Optional[str] = data.get("global_name")
+        self._avatar: Optional[str] = data["avatar"]
+        self._banner: Optional[str] = data.get("banner")
+        self._avatar_decoration_data: Optional[AvatarDecorationDataPayload] = data.get(
+            "avatar_decoration_data"
+        )
+        self._accent_colour: Optional[int] = data.get("accent_color")
+        self._public_flags: int = data.get("public_flags", 0)
+        self._collectibles: Optional[CollectiblesPayload] = data.get("collectibles")
+        self._primary_guild: Optional[UserPrimaryGuildPayload] = data.get("primary_guild")
+        self.bot: bool = data.get("bot", False)
+        self.system: bool = data.get("system", False)
 
     @classmethod
     def _copy(cls, user: BaseUser) -> Self:
         self = cls.__new__(cls)  # bypass __init__
 
+        self._state = user._state
         self.name = user.name
         self.id = user.id
         self.discriminator = user.discriminator
@@ -136,9 +123,11 @@ def _copy(cls, user: BaseUser) -> Self:
         self._banner = user._banner
         self._avatar_decoration_data = user._avatar_decoration_data
         self._accent_colour = user._accent_colour
-        self.bot = user.bot
-        self._state = user._state
         self._public_flags = user._public_flags
+        self._collectibles = user._collectibles
+        self._primary_guild = user._primary_guild
+        self.bot = user.bot
+        self.system = user.system
 
         return self