Bring back enabled categories, remove redundant validators

There needs to be a way to only enable a filter in a specific category, so this setting now fulfills that role. Disabled channels can be used to disable a filter in a specific channel within the category.

Additionally the validators which maybe convert to int are now removed. As long as the int is the first in the Union, it will happen anyway.

2 files changed, 19 insertions, 26 deletions

diff --git a/bot/exts/filtering/_settings_types/validations/bypass_roles.py b/bot/exts/filtering/_settings_types/validations/bypass_roles.py
index 193b07e13..d42e6407c 100644
--- a/bot/exts/filtering/_settings_types/validations/bypass_roles.py
+++ b/bot/exts/filtering/_settings_types/validations/bypass_roles.py
@@ -1,7 +1,6 @@
 from typing import ClassVar, Union
 
 from discord import Member
-from pydantic import validator
 
 from bot.exts.filtering._filter_context import FilterContext
 from bot.exts.filtering._settings_types.settings_entry import ValidationEntry
@@ -15,15 +14,6 @@ class RoleBypass(ValidationEntry):
 
     bypass_roles: set[Union[int, str]]
 
-    @validator("bypass_roles", pre=True, each_item=True)
-    @classmethod
-    def maybe_cast_to_int(cls, role: str) -> Union[int, str]:
-        """If the string is numeric, cast it to int."""
-        try:
-            return int(role)
-        except ValueError:
-            return role
-
     def triggers_on(self, ctx: FilterContext) -> bool:
         """Return whether the filter should be triggered on this user given their roles."""
         if not isinstance(ctx.author, Member):
diff --git a/bot/exts/filtering/_settings_types/validations/channel_scope.py b/bot/exts/filtering/_settings_types/validations/channel_scope.py
index 9fb4e2ba7..deae55dfc 100644
--- a/bot/exts/filtering/_settings_types/validations/channel_scope.py
+++ b/bot/exts/filtering/_settings_types/validations/channel_scope.py
@@ -11,19 +11,28 @@ class ChannelScope(ValidationEntry):
 
     name: ClassVar[str] = "channel_scope"
     description: ClassVar[str] = {
-        "disabled_channels": "A list of channel IDs or channel names. The filter will not trigger in these channels.",
+        "disabled_channels": (
+            "A list of channel IDs or channel names. "
+            "The filter will not trigger in these channels even if the category is expressly enabled."
+        ),
         "disabled_categories": (
             "A list of category IDs or category names. The filter will not trigger in these categories."
         ),
         "enabled_channels": (
             "A list of channel IDs or channel names. "
-            "The filter can trigger in these channels even if the category is disabled."
+            "The filter can trigger in these channels even if the category is disabled or not expressly enabled."
+        ),
+        "enabled_categories": (
+            "A list of category IDs or category names. "
+            "If the list is not empty, filters will trigger only in channels of these categories, "
+            "unless the channel is expressly disabled."
         )
     }
 
-    disabled_channels: set[Union[str, int]]
-    disabled_categories: set[Union[str, int]]
-    enabled_channels: set[Union[str, int]]
+    disabled_channels: set[Union[int, str]]
+    disabled_categories: set[Union[int, str]]
+    enabled_channels: set[Union[int, str]]
+    enabled_categories: set[Union[int, str]]
 
     @validator("*", pre=True)
     @classmethod
@@ -33,15 +42,6 @@ class ChannelScope(ValidationEntry):
             return []
         return sequence
 
-    @validator("*", each_item=True)
-    @classmethod
-    def maybe_cast_items(cls, channel_or_category: str) -> Union[str, int]:
-        """Cast to int each value in each sequence if it is alphanumeric."""
-        try:
-            return int(channel_or_category)
-        except ValueError:
-            return channel_or_category
-
     def triggers_on(self, ctx: FilterContext) -> bool:
         """
         Return whether the filter should be triggered in the given channel.
@@ -51,13 +51,16 @@ class ChannelScope(ValidationEntry):
         """
         channel = ctx.channel
 
-        if channel.guild is None:  # This is a DM channel, outside the scope of this setting.
+        if not hasattr(channel, "category"):  # This is not a guild channel, outside the scope of this setting.
             return True
 
         enabled_channel = channel.id in self.enabled_channels or channel.name in self.enabled_channels
         disabled_channel = channel.id in self.disabled_channels or channel.name in self.disabled_channels
+        enabled_category = channel.category and (not self.enabled_categories or (
+                channel.category.id in self.enabled_categories or channel.category.name in self.enabled_categories
+        ))
         disabled_category = channel.category and (
             channel.category.id in self.disabled_categories or channel.category.name in self.disabled_categories
         )
 
-        return enabled_channel or (not disabled_channel and not disabled_category)
+        return enabled_channel or (enabled_category and not disabled_channel and not disabled_category)