diff options
Diffstat (limited to 'pydis_site/apps/api/viewsets/bot')
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/infraction.py | 17 | 
1 files changed, 7 insertions, 10 deletions
diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py index 2b89fdb3..93d29391 100644 --- a/pydis_site/apps/api/viewsets/bot/infraction.py +++ b/pydis_site/apps/api/viewsets/bot/infraction.py @@ -1,9 +1,8 @@ -from datetime import datetime +import datetime  from django.db import IntegrityError  from django.db.models import QuerySet  from django.http.request import HttpRequest -from django.utils import timezone  from django_filters.rest_framework import DjangoFilterBackend  from rest_framework.decorators import action  from rest_framework.exceptions import ValidationError @@ -185,23 +184,21 @@ class InfractionViewSet(          filter_expires_after = self.request.query_params.get('expires_after')          if filter_expires_after:              try: -                expires_after_parsed = datetime.fromisoformat(filter_expires_after) +                expires_after_parsed = datetime.datetime.fromisoformat(filter_expires_after)              except ValueError:                  raise ValidationError({'expires_after': ['failed to convert to datetime']}) -            additional_filters['expires_at__gte'] = timezone.make_aware( -                expires_after_parsed, -                timezone=timezone.utc, +            additional_filters['expires_at__gte'] = expires_after_parsed.replace( +                tzinfo=datetime.timezone.utc              )          filter_expires_before = self.request.query_params.get('expires_before')          if filter_expires_before:              try: -                expires_before_parsed = datetime.fromisoformat(filter_expires_before) +                expires_before_parsed = datetime.datetime.fromisoformat(filter_expires_before)              except ValueError:                  raise ValidationError({'expires_before': ['failed to convert to datetime']}) -            additional_filters['expires_at__lte'] = timezone.make_aware( -                expires_before_parsed, -                timezone=timezone.utc, +            additional_filters['expires_at__lte'] = expires_before_parsed.replace( +                tzinfo=datetime.timezone.utc              )          if 'expires_at__lte' in additional_filters and 'expires_at__gte' in additional_filters:  |