Skip to content

BREAKING fix dpy2, add support old time format #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 20, 2022
Merged

BREAKING fix dpy2, add support old time format #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2689902
update for dpy2
lorenzo132 Nov 21, 2021
7227653
FIx for old-timezone naive dates
fourjr Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
import dateutil.parser

from sanic import response
Expand All @@ -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"])
Expand All @@ -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):
Expand Down Expand Up @@ -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"]]
Expand Down