Merge branch 'main' into speedup-tests

Author: ChrisLovering

poetry.lock

@@ -0,0 +1,26 @@
+# Generated by Django 4.0.6 on 2022-07-27 20:32
+
+import django.utils.timezone
+from django.db import migrations, models
+from django.apps.registry import Apps
+
+
+def set_last_applied_to_inserted_at(apps: Apps, schema_editor):
+    Infractions = apps.get_model("api", "infraction")
+    Infractions.objects.all().update(last_applied=models.F("inserted_at"))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0083_remove_embed_validation'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='infraction',
+            name='last_applied',
+            field=models.DateTimeField(default=django.utils.timezone.now, help_text='The date and time of when this infraction was last applied.'),
+        ),
+        migrations.RunPython(set_last_applied_to_inserted_at)
+    ]

pydis_site/apps/api/migrations/0084_infraction_last_applied.py

@@ -23,6 +23,12 @@ class Infraction(ModelReprMixin, models.Model):
         default=timezone.now,
         help_text="The date and time of the creation of this infraction."
     )
+    last_applied = models.DateTimeField(
+        # This default is for backwards compatibility with bot versions
+        # that don't explicitly give a value.
+        default=timezone.now,
+        help_text="The date and time of when this infraction was last applied."
+    )
     expires_at = models.DateTimeField(
         null=True,
         help_text=(

pydis_site/apps/api/models/bot/infraction.py

@@ -1,7 +1,6 @@
-import typing
-
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.response import Response
+from rest_framework.utils.serializer_helpers import ReturnList
 
 
 class LimitOffsetPaginationExtended(LimitOffsetPagination):
@@ -44,6 +43,6 @@ class LimitOffsetPaginationExtended(LimitOffsetPagination):
 
     default_limit = 100
 
-    def get_paginated_response(self, data: typing.Any) -> Response:
+    def get_paginated_response(self, data: ReturnList) -> Response:
         """Override to skip metadata i.e. `count`, `next`, and `previous`."""
         return Response(data)