aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site/apps/api
diff options
context:
space:
mode:
authorGravatar mbaruh <[email protected]>2023-03-25 21:35:49 +0300
committerGravatar mbaruh <[email protected]>2023-03-25 21:35:49 +0300
commit91b89475913210400cf39884efe37ab5552efbf7 (patch)
treef0e777681d485f1f800977a30d8e12cdf825d65a /pydis_site/apps/api
parentSpecify the common elements in the validation errors (diff)
Use consistent quoting style
Co-authored-by: Johannes Christ <[email protected]>
Diffstat (limited to 'pydis_site/apps/api')
-rw-r--r--pydis_site/apps/api/models/bot/filters.py4
-rw-r--r--pydis_site/apps/api/serializers.py68
2 files changed, 36 insertions, 36 deletions
diff --git a/pydis_site/apps/api/models/bot/filters.py b/pydis_site/apps/api/models/bot/filters.py
index 60ae394b..c6f6f851 100644
--- a/pydis_site/apps/api/models/bot/filters.py
+++ b/pydis_site/apps/api/models/bot/filters.py
@@ -253,8 +253,8 @@ class Filter(FilterBase):
constraints = (
UniqueConstraint(
fields=tuple(
- [field.name for field in FilterBase._meta.fields
- if field.name not in ("id", "description", "created_at", "updated_at")]
+ field.name for field in FilterBase._meta.fields
+ if field.name not in ("id", "description", "created_at", "updated_at")
),
name="unique_filters"),
)
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index bfad18ab..da02c837 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -188,27 +188,27 @@ BASE_FILTER_FIELDS = (
)
BASE_FILTERLIST_FIELDS = ('id', 'created_at', 'updated_at', 'name', 'list_type')
BASE_SETTINGS_FIELDS = (
- "bypass_roles",
- "filter_dm",
- "enabled",
- "remove_context",
- "send_alert"
+ 'bypass_roles',
+ 'filter_dm',
+ 'enabled',
+ 'remove_context',
+ 'send_alert'
)
INFRACTION_AND_NOTIFICATION_FIELDS = (
- "infraction_type",
- "infraction_reason",
- "infraction_duration",
- "infraction_channel",
- "dm_content",
- "dm_embed"
+ 'infraction_type',
+ 'infraction_reason',
+ 'infraction_duration',
+ 'infraction_channel',
+ 'dm_content',
+ 'dm_embed'
)
CHANNEL_SCOPE_FIELDS = (
- "disabled_channels",
- "disabled_categories",
- "enabled_channels",
- "enabled_categories"
+ 'disabled_channels',
+ 'disabled_categories',
+ 'enabled_channels',
+ 'enabled_categories'
)
-MENTIONS_FIELDS = ("guild_pings", "dm_pings")
+MENTIONS_FIELDS = ('guild_pings', 'dm_pings')
def _create_meta_extra_kwargs(*, for_filter: bool) -> dict[str, dict[str, bool]]:
@@ -228,7 +228,7 @@ def get_field_value(data: dict, field_name: str) -> Any:
"""Get the value directly from the key, or from the filter list if it's missing or is None."""
if data.get(field_name) is not None:
return data[field_name]
- return getattr(data["filter_list"], field_name)
+ return getattr(data['filter_list'], field_name)
class FilterSerializer(ModelSerializer):
@@ -238,18 +238,18 @@ class FilterSerializer(ModelSerializer):
"""Perform infraction data + allowed and disallowed lists validation."""
if (
(
- get_field_value(data, "infraction_reason")
- or get_field_value(data, "infraction_duration")
+ get_field_value(data, 'infraction_reason')
+ or get_field_value(data, 'infraction_duration')
)
- and get_field_value(data, "infraction_type") == "NONE"
+ and get_field_value(data, 'infraction_type') == 'NONE'
):
raise ValidationError(
"Infraction type is required with infraction duration or reason."
)
common_channels = (
- set(get_field_value(data, "disabled_channels"))
- & set(get_field_value(data, "enabled_channels"))
+ set(get_field_value(data, 'disabled_channels'))
+ & set(get_field_value(data, 'enabled_channels'))
)
if common_channels:
raise ValidationError(
@@ -258,8 +258,8 @@ class FilterSerializer(ModelSerializer):
)
common_categories = (
- set(get_field_value(data, "disabled_categories"))
- & set(get_field_value(data, "enabled_categories"))
+ set(get_field_value(data, 'disabled_categories'))
+ & set(get_field_value(data, 'enabled_categories'))
)
if common_categories:
raise ValidationError(
@@ -305,19 +305,19 @@ class FilterSerializer(ModelSerializer):
into a sub-field called `settings`.
"""
settings = {name: getattr(instance, name) for name in BASE_SETTINGS_FIELDS}
- settings["infraction_and_notification"] = {
+ settings['infraction_and_notification'] = {
name: getattr(instance, name) for name in INFRACTION_AND_NOTIFICATION_FIELDS
}
- settings["channel_scope"] = {
+ settings['channel_scope'] = {
name: getattr(instance, name) for name in CHANNEL_SCOPE_FIELDS
}
- settings["mentions"] = {
+ settings['mentions'] = {
name: getattr(instance, name) for name in MENTIONS_FIELDS
}
schema = {name: getattr(instance, name) for name in BASE_FILTER_FIELDS}
- schema["filter_list"] = instance.filter_list.id
- schema["settings"] = settings
+ schema['filter_list'] = instance.filter_list.id
+ schema['settings'] = settings
return schema
@@ -388,19 +388,19 @@ class FilterListSerializer(ModelSerializer):
into a sub-field called `settings`.
"""
schema = {name: getattr(instance, name) for name in BASE_FILTERLIST_FIELDS}
- schema["filters"] = [
+ schema['filters'] = [
FilterSerializer(many=False).to_representation(instance=item)
for item in Filter.objects.filter(filter_list=instance.id)
]
settings = {name: getattr(instance, name) for name in BASE_SETTINGS_FIELDS}
- settings["infraction_and_notification"] = {
+ settings['infraction_and_notification'] = {
name: getattr(instance, name) for name in INFRACTION_AND_NOTIFICATION_FIELDS
}
- settings["channel_scope"] = {name: getattr(instance, name) for name in CHANNEL_SCOPE_FIELDS}
- settings["mentions"] = {name: getattr(instance, name) for name in MENTIONS_FIELDS}
+ settings['channel_scope'] = {name: getattr(instance, name) for name in CHANNEL_SCOPE_FIELDS}
+ settings['mentions'] = {name: getattr(instance, name) for name in MENTIONS_FIELDS}
- schema["settings"] = settings
+ schema['settings'] = settings
return schema
# endregion