From 26899022ca6c247d81070927faee98c47d8aeb69 Mon Sep 17 00:00:00 2001 From: lorenzo132 <50767078+lorenzo132@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:03:41 +0100 Subject: [PATCH 1/2] update for dpy2 fixes internal server error, Merge whenever dev gets merged into master for modmail --- core/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/models.py b/core/models.py index 85a9e2a..e4ee07f 100644 --- a/core/models.py +++ b/core/models.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, timezone import dateutil.parser from sanic import response @@ -13,7 +13,7 @@ def __init__(self, app, data): 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.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 ) @@ -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): @@ -166,7 +166,7 @@ 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.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"]] From 722765301fb7195c9b1c33d152efb409a71ddbd4 Mon Sep 17 00:00:00 2001 From: Yee Jia Rong <28086837+fourjr@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:11:29 +0800 Subject: [PATCH 2/2] FIx for old-timezone naive dates --- core/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/models.py b/core/models.py index e4ee07f..e8d0e8a 100644 --- a/core/models.py +++ b/core/models.py @@ -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.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"]) @@ -165,7 +165,7 @@ 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.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)