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

Update Member.joined_at on MESSAGE_CREATE and document it can be None.

Browse Source 
Fixes #1638
This commit is contained in:
Rapptz 2019-02-27 06:23:08 -05:00
parent 757584e651
commit 7240d170c1
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
discord/member.py
View File

@ -138,9 +138,9 @@ class Member(discord.abc.Messageable, _BaseUser):
Attributes Attributes
---------- ----------
joined_at: `datetime.datetime` joined_at: Optional[:class:`datetime.datetime`]
A datetime object that specifies the date and time in UTC that the member joined the guild for A datetime object that specifies the date and time in UTC that the member joined the guild for
the first time. the first time. In certain cases, this can be ``None``.
activities: Tuple[Union[:class:`Game`, :class:`Streaming`, :class:`Spotify`, :class:`Activity`]] activities: Tuple[Union[:class:`Game`, :class:`Streaming`, :class:`Spotify`, :class:`Activity`]]
The activities that the user is currently doing. The activities that the user is currently doing.
guild: :class:`Guild` guild: :class:`Guild`
@ -179,6 +179,16 @@ class Member(discord.abc.Messageable, _BaseUser):
def __hash__(self): def __hash__(self):
return hash(self._user) return hash(self._user)
@classmethod
def _from_message(cls, *, message, data):
author = message.author
data['user'] = {
attr: getattr(author, attr)
for attr in author.__slots__
if attr[0] != '_'
}
return cls(data=data, guild=message.guild, state=message._state)
@classmethod @classmethod
def _copy(cls, member): def _copy(cls, member):
self = cls.__new__(cls) # to bypass __init__ self = cls.__new__(cls) # to bypass __init__

17
discord/message.py
View File

@ -35,6 +35,7 @@ from .calls import CallMessage
from .enums import MessageType, try_enum from .enums import MessageType, try_enum
from .errors import InvalidArgument, ClientException, HTTPException from .errors import InvalidArgument, ClientException, HTTPException
from .embeds import Embed from .embeds import Embed
from .member import Member
class Attachment: class Attachment:
"""Represents an attachment from Discord. """Represents an attachment from Discord.
@ -277,7 +278,7 @@ class Message:
self._try_patch(data, 'embeds', lambda x: list(map(Embed.from_data, x))) self._try_patch(data, 'embeds', lambda x: list(map(Embed.from_data, x)))
self._try_patch(data, 'nonce') self._try_patch(data, 'nonce')
for handler in ('author', 'mentions', 'mention_roles', 'call'): for handler in ('author', 'member', 'mentions', 'mention_roles', 'call'):
try: try:
getattr(self, '_handle_%s' % handler)(data[handler]) getattr(self, '_handle_%s' % handler)(data[handler])
except KeyError: except KeyError:
@ -298,6 +299,20 @@ class Message:
if found is not None: if found is not None:
self.author = found self.author = found
def _handle_member(self, member):
# The gateway now gives us full Member objects sometimes with the following keys
# deaf, mute, joined_at, roles
# For the sake of performance I'm going to assume that the only
# field that needs *updating* would be the joined_at field.
# If there is no Member object (for some strange reason), then we can upgrade
# ourselves to a more "partial" member object.
author = self.author
try:
if author.joined_at is None:
author.joined_at = utils.parse_time(member.get('joined_at'))
except AttributeError:
self.author = Member._from_message(message=self, data=member)
def _handle_mentions(self, mentions): def _handle_mentions(self, mentions):
self.mentions = [] self.mentions = []
if self.guild is None: if self.guild is None: