diff options
| author |  mbaruh <[email protected]> | 2022-01-01 14:41:36 +0200 |
|---|---|---|
| committer | mbaruh <[email protected]> | 2022-01-01 14:41:36 +0200 |
| commit | 78e91c433b193682d82bbeecd6e73c2b01964b3d (patch) | |
| tree | 3ad685d2b21bce9ce3f8ee4a2eccd674b729ca18 | |
| parent | Merge branch 'main' into new-filter-schema (diff) | |
Merge migrations and correct filter defaults to be all null
| -rw-r--r-- | pydis_site/apps/api/migrations/0070_new_filter_schema.py | 4 | ||||
| -rw-r--r-- | pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py (renamed from pydis_site/apps/api/migrations/0079_add_server_message_and_alert_fields.py) | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pydis_site/apps/api/migrations/0070_new_filter_schema.py b/pydis_site/apps/api/migrations/0070_new_filter_schema.py index f56c29f8..2c15605c 100644 --- a/pydis_site/apps/api/migrations/0070_new_filter_schema.py +++ b/pydis_site/apps/api/migrations/0070_new_filter_schema.py @@ -60,7 +60,7 @@ def forward(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None: enabled=None, dm_content=None, infraction_type=None, - infraction_reason="", + infraction_reason=None, infraction_duration=None, disallowed_channels=None, disallowed_categories=None, @@ -96,7 +96,7 @@ class Migration(migrations.Migration): ('enabled', models.BooleanField(help_text='Whether this filter is currently enabled.', null=True)), ('dm_content', models.CharField(help_text='The DM to send to a user triggering this filter.', max_length=1000, null=True)), ('infraction_type', models.CharField(choices=[('note', 'Note'), ('warning', 'Warning'), ('watch', 'Watch'), ('mute', 'Mute'), ('kick', 'Kick'), ('ban', 'Ban'), ('superstar', 'Superstar'), ('voice_ban', 'Voice Ban')], help_text='The infraction to apply to this user.', max_length=9, null=True)), - ('infraction_reason', models.CharField(help_text='The reason to give for the infraction.', max_length=1000)), + ('infraction_reason', models.CharField(help_text='The reason to give for the infraction.', max_length=1000, null=True)), ('infraction_duration', models.DurationField(help_text='The duration of the infraction. Null if permanent.', null=True)), ('disallowed_channels', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), null=True, size=None)), ('disallowed_categories', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), null=True, size=None)), diff --git a/pydis_site/apps/api/migrations/0079_add_server_message_and_alert_fields.py b/pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py index c6299cb9..49da62b6 100644 --- a/pydis_site/apps/api/migrations/0079_add_server_message_and_alert_fields.py +++ b/pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py @@ -29,6 +29,7 @@ def unmigrate_filterlist(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> class Migration(migrations.Migration): dependencies = [ + ('api', '0078_merge_20211213_0552'), ('api', '0078_merge_20211218_2200'), ] |