refactor(moderation): update import paths for CaseType and Case models

kzndotsh · kzndotsh · commit cc353f60b711 · 2025-08-24T23:52:47.000-04:00
- Changed the import statements for CaseType and Case from tux.database.models.moderation to tux.database.models for improved clarity and consistency across moderation modules.
- Enhanced organization of import paths in moderation-related files.
diff --git a/src/tux/modules/moderation/__init__.py b/src/tux/modules/moderation/__init__.py
@@ -10,7 +10,7 @@
 
 from tux.core.base_cog import BaseCog
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.constants import CONST
 from tux.shared.exceptions import handle_gather_result
 from tux.ui.embeds import EmbedCreator, EmbedType
diff --git a/src/tux/modules/moderation/ban.py b/src/tux/modules/moderation/ban.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import BanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/cases.py b/src/tux/modules/moderation/cases.py
@@ -9,8 +9,8 @@
 from tux.core import checks
 from tux.core.flags import CaseModifyFlags, CasesViewFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import Case
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import Case
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.constants import CONST
 from tux.shared.functions import generate_usage
 from tux.ui.embeds import EmbedCreator, EmbedType
diff --git a/src/tux/modules/moderation/jail.py b/src/tux/modules/moderation/jail.py
@@ -5,7 +5,7 @@
 from tux.core import checks
 from tux.core.flags import JailFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType
+from tux.database.models import CaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/kick.py b/src/tux/modules/moderation/kick.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import KickFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/pollban.py b/src/tux/modules/moderation/pollban.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import PollBanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/pollunban.py b/src/tux/modules/moderation/pollunban.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import PollUnbanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/snippetban.py b/src/tux/modules/moderation/snippetban.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import SnippetBanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType
+from tux.database.models import CaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/snippetunban.py b/src/tux/modules/moderation/snippetunban.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import SnippetUnbanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType
+from tux.database.models import CaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/tempban.py b/src/tux/modules/moderation/tempban.py
@@ -7,8 +7,8 @@
 from tux.core import checks
 from tux.core.flags import TempBanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import Case
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import Case
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/timeout.py b/src/tux/modules/moderation/timeout.py
@@ -6,7 +6,7 @@
 from tux.core import checks
 from tux.core.flags import TimeoutFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage, parse_time_string
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/unban.py b/src/tux/modules/moderation/unban.py
@@ -6,7 +6,7 @@
 from tux.core import checks
 from tux.core.flags import UnbanFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.constants import CONST
 from tux.shared.functions import generate_usage
 
diff --git a/src/tux/modules/moderation/unjail.py b/src/tux/modules/moderation/unjail.py
@@ -7,8 +7,8 @@
 from tux.core import checks
 from tux.core.flags import UnjailFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import Case
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import Case
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/untimeout.py b/src/tux/modules/moderation/untimeout.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import UntimeoutFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/moderation/warn.py b/src/tux/modules/moderation/warn.py
@@ -4,7 +4,7 @@
 from tux.core import checks
 from tux.core.flags import WarnFlags
 from tux.core.types import Tux
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
 from tux.shared.functions import generate_usage
 
 from . import ModerationCogBase
diff --git a/src/tux/modules/snippets/__init__.py b/src/tux/modules/snippets/__init__.py
@@ -5,8 +5,8 @@
 from tux.core import checks
 from tux.core.base_cog import BaseCog
 from tux.core.types import Tux
-from tux.database.models.content import Snippet
-from tux.database.models.moderation import CaseType as DBCaseType
+from tux.database.models import CaseType as DBCaseType
+from tux.database.models import Snippet
 from tux.shared.config.settings import Config
 from tux.shared.constants import CONST
 from tux.shared.exceptions import PermissionLevelError
diff --git a/src/tux/modules/snippets/list_snippets.py b/src/tux/modules/snippets/list_snippets.py
@@ -2,7 +2,7 @@
 from reactionmenu import ViewButton, ViewMenu
 
 from tux.core.types import Tux
-from tux.database.models.content import Snippet
+from tux.database.models import Snippet
 from tux.shared.constants import CONST
 
 from . import SnippetsBaseCog
diff --git a/src/tux/modules/utility/afk.py b/src/tux/modules/utility/afk.py
@@ -9,7 +9,7 @@
 
 from tux.core.base_cog import BaseCog
 from tux.core.types import Tux
-from tux.database.models.social import AFK as AFKMODEL
+from tux.database.models import AFK as AFKMODEL
 from tux.modules.utility import add_afk, del_afk
 
 # TODO: add `afk until` command, or add support for providing a timeframe in the regular `afk` and `permafk` commands
diff --git a/src/tux/modules/utility/remindme.py b/src/tux/modules/utility/remindme.py
@@ -8,7 +8,7 @@
 
 from tux.core.base_cog import BaseCog
 from tux.core.types import Tux
-from tux.database.models.content import Reminder
+from tux.database.models import Reminder
 from tux.shared.functions import convert_to_seconds
 from tux.ui.embeds import EmbedCreator
 
