mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-06-07 20:28:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix default_avatar for team user and webhook

Browse Source
This commit is contained in:
owocado 2024-08-29 01:04:33 +05:30 committed by GitHub
parent a6d1dc0455
commit 0a2faa6f5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discord/user.py
View File

@ -171,7 +171,7 @@ class BaseUser(_UserTag):
@property @property
def default_avatar(self) -> Asset: def default_avatar(self) -> Asset:
""":class:`Asset`: Returns the default avatar for a given user.""" """:class:`Asset`: Returns the default avatar for a given user."""
if self.discriminator == '0': if self.discriminator in ('0', '0000'):
avatar_id = (self.id >> 22) % len(DefaultAvatar) avatar_id = (self.id >> 22) % len(DefaultAvatar)
else: else:
avatar_id = int(self.discriminator) % 5 avatar_id = int(self.discriminator) % 5

9
discord/webhook/async_.py
View File

@ -38,7 +38,7 @@ import aiohttp
from .. import utils from .. import utils
from ..errors import HTTPException, Forbidden, NotFound, DiscordServerError from ..errors import HTTPException, Forbidden, NotFound, DiscordServerError
from ..message import Message from ..message import Message
from ..enums import try_enum, WebhookType, ChannelType from ..enums import try_enum, WebhookType, ChannelType, DefaultAvatar
from ..user import BaseUser, User from ..user import BaseUser, User
from ..flags import MessageFlags from ..flags import MessageFlags
from ..asset import Asset from ..asset import Asset
@ -360,7 +360,7 @@ class AsyncWebhookAdapter:
multipart: Optional[List[Dict[str, Any]]] = None, multipart: Optional[List[Dict[str, Any]]] = None,
files: Optional[Sequence[File]] = None, files: Optional[Sequence[File]] = None,
thread_id: Optional[int] = None, thread_id: Optional[int] = None,
) -> Response[Message]: ) -> Response[MessagePayload]:
route = Route( route = Route(
'PATCH', 'PATCH',
'/webhooks/{webhook_id}/{webhook_token}/messages/{message_id}', '/webhooks/{webhook_id}/{webhook_token}/messages/{message_id}',
@ -1049,12 +1049,11 @@ class BaseWebhook(Hashable):
@property @property
def default_avatar(self) -> Asset: def default_avatar(self) -> Asset:
""" """
:class:`Asset`: Returns the default avatar. This is always the blurple avatar. :class:`Asset`: Returns the default avatar.
.. versionadded:: 2.0 .. versionadded:: 2.0
""" """
# Default is always blurple apparently return Asset._from_default_avatar(self._state, (self.id >> 22) % len(DefaultAvatar))
return Asset._from_default_avatar(self._state, 0)
@property @property
def display_avatar(self) -> Asset: def display_avatar(self) -> Asset: