Update filters API to actually work

2 files changed, 71 insertions, 63 deletions

diff --git a/pydis_site/apps/api/models/bot/filters.py b/pydis_site/apps/api/models/bot/filters.py
index 365259e7..b9a081e6 100644
--- a/pydis_site/apps/api/models/bot/filters.py
+++ b/pydis_site/apps/api/models/bot/filters.py
@@ -1,4 +1,3 @@
-from abc import abstractmethod
 from typing import List
 
 from django.contrib.postgres.fields import ArrayField
@@ -6,8 +5,6 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import UniqueConstraint
 
-from pydis_site.apps.api.models.mixins import AbstractModelMeta
-
 
 class FilterListType(models.IntegerChoices):
     """Choice between allow or deny for a list type."""
@@ -43,40 +40,9 @@ def validate_ping_field(value_list: List[str]) -> None:
         raise ValidationError(f"{value!r} isn't a valid ping type.")
 
 
-class FilterSettingsMixin(models.Model, metaclass=AbstractModelMeta):
-    """Mixin for settings of a filter list."""
-
-    @staticmethod
-    @abstractmethod
-    def allow_null() -> bool:
-        """Abstract property for allowing null values."""
+class FilterSettingsMixin(models.Model):
+    """Mixin for common settings of a filters and filter lists."""
 
-    ping_type = ArrayField(
-        models.CharField(max_length=20),
-        validators=(validate_ping_field,),
-        help_text="Who to ping when this filter triggers.",
-        null=allow_null.__func__()
-    )
-    filter_dm = models.BooleanField(help_text="Whether DMs should be filtered.", null=True)
-    dm_ping_type = ArrayField(
-        models.CharField(max_length=20),
-        validators=(validate_ping_field,),
-        help_text="Who to ping when this filter triggers on a DM.",
-        null=allow_null.__func__()
-    )
-    delete_messages = models.BooleanField(
-        help_text="Whether this filter should delete messages triggering it.",
-        null=allow_null.__func__()
-    )
-    bypass_roles = ArrayField(
-        models.BigIntegerField(),
-        help_text="Roles and users who can bypass this filter.",
-        null=allow_null.__func__()
-    )
-    enabled = models.BooleanField(
-        help_text="Whether this filter is currently enabled.",
-        null=allow_null.__func__()
-    )
     dm_content = models.CharField(
         max_length=1000,
         null=True,
@@ -97,18 +63,6 @@ class FilterSettingsMixin(models.Model, metaclass=AbstractModelMeta):
         help_text="The duration of the infraction. Null if permanent."
     )
 
-    # Where a filter should apply.
-    #
-    # The resolution is done in the following order:
-    #   - disallowed channels
-    #   - disallowed categories
-    #   - allowed categories
-    #   - allowed channels
-    disallowed_channels = ArrayField(models.IntegerField())
-    disallowed_categories = ArrayField(models.IntegerField())
-    allowed_channels = ArrayField(models.IntegerField())
-    allowed_categories = ArrayField(models.IntegerField())
-
     class Meta:
         """Metaclass for settings mixin."""
 
@@ -123,11 +77,43 @@ class FilterList(FilterSettingsMixin):
         choices=FilterListType.choices,
         help_text="Whether this list is an allowlist or denylist"
     )
-
-    @staticmethod
-    def allow_null() -> bool:
-        """Do not allow null values for default settings."""
-        return False
+    ping_type = 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_ping_type = ArrayField(
+        models.CharField(max_length=20),
+        validators=(validate_ping_field,),
+        help_text="Who to ping when this filter triggers on a DM.",
+        null=False
+    )
+    delete_messages = models.BooleanField(
+        help_text="Whether this filter should delete messages triggering it.",
+        null=False
+    )
+    bypass_roles = ArrayField(
+        models.BigIntegerField(),
+        help_text="Roles and users who can bypass this filter.",
+        null=False
+    )
+    enabled = models.BooleanField(
+        help_text="Whether this filter is currently enabled.",
+        null=False
+    )
+    # Where a filter should apply.
+    #
+    # The resolution is done in the following order:
+    #   - disallowed channels
+    #   - disallowed categories
+    #   - allowed categories
+    #   - allowed channels
+    disallowed_channels = ArrayField(models.IntegerField())
+    disallowed_categories = ArrayField(models.IntegerField())
+    allowed_channels = ArrayField(models.IntegerField())
+    allowed_categories = ArrayField(models.IntegerField())
 
     class Meta:
         """Constrain name and list_type unique."""
@@ -150,11 +136,38 @@ class Filter(FilterSettingsMixin):
         FilterList, models.CASCADE, related_name="filters",
         help_text="The filter list containing this filter."
     )
+    ping_type = 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_ping_type = ArrayField(
+        models.CharField(max_length=20),
+        validators=(validate_ping_field,),
+        help_text="Who to ping when this filter triggers on a DM.",
+        null=True
+    )
+    delete_messages = models.BooleanField(
+        help_text="Whether this filter should delete messages triggering it.",
+        null=True
+    )
+    bypass_roles = ArrayField(
+        models.BigIntegerField(),
+        help_text="Roles and users who can bypass this filter.",
+        null=True
+    )
+    enabled = models.BooleanField(
+        help_text="Whether this filter is currently enabled.",
+        null=True
+    )
+
+    # Check FilterList model for information about these properties.
+    disallowed_channels = ArrayField(models.IntegerField(), null=True)
+    disallowed_categories = ArrayField(models.IntegerField(), null=True)
+    allowed_channels = ArrayField(models.IntegerField(), null=True)
+    allowed_categories = ArrayField(models.IntegerField(), null=True)
 
     def __str__(self) -> str:
         return f"Filter {self.content!r}"
-
-    @staticmethod
-    def allow_null() -> bool:
-        """Allow null values for overrides."""
-        return True
diff --git a/pydis_site/apps/api/models/mixins.py b/pydis_site/apps/api/models/mixins.py
index d32e6e72..5d75b78b 100644
--- a/pydis_site/apps/api/models/mixins.py
+++ b/pydis_site/apps/api/models/mixins.py
@@ -1,4 +1,3 @@
-from abc import ABCMeta
 from operator import itemgetter
 
 from django.db import models
@@ -30,7 +29,3 @@ class ModelTimestampMixin(models.Model):
         """Metaconfig for the mixin."""
 
         abstract = True
-
-
-class AbstractModelMeta(ABCMeta, type(models.Model)):
-    """Metaclass for ABCModel class."""