diff options
| author | Rapptz <[email protected]> | 2021-08-25 01:42:29 -0400 |
|---|---|---|
| committer | Rapptz <[email protected]> | 2021-08-25 01:43:09 -0400 |
| commit | 848d752388f9878cc4a17148b87ae435d220640d (patch) | |
| tree | febbe5db754e1e5bf92494fc23d9ea7850ee0458 /discord/member.py | |
| parent | Change on_socket_raw_receive to dispatch right before JSON conversion (diff) | |
| download | discord.py-848d752388f9878cc4a17148b87ae435d220640d.tar.xz discord.py-848d752388f9878cc4a17148b87ae435d220640d.zip | |
Change User.avatar to be Optional[Asset] instead of Asset
This change was needed to allow users to more easily check if an
uploaded avatar was set using `if user.avatar:` rather than the
admittedly clunky `if user.avatar != user.default_avatar.
The old behaviour with a fallback is still useful for actual display
purposes, so it has been moved over to the new `User.display_avatar`
attribute. This also has symmetry with the newly added
`Member.display_avatar` attribute.
Diffstat (limited to 'discord/member.py')
| -rw-r--r-- | discord/member.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/discord/member.py b/discord/member.py index 1ff682c4..058b39b2 100644 --- a/discord/member.py +++ b/discord/member.py @@ -275,7 +275,7 @@ class Member(discord.abc.Messageable, _UserTag): system: bool created_at: datetime.datetime default_avatar: Asset - avatar: Asset + avatar: Optional[Asset] dm_channel: Optional[DMChannel] create_dm = User.create_dm mutual_guilds: List[Guild] @@ -513,7 +513,7 @@ class Member(discord.abc.Messageable, _UserTag): .. versionadded:: 2.0 """ - return self.guild_avatar or self.avatar + return self.guild_avatar or self._user.avatar or self._user.default_avatar @property def guild_avatar(self) -> Optional[Asset]: |