Merge branch 'main' into otn_softdel

Author: RohanJnr

.github/CODEOWNERS

@@ -6,17 +6,12 @@ pydis_site/apps/api/viewsets/bot/infraction.py  @MarkKoz
 pydis_site/apps/home/**                         @ks129
 
 # Django ORM
-**/migrations/**                                @Akarys42
-**/models/**                                    @Akarys42 @Den4200
+**/models/**                                    @Den4200
 
 # CI & Docker
-.github/workflows/**                            @MarkKoz @Akarys42 @SebastiaanZ @Den4200 @ks129
-Dockerfile                                      @MarkKoz @Akarys42 @Den4200
-docker-compose.yml                              @MarkKoz @Akarys42 @Den4200
-
-# Tools
-poetry.lock                                     @Akarys42
-pyproject.toml                                  @Akarys42
+.github/workflows/**                            @MarkKoz @SebastiaanZ @Den4200 @ks129
+Dockerfile                                      @MarkKoz @Den4200
+docker-compose.yml                              @MarkKoz @Den4200
 
 # Metricity
 pydis_site/apps/api/models/bot/metricity.py     @jb3

poetry.lock

@@ -0,0 +1 @@
+default_app_config = 'pydis_site.apps.api.apps.ApiConfig'

pydis_site/apps/api/__init__.py

@@ -4,4 +4,12 @@
 class ApiConfig(AppConfig):
     """Django AppConfig for the API app."""
 
-    name = 'api'
+    name = 'pydis_site.apps.api'
+
+    def ready(self) -> None:
+        """
+        Gets called as soon as the registry is fully populated.
+
+        https://docs.djangoproject.com/en/3.2/ref/applications/#django.apps.AppConfig.ready
+        """
+        import pydis_site.apps.api.signals  # noqa: F401

pydis_site/apps/api/apps.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-10-27 17:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0073_otn_allow_GT_and_LT'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reminder',
+            name='failures',
+            field=models.IntegerField(default=0, help_text='Number of times we attempted to send the reminder and failed.'),
+        ),
+    ]

pydis_site/apps/api/migrations/0074_reminder_failures.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-11-17 10:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0074_reminder_failures'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='filterlist',
+            name='type',
+            field=models.CharField(choices=[('GUILD_INVITE', 'Guild Invite'), ('FILE_FORMAT', 'File Format'), ('DOMAIN_NAME', 'Domain Name'), ('FILTER_TOKEN', 'Filter Token'), ('REDIRECT', 'Redirect')], help_text='The type of allowlist this is on.', max_length=50),
+        ),
+    ]

pydis_site/apps/api/migrations/0075_add_redirects_filter.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-11-10 22:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0074_reminder_failures'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='infraction',
+            name='dm_sent',
+            field=models.BooleanField(help_text='Whether a DM was sent to the user when infraction was applied.', null=True),
+        ),
+    ]

pydis_site/apps/api/migrations/0075_infraction_dm_sent.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-11-25 19:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0075_infraction_dm_sent'),
+        ('api', '0075_add_redirects_filter'),
+    ]
+
+    operations = [
+    ]

pydis_site/apps/api/migrations/0076_merge_20211125_1941.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.13 on 2021-11-27 12:27
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+import pydis_site.apps.api.models.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0076_merge_20211125_1941'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='botsetting',
+            name='data',
+            field=models.JSONField(help_text='The actual settings of this setting.'),
+        ),
+        migrations.AlterField(
+            model_name='deletedmessage',
+            name='embeds',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.JSONField(validators=[pydis_site.apps.api.models.utils.validate_embed]), blank=True, help_text='Embeds attached to this message.', size=None),
+        ),
+    ]

pydis_site/apps/api/migrations/0077_use_generic_jsonfield.py

@@ -1,4 +1,3 @@
-from django.contrib.postgres import fields as pgfields
 from django.core.exceptions import ValidationError
 from django.db import models
 
@@ -24,6 +23,6 @@ class BotSetting(ModelReprMixin, models.Model):
         max_length=50,
         validators=(validate_bot_setting_name,)
     )
-    data = pgfields.JSONField(
+    data = models.JSONField(
         help_text="The actual settings of this setting."
     )