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
12 changes: 7 additions & 5 deletions disnake/abc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
from .enums import (
ChannelType,
PartyType,
ThreadLayout,
ThreadSortOrder,
VideoQualityMode,
try_enum_to_int,
)
from .errors import ClientException
Expand All @@ -42,7 +39,6 @@
from .partial_emoji import PartialEmoji
from .permissions import PermissionOverwrite, Permissions
from .role import Role
from .sticker import GuildSticker, StandardSticker, StickerItem
from .utils import _overload_with_permissions
from .voice_client import VoiceClient, VoiceProtocol

Expand All @@ -67,14 +63,20 @@
from .client import Client
from .embeds import Embed
from .emoji import Emoji
from .enums import InviteTarget
from .enums import (
InviteTarget,
ThreadLayout,
ThreadSortOrder,
VideoQualityMode,
)
from .guild import Guild, GuildChannel as AnyGuildChannel, GuildMessageable
from .guild_scheduled_event import GuildScheduledEvent
from .iterators import ChannelPinsIterator, HistoryIterator
from .member import Member
from .message import Message, MessageReference, PartialMessage
from .poll import Poll
from .state import ConnectionState
from .sticker import GuildSticker, StandardSticker, StickerItem
from .threads import AnyThreadArchiveDuration, ForumTag
from .types.channel import (
Channel as ChannelPayload,
Expand Down
4 changes: 3 additions & 1 deletion disnake/app_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
ApplicationCommandPermissionType,
ApplicationCommandType,
ChannelType,
Locale,
OptionType,
enum_if_int,
try_enum,
Expand All @@ -25,6 +24,9 @@
if TYPE_CHECKING:
from typing_extensions import Self

from .enums import (
Locale,
)
from .i18n import LocalizationProtocol, LocalizationValue, LocalizedOptional, LocalizedRequired
from .state import ConnectionState
from .types.interactions import (
Expand Down
3 changes: 2 additions & 1 deletion disnake/appinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
from typing import TYPE_CHECKING, Dict, List, Optional, Sequence, cast

from . import utils
from .asset import Asset, AssetBytes
from .asset import Asset
from .enums import ApplicationEventWebhookStatus, try_enum
from .flags import ApplicationFlags
from .permissions import Permissions
from .utils import MISSING

if TYPE_CHECKING:
from .asset import AssetBytes
from .guild import Guild
from .state import ConnectionState
from .types.appinfo import (
Expand Down
4 changes: 2 additions & 2 deletions disnake/application_role_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
from typing import TYPE_CHECKING

from .enums import ApplicationRoleConnectionMetadataType, enum_if_int, try_enum
from .i18n import LocalizationValue, Localized
from .i18n import Localized

if TYPE_CHECKING:
from typing_extensions import Self

from .i18n import LocalizationProtocol, LocalizedRequired
from .i18n import LocalizationProtocol, LocalizationValue, LocalizedRequired
from .types.application_role_connection import (
ApplicationRoleConnectionMetadata as ApplicationRoleConnectionMetadataPayload,
)
Expand Down
9 changes: 5 additions & 4 deletions disnake/audit_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
cast,
)

from . import abc, enums, flags, utils
from . import enums, flags, utils
from .app_commands import ApplicationCommandPermissions
from .asset import Asset
from .automod import AutoModAction, AutoModTriggerMetadata, _automod_action_factory
from .automod import AutoModTriggerMetadata, _automod_action_factory
from .colour import Colour
from .invite import Invite
from .mixins import Hashable
from .object import Object
from .partial_emoji import PartialEmoji
from .permissions import PermissionOverwrite, Permissions
from .threads import ForumTag, Thread

Expand All @@ -41,13 +40,15 @@
if TYPE_CHECKING:
import datetime

from . import abc
from .app_commands import APIApplicationCommand
from .automod import AutoModRule
from .automod import AutoModAction, AutoModRule
from .emoji import Emoji
from .guild import Guild
from .guild_scheduled_event import GuildScheduledEvent
from .integrations import PartialIntegration
from .member import Member
from .partial_emoji import PartialEmoji
from .role import Role
from .stage_instance import StageInstance
from .sticker import GuildSticker
Expand Down
12 changes: 8 additions & 4 deletions disnake/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from __future__ import annotations

import asyncio
import datetime
import time
from typing import (
TYPE_CHECKING,
Expand Down Expand Up @@ -41,13 +40,13 @@
)
from .errors import ClientException
from .file import File
from .flags import ChannelFlags, MessageFlags
from .flags import ChannelFlags
from .iterators import ArchivedThreadIterator
from .mixins import Hashable
from .object import Object
from .partial_emoji import PartialEmoji
from .permissions import PermissionOverwrite, Permissions
from .soundboard import GuildSoundboardSound, PartialSoundboardSound, SoundboardSound
from .permissions import Permissions
from .soundboard import GuildSoundboardSound, PartialSoundboardSound
from .stage_instance import StageInstance
from .threads import ForumTag, Thread
from .utils import MISSING
Expand All @@ -68,16 +67,21 @@
)

if TYPE_CHECKING:
import datetime

from typing_extensions import Never, Self

from .abc import Snowflake, SnowflakeTime
from .asset import AssetBytes
from .embeds import Embed
from .emoji import Emoji
from .flags import MessageFlags
from .guild import Guild, GuildChannel as GuildChannelType
from .member import Member, VoiceState
from .message import AllowedMentions, Message, PartialMessage
from .permissions import PermissionOverwrite
from .role import Role
from .soundboard import SoundboardSound
from .state import ConnectionState
from .sticker import GuildSticker, StandardSticker, StickerItem
from .threads import AnyThreadArchiveDuration, ThreadType
Expand Down
34 changes: 23 additions & 11 deletions disnake/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import sys
import traceback
import types
from datetime import datetime, timedelta
from datetime import timedelta
from errno import ECONNRESET
from typing import (
TYPE_CHECKING,
Expand All @@ -33,21 +33,19 @@
import aiohttp

from . import abc, utils
from .activity import ActivityTypes, BaseActivity, create_activity
from .activity import BaseActivity, create_activity
from .app_commands import (
APIMessageCommand,
APISlashCommand,
APIUserCommand,
ApplicationCommand,
GuildApplicationCommandPermissions,
)
from .appinfo import AppInfo
from .application_role_connection import ApplicationRoleConnectionMetadata
from .backoff import ExponentialBackoff
from .channel import PartialMessageable, _threaded_channel_factory
from .emoji import Emoji
from .entitlement import Entitlement
from .enums import ApplicationCommandType, ChannelType, Event, Status
from .enums import ChannelType, Event, Status
from .errors import (
ConnectionClosed,
GatewayNotFound,
Expand All @@ -56,23 +54,21 @@
PrivilegedIntentsRequired,
SessionStartLimitReached,
)
from .flags import ApplicationFlags, Intents, MemberCacheFlags
from .gateway import DiscordWebSocket, ReconnectWebSocket
from .guild import Guild, GuildBuilder
from .guild_preview import GuildPreview
from .http import HTTPClient
from .i18n import LocalizationProtocol, LocalizationStore
from .i18n import LocalizationStore
from .invite import Invite
from .iterators import EntitlementIterator, GuildIterator
from .mentions import AllowedMentions
from .object import Object
from .sku import SKU
from .soundboard import GuildSoundboardSound, SoundboardSound
from .soundboard import SoundboardSound
from .stage_instance import StageInstance
from .state import ConnectionState
from .sticker import GuildSticker, StandardSticker, StickerPack, _sticker_factory
from .sticker import StickerPack, _sticker_factory
from .template import Template
from .threads import Thread
from .ui.view import View
from .user import ClientUser, User
from .utils import MISSING, deprecated
Expand All @@ -82,14 +78,30 @@
from .widget import Widget

if TYPE_CHECKING:
from datetime import datetime

from typing_extensions import NotRequired

from .abc import GuildChannel, PrivateChannel, Snowflake, SnowflakeTime
from .app_commands import APIApplicationCommand, MessageCommand, SlashCommand, UserCommand
from .activity import ActivityTypes
from .app_commands import (
APIApplicationCommand,
ApplicationCommand,
GuildApplicationCommandPermissions,
MessageCommand,
SlashCommand,
UserCommand,
)
from .asset import AssetBytes
from .channel import DMChannel
from .enums import ApplicationCommandType
from .flags import ApplicationFlags, Intents, MemberCacheFlags
from .i18n import LocalizationProtocol
from .member import Member
from .message import Message
from .soundboard import GuildSoundboardSound
from .sticker import GuildSticker, StandardSticker
from .threads import Thread
from .types.application_role_connection import (
ApplicationRoleConnectionMetadata as ApplicationRoleConnectionMetadataPayload,
)
Expand Down
3 changes: 2 additions & 1 deletion disnake/embeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

from . import utils
from .colour import Colour
from .file import File
from .utils import MISSING, classproperty, warn_deprecated

__all__ = ("Embed",)
Expand Down Expand Up @@ -75,6 +74,8 @@ def __eq__(self, other: Any) -> bool:
EmbedVideo as EmbedVideoPayload,
)

from .file import File

class _EmbedFooterProxy(Sized, Protocol):
text: Optional[str]
icon_url: Optional[str]
Expand Down
3 changes: 2 additions & 1 deletion disnake/entitlement.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

from __future__ import annotations

import datetime
from typing import TYPE_CHECKING, Optional

from .enums import EntitlementType, try_enum
from .mixins import Hashable
from .utils import _get_as_snowflake, parse_time, snowflake_time, utcnow

if TYPE_CHECKING:
import datetime

from .guild import Guild
from .state import ConnectionState
from .types.entitlement import Entitlement as EntitlementPayload
Expand Down
5 changes: 3 additions & 2 deletions disnake/ext/commands/base_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
overload,
)

from disnake.app_commands import ApplicationCommand
from disnake.enums import ApplicationCommandType
from disnake.flags import ApplicationInstallTypes, InteractionContextTypes
from disnake.permissions import Permissions
Expand All @@ -32,16 +31,18 @@
maybe_coroutine,
)

from .cooldowns import BucketType, CooldownMapping, MaxConcurrency
from .cooldowns import BucketType, CooldownMapping
from .errors import CheckFailure, CommandError, CommandInvokeError, CommandOnCooldown

if TYPE_CHECKING:
from typing_extensions import Concatenate, ParamSpec, Self

from disnake.app_commands import ApplicationCommand
from disnake.interactions import ApplicationCommandInteraction

from ._types import AppCheck, Coro, Error, Hook
from .cog import Cog
from .cooldowns import MaxConcurrency
from .interaction_bot_base import InteractionBotBase

ApplicationCommandInteractionT = TypeVar(
Expand Down
3 changes: 2 additions & 1 deletion disnake/ext/commands/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from __future__ import annotations

import inspect
import re
from typing import TYPE_CHECKING, Any, Dict, Generic, List, Optional, TypeVar, Union

Expand All @@ -12,6 +11,8 @@
from disnake.message import Message

if TYPE_CHECKING:
import inspect

from typing_extensions import ParamSpec

from disnake.channel import DMChannel, GroupChannel
Expand Down
4 changes: 3 additions & 1 deletion disnake/ext/commands/converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import disnake

from .context import AnyContext, Context
from .context import Context
from .errors import (
BadArgument,
BadBoolArgument,
Expand Down Expand Up @@ -55,6 +55,8 @@
if TYPE_CHECKING:
from disnake.abc import MessageableChannel

from .context import AnyContext


# TODO: USE ACTUAL FUNCTIONS INSTEAD OF USELESS CLASSES

Expand Down
3 changes: 2 additions & 1 deletion disnake/ext/commands/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

from ._types import _BaseCommand
from .cog import Cog
from .context import AnyContext, Context
from .context import Context
from .converter import Greedy, get_converter, run_converters
from .cooldowns import BucketType, Cooldown, CooldownMapping, DynamicCooldownMapping, MaxConcurrency
from .errors import (
Expand Down Expand Up @@ -69,6 +69,7 @@
from disnake.message import Message

from ._types import AppCheck, Check, Coro, CoroFunc, Error, Hook
from .context import AnyContext


__all__ = (
Expand Down
Loading