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

Fix issue with some MESSAGE_UPDATE events.

Browse Source
This commit is contained in:
Rapptz
2015-08-24 06:26:53 -04:00
parent d74f9c74cf
commit de3bce2b32
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
discord/message.py
View File

@ -65,6 +65,9 @@ class Message(object):
.. attribute:: id
The message ID.
.. attribute:: attachments
An array of attachments given to a message.
"""
def __init__(self, edited_timestamp, timestamp, tts, content, mention_everyone, mentions, embeds, attachments, id, channel, author, **kwargs):
@ -72,13 +75,11 @@ class Message(object):
# we can use this to our advantage to use strptime instead of a complicated parsing routine.
# example timestamp: 2015-08-21T12:03:45.782000+00:00
# sometimes the .%f modifier is missing
time_format = "%Y-%m-%dT%H:%M:%S.%f+00:00"
self.edited_timestamp = None
if edited_timestamp is not None:
temp = edited_timestamp.replace('+00:00', '')
self.edited_timestamp = datetime.datetime(*map(int, re.split(r'[^\d]', temp)))
self.edited_timestamp = self._parse_time(edited_timestamp)
self.timestamp = datetime.datetime(*map(int, re.split(r'[^\d]', timestamp.replace('+00:00', ''))))
self.timestamp = self._parse_time(timestamp)
self.tts = tts
self.content = content
self.mention_everyone = mention_everyone
@ -87,6 +88,8 @@ class Message(object):
self.channel = channel
self.author = User(**author)
self.mentions = [User(**mention) for mention in mentions]
self.attachments = attachments
def _parse_time(self, time_string):
return datetime.datetime(*map(int, re.split(r'[^\d]', time_string.replace('+00:00', ''))))