refactor!: miscellaneous

Author: VincentRPS

discord/app/cache.py

@@ -147,7 +147,7 @@ async def get_private_channels(self) -> list[PrivateChannel]:
     async def get_private_channel(self, channel_id: int) -> PrivateChannel:
         ...
 
-    async def get_private_channel_by_user(self, user_id: int) -> PrivateChannel:
+    async def get_private_channel_by_user(self, user_id: int) -> PrivateChannel | None:
         ...
 
     async def store_private_channel(self, channel: PrivateChannel) -> None:
@@ -190,19 +190,32 @@ async def get_guild_members(self, guild_id: int) -> list[Member]:
     async def get_all_members(self) -> list[Member]:
         ...
 
-    def clear(self, views: bool = True) -> None:
+    async def clear(self, views: bool = True) -> None:
         ...
 
 class MemoryCache(Cache):
     def __init__(self, max_messages: int | None = None, *, state: ConnectionState):
         self._state = state
         self.max_messages = max_messages
-        self.clear()
+        self._users: dict[int, User] = {}
+        self._guilds: dict[int, Guild] = {}
+        self._polls: dict[int, Poll] = {}
+        self._stickers: dict[int, list[GuildSticker]] = {}
+        self._views: dict[str, View] = {}
+        self._modals: dict[str, Modal] = {}
+        self._messages: Deque[Message] = deque(maxlen=self.max_messages)
+
+        self._emojis: dict[int, list[GuildEmoji | AppEmoji]] = {}
+
+        self._private_channels: OrderedDict[int, PrivateChannel] = OrderedDict()
+        self._private_channels_by_user: dict[int, DMChannel] = {}
+
+        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]
 
-    def clear(self, views: bool = True) -> None:
+    async def clear(self, views: bool = True) -> None:
         self._users: dict[int, User] = {}
         self._guilds: dict[int, Guild] = {}
         self._polls: dict[int, Poll] = {}

discord/app/event_emitter.py

@@ -22,9 +22,10 @@
 DEALINGS IN THE SOFTWARE.
 """
 
-from abc import ABC
+from abc import ABC, abstractmethod
 from asyncio import Future
 import asyncio
+from collections import defaultdict
 from typing import Any, Callable, Self, TypeVar
 
 from .state import ConnectionState

discord/app/state.py

@@ -41,6 +41,7 @@
     Sequence,
     TypeVar,
     Union,
+    cast,
 )
 
 from discord.app.event_emitter import EventEmitter
@@ -263,9 +264,9 @@ def __init__(
 
         self.cache: Cache = self.cache
 
-    def clear(self, *, views: bool = True) -> None:
+    async def clear(self, *, views: bool = True) -> None:
         self.user: ClientUser | None = None
-        self.cache.clear()
+        await self.cache.clear()
         self._voice_clients: dict[int, VoiceClient] = {}
 
     async def process_chunk_requests(
@@ -340,7 +341,7 @@ def deref_user_no_intents(self, user_id: int) -> None:
         return
 
     async def get_user(self, id: int | None) -> User | None:
-        return await self.cache.get_user(id)
+        return await self.cache.get_user(cast(int, id))
 
     async def store_emoji(self, guild: Guild, data: EmojiPayload) -> GuildEmoji:
         return await self.cache.store_guild_emoji(guild, data)
@@ -360,8 +361,8 @@ async def store_sticker(self, guild: Guild, data: GuildStickerPayload) -> GuildS
     async def store_view(self, view: View, message_id: int | None = None) -> None:
         await self.cache.store_view(view, message_id)
 
-    async def store_modal(self, modal: Modal) -> None:
-        await self.cache.store_modal(modal)
+    async def store_modal(self, modal: Modal, user_id: int) -> None:
+        await self.cache.store_modal(modal, user_id)
 
     async def prevent_view_updates_for(self, message_id: int) -> View | None:
         return await self.cache.delete_view_on(message_id)
@@ -379,7 +380,7 @@ async def get_guilds(self) -> list[Guild]:
         return await self.cache.get_all_guilds()
 
     async def _get_guild(self, guild_id: int | None) -> Guild | None:
-        return await self.cache.get_guild(guild_id)
+        return await self.cache.get_guild(cast(int, guild_id))
 
     async def _add_guild(self, guild: Guild) -> None:
         await self.cache.add_guild(guild)
@@ -408,18 +409,11 @@ async def _remove_emoji(self, emoji: GuildEmoji | AppEmoji) -> None:
         await self.cache.delete_emoji(emoji)
 
     async def get_sticker(self, sticker_id: int | None) -> GuildSticker | None:
-        return await self.cache.get_sticker(sticker_id)
+        return await self.cache.get_sticker(cast(int, sticker_id))
 
     async def get_polls(self) -> list[Poll]:
         return await self.cache.get_all_polls()
 
-    def create_poll(self, poll: PollPayload, raw) -> Poll:
-        channel = self.get_channel(raw.channel_id) or PartialMessageable(
-            state=self, id=raw.channel_id
-        )
-        message = channel.get_partial_message(raw.message_id)
-        return Poll.from_dict(poll, message)
-
     async def store_poll(self, poll: Poll, message_id: int):
         await self.cache.store_poll(poll, message_id)
 
@@ -430,10 +424,10 @@ async def get_private_channels(self) -> list[PrivateChannel]:
         return await self.cache.get_private_channels()
 
     async def _get_private_channel(self, channel_id: int | None) -> PrivateChannel | None:
-        return await self.cache.get_private_channel(channel_id)
+        return await self.cache.get_private_channel(cast(int, channel_id))
 
     async def _get_private_channel_by_user(self, user_id: int | None) -> DMChannel | None:
-        return await self.cache.get_private_channel_by_user(user_id)
+        return cast(DMChannel | None, await self.cache.get_private_channel_by_user(cast(int, user_id)))
 
     async def _add_private_channel(self, channel: PrivateChannel) -> None:
         await self.cache.store_private_channel(channel)
@@ -446,7 +440,7 @@ async def add_dm_channel(self, data: DMChannelPayload) -> DMChannel:
         return channel
 
     async def _get_message(self, msg_id: int | None) -> Message | None:
-        return await self.cache.get_message(msg_id)
+        return await self.cache.get_message(cast(int, msg_id))
 
     def _guild_needs_chunking(self, guild: Guild) -> bool:
         # If presences are enabled then we get back the old guild.large behaviour
@@ -461,7 +455,8 @@ async def _get_guild_channel(
     ) -> tuple[Channel | Thread, Guild | None]:
         channel_id = int(data["channel_id"])
         try:
-            guild = await self._get_guild(int(guild_id or data["guild_id"]))
+            # 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)
             guild = None

discord/interactions.py

@@ -1243,7 +1243,8 @@ async def send_modal(self, modal: Modal) -> Interaction:
             )
         )
         self._responded = True
-        await self._parent._state.store_modal(modal)
+        # _data should be present
+        await self._parent._state.store_modal(modal, int(self._parent._data["user"]["id"])) # type: ignore
         return self._parent
 
     @utils.deprecated("a button with type ButtonType.premium", "2.6")