diff --git a/cogs/add_users_to_threads_and_channels.py b/cogs/add_users_to_threads_and_channels.py index 76b13044..619b1faf 100644 --- a/cogs/add_users_to_threads_and_channels.py +++ b/cogs/add_users_to_threads_and_channels.py @@ -2,23 +2,26 @@ import logging from collections.abc import Iterable +from collections.abc import Set as AbstractSet # noqa: TC003 from typing import TYPE_CHECKING import discord from config import settings from exceptions import GuestRoleDoesNotExistError, GuildDoesNotExistError -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) from utils.error_capture_decorators import capture_guild_does_not_exist_error if TYPE_CHECKING: from collections.abc import Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext - __all__: Sequence[str] = ("AddUsersToThreadsAndChannelsCommandsCog",) diff --git a/cogs/annual_handover_and_reset.py b/cogs/annual_handover_and_reset.py index 692a5a89..064d0b69 100644 --- a/cogs/annual_handover_and_reset.py +++ b/cogs/annual_handover_and_reset.py @@ -8,14 +8,14 @@ from config import settings from db.core.models import GroupMadeMember -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Collection, Mapping, Sequence from logging import Logger from typing import Final - from utils import AllChannelTypes, TeXBotApplicationContext + from utils import AllChannelTypes __all__: Sequence[str] = ( "AnnualRolesResetCommandCog", diff --git a/cogs/archive.py b/cogs/archive.py index 68418954..02976a93 100644 --- a/cogs/archive.py +++ b/cogs/archive.py @@ -2,21 +2,26 @@ import logging import re +from collections.abc import Set as AbstractSet # noqa: TC003 from typing import TYPE_CHECKING import discord from exceptions import EveryoneRoleCouldNotBeRetrievedError from exceptions.base import BaseDoesNotExistError -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) if TYPE_CHECKING: from collections.abc import Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final - from utils import AllChannelTypes, TeXBotApplicationContext, TeXBotAutocompleteContext + from utils import AllChannelTypes __all__: Sequence[str] = ("ArchiveCommandsCog",) diff --git a/cogs/check_su_platform_authorisation.py b/cogs/check_su_platform_authorisation.py index 610ca873..4a060128 100644 --- a/cogs/check_su_platform_authorisation.py +++ b/cogs/check_su_platform_authorisation.py @@ -1,6 +1,7 @@ """Contains cog classes for SU platform access cookie authorisation check interactions.""" import logging +from collections.abc import Set as AbstractSet # noqa: TC003 from enum import Enum from typing import TYPE_CHECKING, override @@ -9,7 +10,7 @@ from discord.ext import tasks from config import settings -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 from utils.error_capture_decorators import ( capture_guild_does_not_exist_error, ) @@ -17,11 +18,10 @@ if TYPE_CHECKING: from collections.abc import Iterable, Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final - from utils import TeXBot, TeXBotApplicationContext + from utils import TeXBot __all__: Sequence[str] = ( "CheckSUPlatformAuthorisationCommandCog", diff --git a/cogs/committee_actions_tracking.py b/cogs/committee_actions_tracking.py index 1a3af291..14088e7d 100644 --- a/cogs/committee_actions_tracking.py +++ b/cogs/committee_actions_tracking.py @@ -4,6 +4,7 @@ import logging import random import textwrap +from collections.abc import Set as AbstractSet # noqa: TC003 from enum import Enum from typing import TYPE_CHECKING @@ -18,16 +19,18 @@ InvalidActionDescriptionError, InvalidActionTargetError, ) -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) if TYPE_CHECKING: from collections.abc import Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext - __all__: Sequence[str] = ( "CommitteeActionsTrackingBaseCog", "CommitteeActionsTrackingContextCommandCog", diff --git a/cogs/delete_all.py b/cogs/delete_all.py index 6a355aca..7199a3e0 100644 --- a/cogs/delete_all.py +++ b/cogs/delete_all.py @@ -11,13 +11,12 @@ SentGetRolesReminderMember, SentOneOffIntroductionReminderMember, ) -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Sequence from db.core.models.utils import AsyncBaseModel - from utils import TeXBotApplicationContext __all__: Sequence[str] = ("DeleteAllCommandsCog",) diff --git a/cogs/edit_message.py b/cogs/edit_message.py index 84b23753..db80252d 100644 --- a/cogs/edit_message.py +++ b/cogs/edit_message.py @@ -1,19 +1,22 @@ """Contains cog classes for any edit_message interactions.""" import re +from collections.abc import Set as AbstractSet # noqa: TC003 from typing import TYPE_CHECKING, override import discord from exceptions import DiscordMemberNotInMainGuildError from exceptions.base import BaseDoesNotExistError -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) if TYPE_CHECKING: from collections.abc import Sequence - from collections.abc import Set as AbstractSet - - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext __all__: Sequence[str] = ("EditMessageCommandCog",) diff --git a/cogs/everest.py b/cogs/everest.py index 50f5ee24..b91e54fc 100644 --- a/cogs/everest.py +++ b/cogs/everest.py @@ -1,21 +1,23 @@ """Contains cog classes for any Everest interactions.""" import logging +from collections.abc import Set as AbstractSet # noqa: TC003 from enum import Enum from typing import TYPE_CHECKING, override import discord -from utils import TeXBotBaseCog +from utils import ( # noqa: TC001 + TeXBotApplicationContext, + TeXBotAutocompleteContext, + TeXBotBaseCog, +) if TYPE_CHECKING: from collections.abc import Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext - __all__: Sequence[str] = ("EverestCommandCog",) diff --git a/cogs/induct.py b/cogs/induct.py index 6a66d011..9f8c3ba1 100644 --- a/cogs/induct.py +++ b/cogs/induct.py @@ -3,6 +3,7 @@ import contextlib import logging import random +from collections.abc import Set as AbstractSet # noqa: TC003 from typing import TYPE_CHECKING import discord @@ -17,16 +18,19 @@ GuildDoesNotExistError, MemberRoleDoesNotExistError, ) -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) from utils.error_capture_decorators import capture_guild_does_not_exist_error if TYPE_CHECKING: from collections.abc import Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final, Literal - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext __all__: Sequence[str] = ( "BaseInductCog", diff --git a/cogs/invite_link.py b/cogs/invite_link.py index bf061683..cbee7f88 100644 --- a/cogs/invite_link.py +++ b/cogs/invite_link.py @@ -5,13 +5,11 @@ import discord from config import settings -from utils import TeXBotBaseCog +from utils import TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Sequence - from utils import TeXBotApplicationContext - __all__: Sequence[str] = ("InviteLinkCommandCog",) diff --git a/cogs/kill.py b/cogs/kill.py index 0a83bb09..8fdc46a9 100644 --- a/cogs/kill.py +++ b/cogs/kill.py @@ -7,14 +7,13 @@ from discord.ui import View from exceptions import CommitteeRoleDoesNotExistError -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Sequence from logging import Logger from typing import Final - from utils import TeXBotApplicationContext __all__: Sequence[str] = ("ConfirmKillView", "KillCommandCog") diff --git a/cogs/make_applicant.py b/cogs/make_applicant.py index 5ebf0906..33f0e933 100644 --- a/cogs/make_applicant.py +++ b/cogs/make_applicant.py @@ -6,14 +6,18 @@ import discord from exceptions.does_not_exist import ApplicantRoleDoesNotExistError, GuildDoesNotExistError -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) if TYPE_CHECKING: from collections.abc import Sequence from logging import Logger from typing import Final - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext __all__: Sequence[str] = ( "BaseMakeApplicantCog", diff --git a/cogs/make_member.py b/cogs/make_member.py index 656c6655..5ab3fb71 100644 --- a/cogs/make_member.py +++ b/cogs/make_member.py @@ -10,7 +10,7 @@ from config import settings from db.core.models import GroupMadeMember from exceptions import ApplicantRoleDoesNotExistError, GuestRoleDoesNotExistError -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 from utils.msl import fetch_community_group_members_count, is_id_a_community_group_member if TYPE_CHECKING: @@ -18,8 +18,6 @@ from logging import Logger from typing import Final - from utils import TeXBotApplicationContext - __all__: Sequence[str] = ("MakeMemberCommandCog", "MemberCountCommandCog") diff --git a/cogs/ping.py b/cogs/ping.py index 71fdc90f..a363381f 100644 --- a/cogs/ping.py +++ b/cogs/ping.py @@ -6,13 +6,11 @@ import discord from config import settings -from utils import TeXBotBaseCog +from utils import TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Sequence - from utils import TeXBotApplicationContext - __all__: Sequence[str] = ("PingCommandCog",) diff --git a/cogs/source.py b/cogs/source.py index fa3e74da..e7ed1991 100644 --- a/cogs/source.py +++ b/cogs/source.py @@ -4,13 +4,11 @@ import discord -from utils import TeXBotBaseCog +from utils import TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Sequence - from utils import TeXBotApplicationContext - __all__: Sequence[str] = ("SourceCommandCog",) diff --git a/cogs/stats/__init__.py b/cogs/stats/__init__.py index ccb3e3f3..b979874a 100644 --- a/cogs/stats/__init__.py +++ b/cogs/stats/__init__.py @@ -8,7 +8,7 @@ from config import settings from db.core.models import LeftDiscordMember -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 from utils.error_capture_decorators import capture_guild_does_not_exist_error from .counts import get_channel_message_counts, get_server_message_counts @@ -18,8 +18,6 @@ from collections.abc import AsyncIterable, Mapping, Sequence from typing import Final - from utils import TeXBotApplicationContext - __all__: Sequence[str] = ("StatsCommandsCog",) diff --git a/cogs/strike.py b/cogs/strike.py index 3c870c0f..dcf8e1ae 100644 --- a/cogs/strike.py +++ b/cogs/strike.py @@ -5,6 +5,7 @@ import datetime import logging import re +from collections.abc import Set as AbstractSet # noqa: TC003 from typing import TYPE_CHECKING import discord @@ -18,7 +19,12 @@ NoAuditLogsStrikeTrackingError, StrikeTrackingError, ) -from utils import CommandChecks, TeXBotBaseCog +from utils import ( + CommandChecks, + TeXBotApplicationContext, # noqa: TC001 + TeXBotAutocompleteContext, # noqa: TC001 + TeXBotBaseCog, +) from utils.error_capture_decorators import ( capture_guild_does_not_exist_error, capture_strike_tracking_error, @@ -27,11 +33,9 @@ if TYPE_CHECKING: from collections.abc import Mapping, Sequence - from collections.abc import Set as AbstractSet from logging import Logger from typing import Final - from utils import TeXBotApplicationContext, TeXBotAutocompleteContext from utils.message_sender_components import MessageSavingSenderComponent __all__: Sequence[str] = ( diff --git a/cogs/write_roles.py b/cogs/write_roles.py index 18cb6622..22355643 100644 --- a/cogs/write_roles.py +++ b/cogs/write_roles.py @@ -5,13 +5,11 @@ import discord from config import settings -from utils import CommandChecks, TeXBotBaseCog +from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog # noqa: TC001 if TYPE_CHECKING: from collections.abc import Sequence - from utils import TeXBotApplicationContext - __all__: Sequence[str] = ("WriteRolesCommandCog",)