diff options
| author | 2022-02-15 22:59:04 +0100 | |
|---|---|---|
| committer | 2022-02-15 22:59:04 +0100 | |
| commit | 7d22d8427fa73e6209ffcea827d9e460b6c1d985 (patch) | |
| tree | 515aa86d4cf929abf4574002f8c281b0b73a6980 /pydis_site/apps | |
| parent | Use singular nouns for filter list names (diff) | |
Patch a minor issue with FilterList field naming in migrations
Diffstat (limited to 'pydis_site/apps')
3 files changed, 13 insertions, 12 deletions
| diff --git a/pydis_site/apps/api/migrations/0075_prepare_filter_and_filterlist_for_new_filter_schema.py b/pydis_site/apps/api/migrations/0075_prepare_filter_and_filterlist_for_new_filter_schema.py index 2a85fa63..1e24b379 100644 --- a/pydis_site/apps/api/migrations/0075_prepare_filter_and_filterlist_for_new_filter_schema.py +++ b/pydis_site/apps/api/migrations/0075_prepare_filter_and_filterlist_for_new_filter_schema.py @@ -17,7 +17,7 @@ def migrate_filterlist(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> N              filter_list.name = change_map.get(filter_list.name)              filter_list.save()      redirects = FilterList( -        name="redirects", +        name="redirect",          ping_type=[],          dm_ping_type=[],          enabled_channels=[], @@ -35,16 +35,16 @@ def migrate_filterlist(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> N  def unmigrate_filterlist(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:      FilterList = apps.get_model("api", "FilterList")      change_map = { -        "tokens": "filter_token", -        "domains": "domain_name", -        "invites": "guild_invite", -        "formats": "file_format" +        "token": "filter_token", +        "domain": "domain_name", +        "invite": "guild_invite", +        "format": "file_format"      }      for filter_list in FilterList.objects.all():          if change_map.get(filter_list.name):              filter_list.name = change_map.get(filter_list.name)              filter_list.save() -    FilterList.objects.filter(name="redirects").delete() +    FilterList.objects.filter(name="redirect").delete()  class Migration(migrations.Migration): diff --git a/pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py b/pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py index 49da62b6..cae175df 100644 --- a/pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py +++ b/pydis_site/apps/api/migrations/0079_dm_embed_and_alert_fields.py @@ -7,11 +7,11 @@ from django.db.backends.base.schema import BaseDatabaseSchemaEditor  def migrate_filterlist(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None:      FilterList = apps.get_model("api", "FilterList")      change_map = { -        "tokens": True, -        "domains": True, -        "invites": True, -        "extensions": False, -        "redirects": False +        "token": True, +        "domain": True, +        "invite": True, +        "extension": False, +        "redirect": False      }      for filter_list in FilterList.objects.all():          filter_list.send_alert = change_map.get(filter_list.name) diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py index 88b6e2bd..99f2b630 100644 --- a/pydis_site/apps/api/serializers.py +++ b/pydis_site/apps/api/serializers.py @@ -215,7 +215,8 @@ class FilterSerializer(ModelSerializer):                  {name: getattr(instance, name) for name in BASE_SETTINGS_FIELDS}                  | {                      "infraction_and_notification": -                        {name: getattr(instance, name) for name in INFRACTION_AND_NOTIFICATION_FIELDS} +                        {name: getattr(instance, name) +                         for name in INFRACTION_AND_NOTIFICATION_FIELDS}                  } | {                      "channel_scope":                          {name: getattr(instance, name) for name in CHANNEL_SCOPE_FIELDS} | 
