aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2019-12-05 04:36:04 -0500
committerRapptz <[email protected]>2019-12-05 04:36:04 -0500
commit7045639adc03f17fb7f3a703308971d8675f062f (patch)
treea8b3af2f03f0661241b17614e541dd097f4909fd
parentChange websockets version to >=6.0, !=7 (diff)
downloaddiscord.py-7045639adc03f17fb7f3a703308971d8675f062f.tar.xz
discord.py-7045639adc03f17fb7f3a703308971d8675f062f.zip
Fix KeyError for things without a created_at
-rw-r--r--discord/activity.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/discord/activity.py b/discord/activity.py
index 09fb057c..adf62fce 100644
--- a/discord/activity.py
+++ b/discord/activity.py
@@ -87,12 +87,16 @@ class _ActivityTag:
__slots__ = ('_created_at',)
def __init__(self, **kwargs):
- self._created_at = kwargs.pop('created_at')
+ self._created_at = kwargs.pop('created_at', None)
@property
def created_at(self):
- """:class:`datetime.datetime`: When the user started doing this activity in UTC."""
- return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
+ """Optional[:class:`datetime.datetime`]: When the user started doing this activity in UTC.
+
+ .. versionadded:: 1.3.0
+ """
+ if self._created_at is not None:
+ return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
class Activity(_ActivityTag):
"""Represents an activity in Discord.
@@ -480,7 +484,7 @@ class Spotify:
self._party = data.pop('party', {})
self._sync_id = data.pop('sync_id')
self._session_id = data.pop('session_id')
- self._created_at = data.pop('created_at')
+ self._created_at = data.pop('created_at', None)
@property
def type(self):
@@ -492,8 +496,12 @@ class Spotify:
@property
def created_at(self):
- """:class:`datetime.datetime`: When the user started listening in UTC."""
- return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
+ """Optional[:class:`datetime.datetime`]: When the user started listening in UTC.
+
+ .. versionadded:: 1.3.0
+ """
+ if self._created_at is not None:
+ return datetime.datetime.utcfromtimestamp(self._created_at / 1000)
@property
def colour(self):