✨ Excessive changes including gears and make all this more or less work

Author: Paillat-dev

discord/app/cache.py

@@ -143,6 +143,8 @@ async def store_private_channel(self, channel: "PrivateChannel") -> None: ...
 
     async def store_message(self, message: MessagePayload, channel: "MessageableChannel") -> Message: ...
 
+    async def store_built_message(self, message: Message) -> None: ...
+
     async def upsert_message(self, message: Message) -> None: ...
 
     async def delete_message(self, message_id: int) -> None: ...
@@ -175,6 +177,7 @@ async def get_all_sounds(self) -> list[SoundboardSound]: ...
 
     async def delete_sound(self, sound_id: int) -> None: ...
 
+
 class MemoryCache(Cache):
     def __init__(self, max_messages: int | None = None) -> None:
         self.__state: ConnectionState | None = None
@@ -195,8 +198,6 @@ def __init__(self, max_messages: int | None = None) -> None:
 
         self._guild_members: dict[int, dict[int, Member]] = defaultdict(dict)
 
-
-
     def _flatten(self, matrix: list[list[T]]) -> list[T]:
         return [item for row in matrix for item in row]
 
@@ -373,9 +374,12 @@ async def upsert_message(self, message: Message) -> None:
 
     async def store_message(self, message: MessagePayload, channel: "MessageableChannel") -> Message:
         msg = await Message._from_data(state=self._state, channel=channel, data=message)
-        self._messages.append(msg)
+        self.store_built_message(msg)
         return msg
 
+    async def store_built_message(self, message: Message) -> None:
+        self._messages.append(message)
+
     async def delete_message(self, message_id: int) -> None:
         self._messages.remove(utils.find(lambda m: m.id == message_id, reversed(self._messages)))
 

discord/app/event_emitter.py

@@ -91,8 +91,7 @@ def __init__(self, state: "ConnectionState") -> None:
         self._events: dict[str, list[type[Event]]] = defaultdict(list)
         self._state: ConnectionState = state
 
-        # Auto-register all Event classes
-        from ..events import ALL_EVENTS
+        from ..events import ALL_EVENTS  # noqa: PLC0415
 
         for event_cls in ALL_EVENTS:
             self.add_event(event_cls)

discord/app/state.py

@@ -451,7 +451,7 @@ async def _get_guild_channel(
             # guild_id is in data
             guild = await self._get_guild(int(guild_id or data["guild_id"]))  # type: ignore
         except KeyError:
-            channel = DMChannel._from_message(self, channel_id)
+            channel = DMChannel(id=channel_id, state=self)
             guild = None
         else:
             channel = guild and guild._resolve_channel(channel_id)

discord/bot.py

@@ -46,7 +46,6 @@
 )
 
 from .client import Client
-from .cog import CogMixin
 from .commands import (
     ApplicationCommand,
     ApplicationContext,
@@ -59,6 +58,7 @@
 )
 from .enums import IntegrationType, InteractionContextType, InteractionType
 from .errors import CheckFailure, DiscordException
+from .events import InteractionCreate
 from .interactions import Interaction
 from .shard import AutoShardedClient
 from .types import interactions
@@ -1082,7 +1082,7 @@ async def invoke_application_command(self, ctx: ApplicationContext) -> None:
         ctx: :class:`.ApplicationCommand`
             The invocation context to invoke.
         """
-        self._bot.dispatch("application_command", ctx)
+        # self._bot.dispatch("application_command", ctx) # TODO: Remove when moving away from ApplicationContext
         try:
             if await self._bot.can_run(ctx, call_once=True):
                 await ctx.command.invoke(ctx)
@@ -1091,14 +1091,15 @@ async def invoke_application_command(self, ctx: ApplicationContext) -> None:
         except DiscordException as exc:
             await ctx.command.dispatch_error(ctx, exc)
         else:
-            self._bot.dispatch("application_command_completion", ctx)
+            # self._bot.dispatch("application_command_completion", ctx) # TODO: Remove when moving away from ApplicationContext
+            pass
 
     @property
     @abstractmethod
     def _bot(self) -> Bot | AutoShardedBot: ...
 
 
-class BotBase(ApplicationCommandMixin, CogMixin, ABC):
+class BotBase(ApplicationCommandMixin, ABC):
     _supports_prefixed_commands = False
 
     def __init__(self, description=None, *args, **options):
@@ -1152,11 +1153,13 @@ def __init__(self, description=None, *args, **options):
         self._before_invoke = None
         self._after_invoke = None
 
+        self._bot.add_listener(self.on_interaction, event=InteractionCreate)
+
     async def on_connect(self):
         if self.auto_sync_commands:
             await self.sync_commands()
 
-    async def on_interaction(self, interaction):
+    async def on_interaction(self, interaction: InteractionCreate):
         await self.process_application_commands(interaction)
 
     async def on_application_command_error(self, context: ApplicationContext, exception: DiscordException) -> None:

discord/channel/__init__.py

@@ -0,0 +1,58 @@
+from ..enums import ChannelType, try_enum
+from ..threads import Thread
+from .channel import *
+from .dm import DMChannel, GroupDMChannel
+
+
+def _guild_channel_factory(channel_type: int):
+    value = try_enum(ChannelType, channel_type)
+    if value is ChannelType.text:
+        return TextChannel, value
+    elif value is ChannelType.voice:
+        return VoiceChannel, value
+    elif value is ChannelType.category:
+        return CategoryChannel, value
+    elif value is ChannelType.news:
+        return TextChannel, value
+    elif value is ChannelType.stage_voice:
+        return StageChannel, value
+    elif value is ChannelType.directory:
+        return None, value  # todo: Add DirectoryChannel when applicable
+    elif value is ChannelType.forum:
+        return ForumChannel, value
+    elif value is ChannelType.media:
+        return MediaChannel, value
+    else:
+        return None, value
+
+
+def _channel_factory(channel_type: int):
+    cls, value = _guild_channel_factory(channel_type)
+    if value is ChannelType.private:
+        return DMChannel, value
+    elif value is ChannelType.group:
+        return GroupDMChannel, value
+    else:
+        return cls, value
+
+
+def _threaded_channel_factory(channel_type: int):
+    cls, value = _channel_factory(channel_type)
+    if value in (
+        ChannelType.private_thread,
+        ChannelType.public_thread,
+        ChannelType.news_thread,
+    ):
+        return Thread, value
+    return cls, value
+
+
+def _threaded_guild_channel_factory(channel_type: int):
+    cls, value = _guild_channel_factory(channel_type)
+    if value in (
+        ChannelType.private_thread,
+        ChannelType.public_thread,
+        ChannelType.news_thread,
+    ):
+        return Thread, value
+    return cls, value

discord/channel/base.py

@@ -0,0 +1,89 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-present Pycord Development
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+
+import datetime
+import logging
+from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Generic
+
+from typing_extensions import Self, TypeVar, override
+
+from ..abc import Snowflake
+from ..enums import ChannelType, try_enum
+from ..permissions import Permissions
+from ..types.channel import Channel as ChannelPayload
+from ..utils import snowflake_time
+
+_log = logging.getLogger(__name__)
+
+if TYPE_CHECKING:
+    from ..app.state import ConnectionState
+
+
+P = TypeVar("P", bound="ChannelPayload")
+
+
+class BaseChannel(ABC, Generic[P]):
+    __slots__: tuple[str, ...] = ("id", "_type", "_state", "_data")  # pyright: ignore [reportIncompatibleUnannotatedOverride]
+
+    def __init__(self, id: int, state: "ConnectionState"):
+        self.id: int = id
+        self._state: ConnectionState = state
+        self._data: P = {}  # type: ignore
+
+    async def _update(self, data: P) -> None:
+        self._type: int = data["type"]
+        self._data = self._data | data  # type: ignore
+
+    @classmethod
+    async def _from_data(cls, *, data: P, state: "ConnectionState", **kwargs) -> Self:
+        if kwargs:
+            _log.warning("Unexpected keyword arguments passed to %s._from_data: %r", cls.__name__, kwargs)
+        self = cls(int(data["id"]), state)
+        await self._update(data)
+        return self
+
+    @property
+    def type(self) -> ChannelType:
+        """The channel's Discord channel type."""
+        return try_enum(ChannelType, self._type)
+
+    async def _get_channel(self) -> Self:
+        return self
+
+    @property
+    def created_at(self) -> datetime.datetime:
+        """The channel's creation time in UTC."""
+        return snowflake_time(self.id)
+
+    @abstractmethod
+    @override
+    def __repr__(self) -> str: ...
+
+    @property
+    @abstractmethod
+    def jump_url(self) -> str: ...
+
+    @abstractmethod
+    def permissions_for(self, obj: Snowflake, /) -> Permissions: ...