Merge pull request modmail-dev#44 from lorenzo132/master

BREAKING fix dpy2, add support old time format

Author: fourjr

core/models.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 import dateutil.parser
 
 from sanic import response
@@ -12,10 +12,10 @@ def __init__(self, app, data):
         self.app = app
         self.key = data["key"]
         self.open = data["open"]
-        self.created_at = dateutil.parser.parse(data["created_at"])
-        self.human_created_at = duration(self.created_at, now=datetime.utcnow())
+        self.created_at = dateutil.parser.parse(data["created_at"]).astimezone(timezone.utc)
+        self.human_created_at = duration(self.created_at, now=datetime.now(timezone.utc))
         self.closed_at = (
-            dateutil.parser.parse(data["closed_at"]) if not self.open else None
+            dateutil.parser.parse(data["closed_at"]).astimezone(timezone.utc) if not self.open else None
         )
         self.channel_id = int(data["channel_id"])
         self.guild_id = int(data["guild_id"])
@@ -35,7 +35,7 @@ def system_avatar_url(self):
 
     @property
     def human_closed_at(self):
-        return duration(self.closed_at, now=datetime.utcnow())
+        return duration(self.closed_at, now=datetime.now(timezone.utc))
 
     @property
     def message_groups(self):
@@ -165,8 +165,8 @@ def __init__(self, data):
 class Message:
     def __init__(self, data):
         self.id = int(data["message_id"])
-        self.created_at = dateutil.parser.parse(data["timestamp"])
-        self.human_created_at = duration(self.created_at, now=datetime.utcnow())
+        self.created_at = dateutil.parser.parse(data["timestamp"]).astimezone(timezone.utc)
+        self.human_created_at = duration(self.created_at, now=datetime.now(timezone.utc))
         self.raw_content = data["content"]
         self.content = self.format_html_content(self.raw_content)
         self.attachments = [Attachment(a) for a in data["attachments"]]