diff options
13 files changed, 23 insertions, 12 deletions
diff --git a/bot/exts/filtering/_settings.py b/bot/exts/filtering/_settings.py index f88b26ee3..cbd682d6d 100644 --- a/bot/exts/filtering/_settings.py +++ b/bot/exts/filtering/_settings.py @@ -31,7 +31,7 @@ def create_settings( action_data[entry_name] = entry_data elif entry_name in settings_types["ValidationEntry"]: validation_data[entry_name] = entry_data - else: + elif entry_name not in _already_warned: log.warning( f"A setting named {entry_name} was loaded from the database, but no matching class." ) diff --git a/bot/exts/filtering/_settings_types/__init__.py b/bot/exts/filtering/_settings_types/__init__.py index 620290cb2..61b5737d4 100644 --- a/bot/exts/filtering/_settings_types/__init__.py +++ b/bot/exts/filtering/_settings_types/__init__.py @@ -1,10 +1,5 @@ -from os.path import dirname - -from bot.exts.filtering._settings_types.settings_entry import ActionEntry, ValidationEntry -from bot.exts.filtering._utils import subclasses_in_package - -action_types = subclasses_in_package(dirname(__file__), f"{__name__}.", ActionEntry) -validation_types = subclasses_in_package(dirname(__file__), f"{__name__}.", ValidationEntry) +from bot.exts.filtering._settings_types.actions import action_types +from bot.exts.filtering._settings_types.validations import validation_types settings_types = { "ActionEntry": {settings_type.name: settings_type for settings_type in action_types}, diff --git a/bot/exts/filtering/_settings_types/actions/__init__.py b/bot/exts/filtering/_settings_types/actions/__init__.py new file mode 100644 index 000000000..a8175b976 --- /dev/null +++ b/bot/exts/filtering/_settings_types/actions/__init__.py @@ -0,0 +1,8 @@ +from os.path import dirname + +from bot.exts.filtering._settings_types.settings_entry import ActionEntry +from bot.exts.filtering._utils import subclasses_in_package + +action_types = subclasses_in_package(dirname(__file__), f"{__name__}.", ActionEntry) + +__all__ = [action_types] diff --git a/bot/exts/filtering/_settings_types/delete_messages.py b/bot/exts/filtering/_settings_types/actions/delete_messages.py index 710cb0ed8..710cb0ed8 100644 --- a/bot/exts/filtering/_settings_types/delete_messages.py +++ b/bot/exts/filtering/_settings_types/actions/delete_messages.py diff --git a/bot/exts/filtering/_settings_types/infraction_and_notification.py b/bot/exts/filtering/_settings_types/actions/infraction_and_notification.py index 4fcf2aa65..4fcf2aa65 100644 --- a/bot/exts/filtering/_settings_types/infraction_and_notification.py +++ b/bot/exts/filtering/_settings_types/actions/infraction_and_notification.py diff --git a/bot/exts/filtering/_settings_types/ping.py b/bot/exts/filtering/_settings_types/actions/ping.py index 0bfc12809..0bfc12809 100644 --- a/bot/exts/filtering/_settings_types/ping.py +++ b/bot/exts/filtering/_settings_types/actions/ping.py diff --git a/bot/exts/filtering/_settings_types/send_alert.py b/bot/exts/filtering/_settings_types/actions/send_alert.py index 04e400764..04e400764 100644 --- a/bot/exts/filtering/_settings_types/send_alert.py +++ b/bot/exts/filtering/_settings_types/actions/send_alert.py diff --git a/bot/exts/filtering/_settings_types/validations/__init__.py b/bot/exts/filtering/_settings_types/validations/__init__.py new file mode 100644 index 000000000..5c44e8b27 --- /dev/null +++ b/bot/exts/filtering/_settings_types/validations/__init__.py @@ -0,0 +1,8 @@ +from os.path import dirname + +from bot.exts.filtering._settings_types.settings_entry import ValidationEntry +from bot.exts.filtering._utils import subclasses_in_package + +validation_types = subclasses_in_package(dirname(__file__), f"{__name__}.", ValidationEntry) + +__all__ = [validation_types] diff --git a/bot/exts/filtering/_settings_types/bypass_roles.py b/bot/exts/filtering/_settings_types/validations/bypass_roles.py index a5c18cffc..a5c18cffc 100644 --- a/bot/exts/filtering/_settings_types/bypass_roles.py +++ b/bot/exts/filtering/_settings_types/validations/bypass_roles.py diff --git a/bot/exts/filtering/_settings_types/channel_scope.py b/bot/exts/filtering/_settings_types/validations/channel_scope.py index fd5206b81..fd5206b81 100644 --- a/bot/exts/filtering/_settings_types/channel_scope.py +++ b/bot/exts/filtering/_settings_types/validations/channel_scope.py diff --git a/bot/exts/filtering/_settings_types/enabled.py b/bot/exts/filtering/_settings_types/validations/enabled.py index 3b5e3e446..3b5e3e446 100644 --- a/bot/exts/filtering/_settings_types/enabled.py +++ b/bot/exts/filtering/_settings_types/validations/enabled.py diff --git a/bot/exts/filtering/_settings_types/filter_dm.py b/bot/exts/filtering/_settings_types/validations/filter_dm.py index 93022320f..93022320f 100644 --- a/bot/exts/filtering/_settings_types/filter_dm.py +++ b/bot/exts/filtering/_settings_types/validations/filter_dm.py diff --git a/tests/bot/exts/filtering/test_settings_entries.py b/tests/bot/exts/filtering/test_settings_entries.py index d18861bd6..8dba5cb26 100644 --- a/tests/bot/exts/filtering/test_settings_entries.py +++ b/tests/bot/exts/filtering/test_settings_entries.py @@ -1,12 +1,12 @@ import unittest from bot.exts.filtering._filter_context import Event, FilterContext -from bot.exts.filtering._settings_types.bypass_roles import RoleBypass -from bot.exts.filtering._settings_types.channel_scope import ChannelScope -from bot.exts.filtering._settings_types.filter_dm import FilterDM -from bot.exts.filtering._settings_types.infraction_and_notification import ( +from bot.exts.filtering._settings_types.actions.infraction_and_notification import ( Infraction, InfractionAndNotification, superstar ) +from bot.exts.filtering._settings_types.validations.bypass_roles import RoleBypass +from bot.exts.filtering._settings_types.validations.channel_scope import ChannelScope +from bot.exts.filtering._settings_types.validations.filter_dm import FilterDM from tests.helpers import MockCategoryChannel, MockDMChannel, MockMember, MockMessage, MockRole, MockTextChannel |