TheLovinator/ttvdrops
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor campaign list view

Browse source
This commit is contained in:
Joakim Hellsén 2026-02-11 18:41:40 +01:00
commit aed8adeea4
Signed by: Joakim Hellsén
SSH key fingerprint: SHA256:/9h/CsExpFp+PRhsfA0xznFx2CGfTT5R/kpuFfUgEQk
4 changed files with 304 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

10
twitch/views.py
View file

@ -282,7 +282,7 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
queryset = queryset.prefetch_related("game__owners").order_by("-start_at")
# Optionally filter by status (active, upcoming, expired)
now = timezone.now()
now: datetime.datetime = timezone.now()
if status_filter == "active":
queryset = queryset.filter(start_at__lte=now, end_at__gte=now)
elif status_filter == "upcoming":
@ -290,10 +290,10 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
elif status_filter == "expired":
queryset = queryset.filter(end_at__lt=now)
paginator = Paginator(queryset, per_page)
page = request.GET.get("page") or 1
paginator: Paginator[DropCampaign] = Paginator(queryset, per_page)
page: str | Literal[1] = request.GET.get("page") or 1
try:
campaigns = paginator.page(page)
campaigns: Page[DropCampaign] = paginator.page(page)
except PageNotAnInteger:
campaigns = paginator.page(1)
except EmptyPage:
@ -301,6 +301,8 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
context: dict[str, Any] = {
"campaigns": campaigns,
"page_obj": campaigns,
"is_paginated": campaigns.has_other_pages(),
"games": Game.objects.all().order_by("display_name"),
"status_options": ["active", "upcoming", "expired"],
"now": now,