Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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$
Expand Down Expand Up @@ -46,21 +46,21 @@ 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
rev: v8.28.0
hooks:
- id: gitleaks
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.22.0
rev: v9.23.0
hooks:
- id: commitlint
stages:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/tux/utils/test_exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from unittest.mock import Mock

import pytest

from prisma.models import Case

from tux.utils.exceptions import (
APIConnectionError,
APIRequestError,
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/ban.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tux/cogs/moderation/cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/jail.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/kick.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/pollban.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/pollunban.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/snippetban.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/snippetunban.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/tempban.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/timeout.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/unban.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/unjail.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/untimeout.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/moderation/warn.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/snippets/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/snippets/list_snippets.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/utility/afk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/utility/poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tux/cogs/utility/remindme.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/afk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tux/database/controllers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import sentry_sdk
from loguru import logger

from prisma.models import (
AFKModel,
Case,
Expand All @@ -18,6 +17,7 @@
Starboard,
StarboardMessage,
)

from tux.database.client import db

# Explicitly define ModelType to cover all potential models used by controllers
Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/guild.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from typing import Any

from prisma.models import Guild

from tux.database.controllers.base import BaseController


Expand Down
2 changes: 1 addition & 1 deletion tux/database/controllers/guild_config.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion tux/database/controllers/levels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/note.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/reminder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/snippet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tux/database/controllers/starboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tux/utils/converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])")
Expand Down
2 changes: 1 addition & 1 deletion tux/utils/flags.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down