darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-16 20:49:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use naive datetimes for format_delta math

Browse Source
This commit is contained in:
Ryan Ahearn
2022-11-30 16:42:42 -05:00
parent 006e7b5d0a
commit dd90d82942
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/formatters.py
View File

@@ -9,7 +9,6 @@ from numbers import Number
import ago
import dateutil
import humanize
import pytz
from flask import Markup, current_app, url_for
from notifications_utils.field import Field
from notifications_utils.formatters import make_quotes_smart
@@ -166,11 +165,12 @@ def naturaltime_without_indefinite_article(date):
def format_delta(date):
# This method assumes that date is in UTC
date = parse_naive_dt(date)
delta = (
datetime.now(timezone.utc)
datetime.utcnow()
) - (
convert_utc_to_local_timezone(date).replace(tzinfo=pytz.utc)
date
)
if delta < timedelta(seconds=30):
return "just now"
@@ -180,9 +180,9 @@ def format_delta(date):
def format_delta_days(date):
# This method assumes that date is in UTC
date = parse_naive_dt(date)
now = datetime.now(timezone.utc)
date = convert_utc_to_local_timezone(date).replace(tzinfo=pytz.utc)
now = datetime.utcnow()
if date.strftime('%Y-%m-%d') == now.strftime('%Y-%m-%d'):
return "today"
if date.strftime('%Y-%m-%d') == (now - timedelta(days=1)).strftime('%Y-%m-%d'):