0x2620/phantasmobile
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use make_aware

Browse source
This commit is contained in:
j 2023-08-14 23:30:57 +02:00
parent a90914fa8e
commit c192f91a03
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/item/models.py
View file

@ -59,11 +59,12 @@ class Item(models.Model):
@classmethod @classmethod
def public(cls, now=None): def public(cls, now=None):
if now is None: if now is None:
now = timezone.now() now = timezone.make_aware(datetime.now(), timezone.get_default_timezone())
qs = cls.objects.exclude(published=None).filter(published__lte=now).order_by('-published') qs = cls.objects.exclude(published=None).filter(published__lte=now).order_by('-published')
cal = now.date().isocalendar() cal = now.date().isocalendar()
monday = now.date() - timedelta(days=now.date().isocalendar().weekday - 1) monday = now.date() - timedelta(days=now.date().isocalendar().weekday - 1)
monday = timezone.datetime(monday.year, monday.month, monday.day, tzinfo=now.tzinfo) monday = timezone.datetime(monday.year, monday.month, monday.day, tzinfo=now.tzinfo)
print(monday)
first_post = qs.filter(published__gt=monday).first() first_post = qs.filter(published__gt=monday).first()
if first_post and first_post.published < now: if first_post and first_post.published < now:
week = qs.filter(published__gt=monday) week = qs.filter(published__gt=monday)