Add basic validation for infraction fields + use common infraction types

1 files changed, 8 insertions, 11 deletions

diff --git a/pydis_site/apps/api/models/bot/filters.py b/pydis_site/apps/api/models/bot/filters.py
index b9a081e6..eebcf703 100644
--- a/pydis_site/apps/api/models/bot/filters.py
+++ b/pydis_site/apps/api/models/bot/filters.py
@@ -5,6 +5,8 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import UniqueConstraint
 
+from pydis_site.apps.api.models import Infraction
+
 
 class FilterListType(models.IntegerChoices):
     """Choice between allow or deny for a list type."""
@@ -13,16 +15,6 @@ class FilterListType(models.IntegerChoices):
     DENY = 0
 
 
-class InfractionType(models.TextChoices):
-    """Possible type of infractions."""
-
-    NOTE = "Note"
-    WARN = "Warn"
-    MUTE = "Mute"
-    KICK = "Kick"
-    BAN = "Ban"
-
-
 # Valid special values in ping related fields
 VALID_PINGS = ("everyone", "here", "moderators", "onduty", "admins")
 
@@ -49,7 +41,7 @@ class FilterSettingsMixin(models.Model):
         help_text="The DM to send to a user triggering this filter."
     )
     infraction_type = models.CharField(
-        choices=InfractionType.choices,
+        choices=Infraction.TYPE_CHOICES,
         max_length=4,
         null=True,
         help_text="The infraction to apply to this user."
@@ -63,6 +55,11 @@ class FilterSettingsMixin(models.Model):
         help_text="The duration of the infraction. Null if permanent."
     )
 
+    def clean(self):
+        """Validate infraction fields as whole."""
+        if (self.infraction_duration or self.infraction_reason) and not self.infraction_type:
+            raise ValidationError("Infraction type is required if setting infraction duration or reason.")
+
     class Meta:
         """Metaclass for settings mixin."""