matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix KeyError for things without a created_at

Browse Source
This commit is contained in:
Rapptz 2019-12-05 04:36:04 -05:00
parent 6065cee7a0
commit 7045639adc
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
discord/activity.py
View File

@ -87,12 +87,16 @@ class _ActivityTag:
__slots__ = ('_created_at',) __slots__ = ('_created_at',)
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._created_at = kwargs.pop('created_at') self._created_at = kwargs.pop('created_at', None)
@property @property
def created_at(self): def created_at(self):
""":class:`datetime.datetime`: When the user started doing this activity in UTC.""" """Optional[:class:`datetime.datetime`]: When the user started doing this activity in UTC.
return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
.. versionadded:: 1.3.0
"""
if self._created_at is not None:
return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
class Activity(_ActivityTag): class Activity(_ActivityTag):
"""Represents an activity in Discord. """Represents an activity in Discord.
@ -480,7 +484,7 @@ class Spotify:
self._party = data.pop('party', {}) self._party = data.pop('party', {})
self._sync_id = data.pop('sync_id') self._sync_id = data.pop('sync_id')
self._session_id = data.pop('session_id') self._session_id = data.pop('session_id')
self._created_at = data.pop('created_at') self._created_at = data.pop('created_at', None)
@property @property
def type(self): def type(self):
@ -492,8 +496,12 @@ class Spotify:
@property @property
def created_at(self): def created_at(self):
""":class:`datetime.datetime`: When the user started listening in UTC.""" """Optional[:class:`datetime.datetime`]: When the user started listening in UTC.
return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
.. versionadded:: 1.3.0
"""
if self._created_at is not None:
return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
@property @property
def colour(self): def colour(self):