Merge branch 'main' into use-new-message-view

Author: ChrisLovering

poetry.lock

@@ -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."
     )

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

@@ -48,7 +48,7 @@ class Message(ModelReprMixin, models.Model):
         blank=True
     )
     embeds = pgfields.ArrayField(
-        pgfields.JSONField(
+        models.JSONField(
             validators=(validate_embed,)
         ),
         blank=True,

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

@@ -103,11 +103,10 @@ def validate_embed(embed: Any) -> None:
 
     Example:
 
-        >>> from django.contrib.postgres import fields as pgfields
         >>> from django.db import models
         >>> from pydis_site.apps.api.models.utils import validate_embed
         >>> class MyMessage(models.Model):
-        ...     embed = pgfields.JSONField(
+        ...     embed = models.JSONField(
         ...         validators=(
         ...             validate_embed,
         ...         )

pydis_site/apps/api/models/utils.py

@@ -7,9 +7,9 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "3.9.*"
-django = "~=3.0.4"
+django = "~=3.1.13"
 django-environ = "~=0.4.5"
-django-filter = "~=2.1.0"
+django-filter = "~=21.1"
 djangorestframework = "~=3.11.0"
 psycopg2-binary = "~=2.8.0"
 django-simple-bulma = "~=2.1"