Skip to content
Draft
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
115 changes: 60 additions & 55 deletions disnake/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,61 +21,66 @@
import logging
from typing import Literal, NamedTuple

from . import abc as abc, opus as opus, ui as ui, utils as utils # explicitly re-export modules
from .activity import *
from .app_commands import *
from .appinfo import *
from .application_role_connection import *
from .asset import *
from .audit_logs import *
from .automod import *
from .bans import *
from .channel import *
from .client import *
from .colour import *
from .components import *
from .custom_warnings import *
from .embeds import *
from .emoji import *
from .entitlement import *
from .enums import *
from .errors import *
from .file import *
from .flags import *
from .guild import *
from .guild_preview import *
from .guild_scheduled_event import *
from .i18n import *
from .integrations import *
from .interactions import *
from .invite import *
from .member import *
from .mentions import *
from .message import *
from .object import *
from .onboarding import *
from .partial_emoji import *
from .permissions import *
from .player import *
from .poll import *
from .raw_models import *
from .reaction import *
from .role import *
from .shard import *
from .sku import *
from .soundboard import *
from .stage_instance import *
from .sticker import *
from .subscription import *
from .team import *
from .template import *
from .threads import *
from .user import *
from .voice_client import *
from .voice_region import *
from .webhook import *
from .welcome_screen import *
from .widget import *
from disnake import ( # explicitly re-export modules
abc as abc,
opus as opus,
ui as ui,
utils as utils,
)
from disnake.activity import *
from disnake.app_commands import *
from disnake.appinfo import *
from disnake.application_role_connection import *
from disnake.asset import *
from disnake.audit_logs import *
from disnake.automod import *
from disnake.bans import *
from disnake.channel import *
from disnake.client import *
from disnake.colour import *
from disnake.components import *
from disnake.custom_warnings import *
from disnake.embeds import *
from disnake.emoji import *
from disnake.entitlement import *
from disnake.enums import *
from disnake.errors import *
from disnake.file import *
from disnake.flags import *
from disnake.guild import *
from disnake.guild_preview import *
from disnake.guild_scheduled_event import *
from disnake.i18n import *
from disnake.integrations import *
from disnake.interactions import *
from disnake.invite import *
from disnake.member import *
from disnake.mentions import *
from disnake.message import *
from disnake.object import *
from disnake.onboarding import *
from disnake.partial_emoji import *
from disnake.permissions import *
from disnake.player import *
from disnake.poll import *
from disnake.raw_models import *
from disnake.reaction import *
from disnake.role import *
from disnake.shard import *
from disnake.sku import *
from disnake.soundboard import *
from disnake.stage_instance import *
from disnake.sticker import *
from disnake.subscription import *
from disnake.team import *
from disnake.template import *
from disnake.threads import *
from disnake.user import *
from disnake.voice_client import *
from disnake.voice_region import *
from disnake.webhook import *
from disnake.welcome_screen import *
from disnake.widget import *


class VersionInfo(NamedTuple):
Expand Down
78 changes: 39 additions & 39 deletions disnake/abc.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@
runtime_checkable,
)

from . import utils
from .context_managers import Typing
from .enums import (
from disnake import utils
from disnake.context_managers import Typing
from disnake.enums import (
ChannelType,
PartyType,
ThreadLayout,
ThreadSortOrder,
VideoQualityMode,
try_enum_to_int,
)
from .errors import ClientException
from .file import File
from .flags import ChannelFlags, MessageFlags
from .invite import Invite
from .mentions import AllowedMentions
from .object import Object
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
from disnake.errors import ClientException
from disnake.file import File
from disnake.flags import ChannelFlags, MessageFlags
from disnake.invite import Invite
from disnake.mentions import AllowedMentions
from disnake.object import Object
from disnake.partial_emoji import PartialEmoji
from disnake.permissions import PermissionOverwrite, Permissions
from disnake.role import Role
from disnake.sticker import GuildSticker, StandardSticker, StickerItem
from disnake.utils import _overload_with_permissions
from disnake.voice_client import VoiceClient, VoiceProtocol

__all__ = (
"Snowflake",
Expand All @@ -58,33 +58,33 @@

from typing_extensions import Self

from .asset import Asset
from .channel import CategoryChannel, DMChannel, GroupChannel, PartialMessageable
from .client import Client
from .embeds import Embed
from .emoji import Emoji
from .enums import InviteTarget
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 .threads import AnyThreadArchiveDuration, ForumTag
from .types.channel import (
from disnake.asset import Asset
from disnake.channel import CategoryChannel, DMChannel, GroupChannel, PartialMessageable
from disnake.client import Client
from disnake.embeds import Embed
from disnake.emoji import Emoji
from disnake.enums import InviteTarget
from disnake.guild import Guild, GuildChannel as AnyGuildChannel, GuildMessageable
from disnake.guild_scheduled_event import GuildScheduledEvent
from disnake.iterators import ChannelPinsIterator, HistoryIterator
from disnake.member import Member
from disnake.message import Message, MessageReference, PartialMessage
from disnake.poll import Poll
from disnake.state import ConnectionState
from disnake.threads import AnyThreadArchiveDuration, ForumTag
from disnake.types.channel import (
Channel as ChannelPayload,
DefaultReaction as DefaultReactionPayload,
GuildChannel as GuildChannelPayload,
OverwriteType,
PermissionOverwrite as PermissionOverwritePayload,
)
from .types.guild import ChannelPositionUpdate as ChannelPositionUpdatePayload
from .types.threads import PartialForumTag as PartialForumTagPayload
from .ui._types import MessageComponents
from .ui.view import View
from .user import ClientUser
from .voice_region import VoiceRegion
from disnake.types.guild import ChannelPositionUpdate as ChannelPositionUpdatePayload
from disnake.types.threads import PartialForumTag as PartialForumTagPayload
from disnake.ui._types import MessageComponents
from disnake.ui.view import View
from disnake.user import ClientUser
from disnake.voice_region import VoiceRegion

MessageableChannel = Union[GuildMessageable, DMChannel, GroupChannel, PartialMessageable]
# include non-messageable channels, e.g. category/forum
Expand Down Expand Up @@ -1749,7 +1749,7 @@ async def send(
raise TypeError(msg)
components_payload = view.to_components()
elif components:
from .ui.action_row import normalize_components_to_dict
from disnake.ui.action_row import normalize_components_to_dict

components_payload, is_v2 = normalize_components_to_dict(components)
else:
Expand Down Expand Up @@ -1934,7 +1934,7 @@ def pins(
:class:`.Message`
The pinned message from the parsed message data.
"""
from .iterators import ChannelPinsIterator # due to cyclic imports
from disnake.iterators import ChannelPinsIterator # due to cyclic imports

return ChannelPinsIterator(self, limit=limit, before=before)

Expand Down Expand Up @@ -2003,7 +2003,7 @@ def history(
:class:`.Message`
The message with the message data parsed.
"""
from .iterators import HistoryIterator # cyclic import
from disnake.iterators import HistoryIterator # cyclic import

return HistoryIterator(
self, limit=limit, before=before, after=after, around=around, oldest_first=oldest_first
Expand Down
16 changes: 8 additions & 8 deletions disnake/activity.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import datetime
from typing import TYPE_CHECKING, Any, Literal, Optional, Union, overload

from .asset import Asset
from .colour import Colour
from .enums import ActivityType, StatusDisplayType, try_enum
from .partial_emoji import PartialEmoji
from disnake.asset import Asset
from disnake.colour import Colour
from disnake.enums import ActivityType, StatusDisplayType, try_enum
from disnake.partial_emoji import PartialEmoji

__all__ = (
"BaseActivity",
Expand Down Expand Up @@ -66,16 +66,16 @@
"""

if TYPE_CHECKING:
from .state import ConnectionState
from .types.activity import (
from disnake.state import ConnectionState
from disnake.types.activity import (
Activity as ActivityPayload,
ActivityAssets,
ActivityEmoji as ActivityEmojiPayload,
ActivityParty,
ActivityTimestamps,
)
from .types.emoji import PartialEmoji as PartialEmojiPayload
from .types.widget import WidgetActivity as WidgetActivityPayload
from disnake.types.emoji import PartialEmoji as PartialEmojiPayload
from disnake.types.widget import WidgetActivity as WidgetActivityPayload


class _BaseActivity:
Expand Down
21 changes: 13 additions & 8 deletions disnake/app_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from collections.abc import Mapping, Sequence
from typing import TYPE_CHECKING, ClassVar, Optional, Union

from .enums import (
from disnake.enums import (
ApplicationCommandPermissionType,
ApplicationCommandType,
ChannelType,
Expand All @@ -18,17 +18,22 @@
try_enum,
try_enum_to_int,
)
from .flags import ApplicationInstallTypes, InteractionContextTypes
from .i18n import Localized
from .permissions import Permissions
from .utils import MISSING, _get_as_snowflake, _maybe_cast, deprecated, warn_deprecated
from disnake.flags import ApplicationInstallTypes, InteractionContextTypes
from disnake.i18n import Localized
from disnake.permissions import Permissions
from disnake.utils import MISSING, _get_as_snowflake, _maybe_cast, deprecated, warn_deprecated

if TYPE_CHECKING:
from typing_extensions import Self

from .i18n import LocalizationProtocol, LocalizationValue, LocalizedOptional, LocalizedRequired
from .state import ConnectionState
from .types.interactions import (
from disnake.i18n import (
LocalizationProtocol,
LocalizationValue,
LocalizedOptional,
LocalizedRequired,
)
from disnake.state import ConnectionState
from disnake.types.interactions import (
ApplicationCommand as ApplicationCommandPayload,
ApplicationCommandOption as ApplicationCommandOptionPayload,
ApplicationCommandOptionChoice as ApplicationCommandOptionChoicePayload,
Expand Down
22 changes: 11 additions & 11 deletions disnake/appinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
from collections.abc import Sequence
from typing import TYPE_CHECKING, Optional, cast

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

if TYPE_CHECKING:
from .guild import Guild
from .state import ConnectionState
from .types.appinfo import (
from disnake.guild import Guild
from disnake.state import ConnectionState
from disnake.types.appinfo import (
AppInfo as AppInfoPayload,
ApplicationIntegrationType as ApplicationIntegrationTypeLiteral,
ApplicationIntegrationTypeConfiguration as ApplicationIntegrationTypeConfigurationPayload,
Expand All @@ -24,7 +24,7 @@
PartialAppInfo as PartialAppInfoPayload,
Team as TeamPayload,
)
from .user import User
from disnake.user import User


__all__ = (
Expand Down Expand Up @@ -326,7 +326,7 @@ class AppInfo:
)

def __init__(self, state: ConnectionState, data: AppInfoPayload) -> None:
from .team import Team
from disnake.team import Team

self._state: ConnectionState = state
self.id: int = int(data["id"])
Expand Down
8 changes: 4 additions & 4 deletions disnake/application_role_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

from typing import TYPE_CHECKING

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

if TYPE_CHECKING:
from typing_extensions import Self

from .i18n import LocalizationProtocol, LocalizedRequired
from .types.application_role_connection import (
from disnake.i18n import LocalizationProtocol, LocalizedRequired
from disnake.types.application_role_connection import (
ApplicationRoleConnectionMetadata as ApplicationRoleConnectionMetadataPayload,
)

Expand Down
Loading
Loading