Skip to content

Commit

Permalink
Merge pull request #1843 from MTG/forums-last-visited-date
Browse files Browse the repository at this point in the history
If a user's cookie for last forum visit has no tz, add it
  • Loading branch information
ffont authored Feb 13, 2025
2 parents 128e10a + 9be2167 commit d70351c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions forum/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,12 @@ def inner(request, *args, **kwargs):

if key not in request.COOKIES or not request.session.get(key, False):
request.session[key] = now_as_string
elif now - datetime.datetime.fromisoformat(request.COOKIES[key]) > datetime.timedelta(minutes=30):
request.session[key] = request.COOKIES[key]
else:
cookie_value = datetime.datetime.fromisoformat(request.COOKIES[key])
if cookie_value.tzinfo is None:
cookie_value = cookie_value.replace(tzinfo=timezone.utc)
if now - cookie_value > datetime.timedelta(minutes=30):
request.session[key] = request.COOKIES[key]

request.last_action_time = datetime.datetime.fromisoformat(request.session.get(key, now_as_string))

Expand Down

0 comments on commit d70351c

Please sign in to comment.