aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site/apps/api/models
diff options
context:
space:
mode:
authorGravatar mbaruh <[email protected]>2022-03-10 20:56:47 +0200
committerGravatar mbaruh <[email protected]>2022-03-10 20:56:47 +0200
commit05e2bce1e82e422755396d1e6e489d6792ec0115 (patch)
treea5ea3989d6c1cd8ab7faa3cc9e0aba699ce60c3b /pydis_site/apps/api/models
parentChange ping fields names (diff)
Remove role validation
Roles can be either IDs or names, so the current validation is not relevant anymore. Furthermore the ping fields can accept user IDs or names.
Diffstat (limited to 'pydis_site/apps/api/models')
-rw-r--r--pydis_site/apps/api/models/bot/filters.py32
1 files changed, 0 insertions, 32 deletions
diff --git a/pydis_site/apps/api/models/bot/filters.py b/pydis_site/apps/api/models/bot/filters.py
index 4dbf1875..13b332d2 100644
--- a/pydis_site/apps/api/models/bot/filters.py
+++ b/pydis_site/apps/api/models/bot/filters.py
@@ -16,32 +16,6 @@ class FilterListType(models.IntegerChoices):
DENY = 0
-# Valid special values in ping related fields
-VALID_PINGS = ("everyone", "here", "moderators", "onduty", "admins")
-VALID_BYPASS_ROLES = ("staff",)
-
-
-def validate_ping_field(value_list: List[str]) -> None:
- """Validate that the values are either a special value or a UID."""
- for value in value_list:
- # Check if it is a special value
- if value in VALID_PINGS:
- continue
- # Check if it is a UID
- if value.isnumeric():
- continue
-
- raise ValidationError(f"{value!r} isn't a valid ping type.")
-
-
-def validate_bypass_roles_field(value_list: List[str]) -> None:
- """Validate that the vclues are either a special value or a Role ID."""
- for value in value_list:
- if value.isnumeric() or value in VALID_BYPASS_ROLES:
- continue
- raise ValidationError(f"{value!r} isn't a valid (bypass) role.")
-
-
class FilterSettingsMixin(models.Model):
"""Mixin for common settings of a filters and filter lists."""
@@ -86,14 +60,12 @@ class FilterList(FilterSettingsMixin):
)
guild_pings = ArrayField(
models.CharField(max_length=20),
- validators=(validate_ping_field,),
help_text="Who to ping when this filter triggers.",
null=False
)
filter_dm = models.BooleanField(help_text="Whether DMs should be filtered.", null=False)
dm_pings = ArrayField(
models.CharField(max_length=20),
- validators=(validate_ping_field,),
help_text="Who to ping when this filter triggers on a DM.",
null=False
)
@@ -104,7 +76,6 @@ class FilterList(FilterSettingsMixin):
bypass_roles = ArrayField(
models.CharField(max_length=100),
help_text="Roles and users who can bypass this filter.",
- validators=(validate_bypass_roles_field,),
null=False
)
enabled = models.BooleanField(
@@ -149,14 +120,12 @@ class Filter(FilterSettingsMixin):
)
guild_pings = ArrayField(
models.CharField(max_length=20),
- validators=(validate_ping_field,),
help_text="Who to ping when this filter triggers.",
null=True
)
filter_dm = models.BooleanField(help_text="Whether DMs should be filtered.", null=True)
dm_pings = ArrayField(
models.CharField(max_length=20),
- validators=(validate_ping_field,),
help_text="Who to ping when this filter triggers on a DM.",
null=True
)
@@ -167,7 +136,6 @@ class Filter(FilterSettingsMixin):
bypass_roles = ArrayField(
models.CharField(max_length=100),
help_text="Roles and users who can bypass this filter.",
- validators=(validate_bypass_roles_field,),
null=True
)
enabled = models.BooleanField(