From b66ab3cc28fc26762a1c463b25cf8cb72523f6da Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:35:57 +0000 Subject: [PATCH 1/2] chore: update pre-commit hook versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v5.0.0 → v6.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v5.0.0...v6.0.0) - [github.com/lyz-code/yamlfix: 1.17.0 → 1.18.0](https://github.com/lyz-code/yamlfix/compare/1.17.0...1.18.0) - [github.com/astral-sh/ruff-pre-commit: v0.12.7 → v0.13.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.12.7...v0.13.3) - [github.com/astral-sh/ruff-pre-commit: v0.12.7 → v0.13.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.12.7...v0.13.3) - [github.com/alessandrojcm/commitlint-pre-commit-hook: v9.22.0 → v9.23.0](https://github.com/alessandrojcm/commitlint-pre-commit-hook/compare/v9.22.0...v9.23.0) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b8bb83cff..51eb4d4a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ default_language_version: python: python3.13 repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-yaml - id: check-json @@ -17,7 +17,7 @@ repos: additional_dependencies: - validate-pyproject-schema-store[all] - repo: https://github.com/lyz-code/yamlfix - rev: 1.17.0 + rev: 1.18.0 hooks: - id: yamlfix exclude: \.(commitlintrc|pre-commit-hooks)\.yaml$ @@ -46,13 +46,13 @@ repos: hooks: - id: add-trailing-comma - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.12.7 + rev: v0.13.3 hooks: - id: ruff-check args: - --fix - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.12.7 + rev: v0.13.3 hooks: - id: ruff-format - repo: https://github.com/gitleaks/gitleaks @@ -60,7 +60,7 @@ repos: hooks: - id: gitleaks - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook - rev: v9.22.0 + rev: v9.23.0 hooks: - id: commitlint stages: From b7073d2850770aa909e840b8d0e9d3f10b10dd44 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 19:43:29 +0000 Subject: [PATCH 2/2] style: auto fixes from pre-commit hooks --- tests/unit/tux/utils/test_exceptions.py | 2 +- tux/cogs/moderation/__init__.py | 2 +- tux/cogs/moderation/ban.py | 2 +- tux/cogs/moderation/cases.py | 4 ++-- tux/cogs/moderation/jail.py | 2 +- tux/cogs/moderation/kick.py | 2 +- tux/cogs/moderation/pollban.py | 2 +- tux/cogs/moderation/pollunban.py | 2 +- tux/cogs/moderation/snippetban.py | 2 +- tux/cogs/moderation/snippetunban.py | 2 +- tux/cogs/moderation/tempban.py | 2 +- tux/cogs/moderation/timeout.py | 2 +- tux/cogs/moderation/unban.py | 2 +- tux/cogs/moderation/unjail.py | 2 +- tux/cogs/moderation/untimeout.py | 2 +- tux/cogs/moderation/warn.py | 2 +- tux/cogs/snippets/__init__.py | 2 +- tux/cogs/snippets/list_snippets.py | 2 +- tux/cogs/utility/afk.py | 2 +- tux/cogs/utility/poll.py | 2 +- tux/cogs/utility/remindme.py | 2 +- tux/database/controllers/afk.py | 1 + tux/database/controllers/base.py | 2 +- tux/database/controllers/case.py | 1 + tux/database/controllers/guild.py | 1 + tux/database/controllers/guild_config.py | 2 +- tux/database/controllers/levels.py | 2 +- tux/database/controllers/note.py | 1 + tux/database/controllers/reminder.py | 1 + tux/database/controllers/snippet.py | 1 + tux/database/controllers/starboard.py | 1 + tux/utils/converters.py | 2 +- tux/utils/flags.py | 2 +- 33 files changed, 34 insertions(+), 27 deletions(-) diff --git a/tests/unit/tux/utils/test_exceptions.py b/tests/unit/tux/utils/test_exceptions.py index fb7ae13f0..67c606a93 100644 --- a/tests/unit/tux/utils/test_exceptions.py +++ b/tests/unit/tux/utils/test_exceptions.py @@ -4,8 +4,8 @@ from unittest.mock import Mock import pytest - from prisma.models import Case + from tux.utils.exceptions import ( APIConnectionError, APIRequestError, diff --git a/tux/cogs/moderation/__init__.py b/tux/cogs/moderation/__init__.py index 1f0c8be96..b501c2b37 100644 --- a/tux/cogs/moderation/__init__.py +++ b/tux/cogs/moderation/__init__.py @@ -7,8 +7,8 @@ import discord from discord.ext import commands from loguru import logger - from prisma.enums import CaseType + from tux.bot import Tux from tux.database.controllers import DatabaseController from tux.ui.embeds import EmbedCreator, EmbedType diff --git a/tux/cogs/moderation/ban.py b/tux/cogs/moderation/ban.py index ce9f71083..fba9a8ad2 100644 --- a/tux/cogs/moderation/ban.py +++ b/tux/cogs/moderation/ban.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import BanFlags diff --git a/tux/cogs/moderation/cases.py b/tux/cogs/moderation/cases.py index 31e486faf..573aba5e7 100644 --- a/tux/cogs/moderation/cases.py +++ b/tux/cogs/moderation/cases.py @@ -3,11 +3,11 @@ import discord from discord.ext import commands from loguru import logger -from reactionmenu import ViewButton, ViewMenu - from prisma.enums import CaseType from prisma.models import Case from prisma.types import CaseWhereInput +from reactionmenu import ViewButton, ViewMenu + from tux.bot import Tux from tux.ui.embeds import EmbedCreator, EmbedType from tux.utils import checks diff --git a/tux/cogs/moderation/jail.py b/tux/cogs/moderation/jail.py index 89ddf0664..96c98e9ad 100644 --- a/tux/cogs/moderation/jail.py +++ b/tux/cogs/moderation/jail.py @@ -1,8 +1,8 @@ import discord from discord.ext import commands from loguru import logger - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import JailFlags diff --git a/tux/cogs/moderation/kick.py b/tux/cogs/moderation/kick.py index 4b37bc4ff..90aa80c8a 100644 --- a/tux/cogs/moderation/kick.py +++ b/tux/cogs/moderation/kick.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import KickFlags diff --git a/tux/cogs/moderation/pollban.py b/tux/cogs/moderation/pollban.py index bca4ad61f..93b6afe65 100644 --- a/tux/cogs/moderation/pollban.py +++ b/tux/cogs/moderation/pollban.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import PollBanFlags diff --git a/tux/cogs/moderation/pollunban.py b/tux/cogs/moderation/pollunban.py index 7de595528..48d2972c4 100644 --- a/tux/cogs/moderation/pollunban.py +++ b/tux/cogs/moderation/pollunban.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import PollUnbanFlags diff --git a/tux/cogs/moderation/snippetban.py b/tux/cogs/moderation/snippetban.py index 2b90fc696..03a152f99 100644 --- a/tux/cogs/moderation/snippetban.py +++ b/tux/cogs/moderation/snippetban.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import SnippetBanFlags diff --git a/tux/cogs/moderation/snippetunban.py b/tux/cogs/moderation/snippetunban.py index 59179bb76..bb3ef17d8 100644 --- a/tux/cogs/moderation/snippetunban.py +++ b/tux/cogs/moderation/snippetunban.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import SnippetUnbanFlags diff --git a/tux/cogs/moderation/tempban.py b/tux/cogs/moderation/tempban.py index 4641de854..a0fa04ba2 100644 --- a/tux/cogs/moderation/tempban.py +++ b/tux/cogs/moderation/tempban.py @@ -3,9 +3,9 @@ import discord from discord.ext import commands, tasks from loguru import logger - from prisma.enums import CaseType from prisma.models import Case + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import TempBanFlags diff --git a/tux/cogs/moderation/timeout.py b/tux/cogs/moderation/timeout.py index d47b1d145..a2fbc2238 100644 --- a/tux/cogs/moderation/timeout.py +++ b/tux/cogs/moderation/timeout.py @@ -2,8 +2,8 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import TimeoutFlags diff --git a/tux/cogs/moderation/unban.py b/tux/cogs/moderation/unban.py index c2fc5a6f4..bec74e87b 100644 --- a/tux/cogs/moderation/unban.py +++ b/tux/cogs/moderation/unban.py @@ -2,8 +2,8 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.constants import CONST diff --git a/tux/cogs/moderation/unjail.py b/tux/cogs/moderation/unjail.py index 761b0bbee..f0aaf6792 100644 --- a/tux/cogs/moderation/unjail.py +++ b/tux/cogs/moderation/unjail.py @@ -3,9 +3,9 @@ import discord from discord.ext import commands from loguru import logger - from prisma.enums import CaseType from prisma.models import Case + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import UnjailFlags diff --git a/tux/cogs/moderation/untimeout.py b/tux/cogs/moderation/untimeout.py index 86733e7f7..6dedfd872 100644 --- a/tux/cogs/moderation/untimeout.py +++ b/tux/cogs/moderation/untimeout.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import UntimeoutFlags diff --git a/tux/cogs/moderation/warn.py b/tux/cogs/moderation/warn.py index 6bbee6470..bab8b6fda 100644 --- a/tux/cogs/moderation/warn.py +++ b/tux/cogs/moderation/warn.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.bot import Tux from tux.utils import checks from tux.utils.flags import WarnFlags diff --git a/tux/cogs/snippets/__init__.py b/tux/cogs/snippets/__init__.py index 678bfa7ad..4988fab09 100644 --- a/tux/cogs/snippets/__init__.py +++ b/tux/cogs/snippets/__init__.py @@ -1,9 +1,9 @@ import discord from discord.ext import commands from loguru import logger - from prisma.enums import CaseType from prisma.models import Snippet + from tux.bot import Tux from tux.database.controllers import DatabaseController from tux.ui.embeds import EmbedCreator, EmbedType diff --git a/tux/cogs/snippets/list_snippets.py b/tux/cogs/snippets/list_snippets.py index 0a60756a9..ec958ee7a 100644 --- a/tux/cogs/snippets/list_snippets.py +++ b/tux/cogs/snippets/list_snippets.py @@ -1,7 +1,7 @@ from discord.ext import commands +from prisma.models import Snippet from reactionmenu import ViewButton, ViewMenu -from prisma.models import Snippet from tux.bot import Tux from tux.utils.constants import CONST from tux.utils.functions import generate_usage diff --git a/tux/cogs/utility/afk.py b/tux/cogs/utility/afk.py index bafaec050..ca7f9dd8c 100644 --- a/tux/cogs/utility/afk.py +++ b/tux/cogs/utility/afk.py @@ -6,8 +6,8 @@ import discord from discord.ext import commands, tasks - from prisma.models import AFKModel + from tux.bot import Tux from tux.cogs.utility import add_afk, del_afk from tux.database.controllers import DatabaseController diff --git a/tux/cogs/utility/poll.py b/tux/cogs/utility/poll.py index f5af6e1ec..0ff2d9b08 100644 --- a/tux/cogs/utility/poll.py +++ b/tux/cogs/utility/poll.py @@ -2,8 +2,8 @@ from discord import app_commands from discord.ext import commands from loguru import logger - from prisma.enums import CaseType + from tux.bot import Tux from tux.database.controllers import DatabaseController from tux.ui.embeds import EmbedCreator diff --git a/tux/cogs/utility/remindme.py b/tux/cogs/utility/remindme.py index 053bd2461..abfb18987 100644 --- a/tux/cogs/utility/remindme.py +++ b/tux/cogs/utility/remindme.py @@ -5,8 +5,8 @@ import discord from discord.ext import commands from loguru import logger - from prisma.models import Reminder + from tux.bot import Tux from tux.database.controllers import DatabaseController from tux.ui.embeds import EmbedCreator diff --git a/tux/database/controllers/afk.py b/tux/database/controllers/afk.py index bb39cd71c..c169f22eb 100644 --- a/tux/database/controllers/afk.py +++ b/tux/database/controllers/afk.py @@ -2,6 +2,7 @@ from prisma.actions import GuildActions from prisma.models import AFKModel, Guild + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/base.py b/tux/database/controllers/base.py index f407e480d..29044a22d 100644 --- a/tux/database/controllers/base.py +++ b/tux/database/controllers/base.py @@ -5,7 +5,6 @@ import sentry_sdk from loguru import logger - from prisma.models import ( AFKModel, Case, @@ -18,6 +17,7 @@ Starboard, StarboardMessage, ) + from tux.database.client import db # Explicitly define ModelType to cover all potential models used by controllers diff --git a/tux/database/controllers/case.py b/tux/database/controllers/case.py index 1558a0f3f..1fe5b742b 100644 --- a/tux/database/controllers/case.py +++ b/tux/database/controllers/case.py @@ -5,6 +5,7 @@ from prisma.enums import CaseType from prisma.models import Case, Guild from prisma.types import CaseWhereInput + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/guild.py b/tux/database/controllers/guild.py index 5e3aeb220..6ee29e264 100644 --- a/tux/database/controllers/guild.py +++ b/tux/database/controllers/guild.py @@ -1,6 +1,7 @@ from typing import Any from prisma.models import Guild + from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/guild_config.py b/tux/database/controllers/guild_config.py index 5acda6552..a9b03928c 100644 --- a/tux/database/controllers/guild_config.py +++ b/tux/database/controllers/guild_config.py @@ -1,13 +1,13 @@ from typing import Any from loguru import logger - from prisma.actions import GuildActions, GuildConfigActions from prisma.models import Guild, GuildConfig from prisma.types import ( GuildConfigScalarFieldKeys, GuildConfigUpdateInput, ) + from tux.database.client import db diff --git a/tux/database/controllers/levels.py b/tux/database/controllers/levels.py index 360f627ba..f0b2ab898 100644 --- a/tux/database/controllers/levels.py +++ b/tux/database/controllers/levels.py @@ -3,9 +3,9 @@ from typing import NoReturn, cast from loguru import logger - from prisma.actions import GuildActions from prisma.models import Guild, Levels + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/note.py b/tux/database/controllers/note.py index 4ffe05cb5..1178fedb3 100644 --- a/tux/database/controllers/note.py +++ b/tux/database/controllers/note.py @@ -1,5 +1,6 @@ from prisma.actions import GuildActions from prisma.models import Guild, Note + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/reminder.py b/tux/database/controllers/reminder.py index 77a09001d..1116d2650 100644 --- a/tux/database/controllers/reminder.py +++ b/tux/database/controllers/reminder.py @@ -2,6 +2,7 @@ from prisma.actions import GuildActions from prisma.models import Guild, Reminder + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/snippet.py b/tux/database/controllers/snippet.py index 723c957e9..a052c60fe 100644 --- a/tux/database/controllers/snippet.py +++ b/tux/database/controllers/snippet.py @@ -2,6 +2,7 @@ from prisma.actions import GuildActions from prisma.models import Guild, Snippet + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/database/controllers/starboard.py b/tux/database/controllers/starboard.py index fc1af494a..b79b0b437 100644 --- a/tux/database/controllers/starboard.py +++ b/tux/database/controllers/starboard.py @@ -2,6 +2,7 @@ from prisma.actions import GuildActions from prisma.models import Guild, Starboard, StarboardMessage + from tux.database.client import db from tux.database.controllers.base import BaseController diff --git a/tux/utils/converters.py b/tux/utils/converters.py index 5f1c55f30..7f32e7db9 100644 --- a/tux/utils/converters.py +++ b/tux/utils/converters.py @@ -4,8 +4,8 @@ import discord from discord.ext import commands from loguru import logger - from prisma.enums import CaseType + from tux.bot import Tux time_regex = re.compile(r"(\d{1,5}(?:[.,]?\d{1,5})?)([smhd])") diff --git a/tux/utils/flags.py b/tux/utils/flags.py index 2b636ac93..6cc56fa07 100644 --- a/tux/utils/flags.py +++ b/tux/utils/flags.py @@ -1,7 +1,7 @@ import discord from discord.ext import commands - from prisma.enums import CaseType + from tux.utils.constants import CONST from tux.utils.converters import CaseTypeConverter, TimeConverter, convert_bool