Make fetch_x methods cache when applicable

discord/abc.py

@@ -1434,7 +1434,7 @@ class Messageable:
                 components=components,
             )
 
-        ret = state.create_message(channel=channel, data=data)
+        ret = state.store_message(channel=channel, data=data)
         if view:
             state.store_view(view, ret.id)
 
@@ -1501,7 +1501,7 @@ class Messageable:
 
         channel = await self._get_channel()
         data = await self._state.http.get_message(channel.id, id)
-        return self._state.create_message(channel=channel, data=data)
+        return self._state.store_message(channel=channel, data=data)
 
     async def pins(self) -> List[Message]:
         """|coro|
@@ -1528,7 +1528,7 @@ class Messageable:
         channel = await self._get_channel()
         state = self._state
         data = await state.http.pins_from(channel.id)
-        return [state.create_message(channel=channel, data=m) for m in data]
+        return [state.store_message(channel=channel, data=m) for m in data]
 
     def history(
         self,

discord/client.py

@@ -53,7 +53,7 @@ from .widget import Widget
 from .guild import Guild
 from .emoji import Emoji
 from .channel import _threaded_channel_factory, PartialMessageable
-from .enums import ChannelType
+from .enums import ChannelType, StickerType
 from .mentions import AllowedMentions
 from .errors import *
 from .enums import Status, VoiceRegion
@@ -76,7 +76,8 @@ from .threads import Thread
 from .sticker import GuildSticker, StandardSticker, StickerPack, _sticker_factory
 
 if TYPE_CHECKING:
-    from .abc import SnowflakeTime, PrivateChannel, GuildChannel, Snowflake
+    from .abc import SnowflakeTime, PrivateChannel, GuildChannel as GuildChannelABC, Snowflake
+    from .guild import GuildChannel
     from .channel import DMChannel
     from .message import Message
     from .member import Member
@@ -780,7 +781,7 @@ class Client:
         """List[:class:`~discord.User`]: Returns a list of all the users the bot can see."""
         return list(self._connection._users.values())
 
-    def get_channel(self, id: int, /) -> Optional[Union[GuildChannel, Thread, PrivateChannel]]:
+    def get_channel(self, id: int, /) -> Optional[Union[GuildChannelABC, Thread, PrivateChannel]]:
         """Returns a channel or thread with the given ID.
 
         Parameters
@@ -933,7 +934,7 @@ class Client:
         """
         return self._connection.get_sticker(id)
 
-    def get_all_channels(self) -> Generator[GuildChannel, None, None]:
+    def get_all_channels(self) -> Generator[GuildChannelABC, None, None]:
         """A generator that retrieves every :class:`.abc.GuildChannel` the client can 'access'.
 
         This is equivalent to: ::
@@ -1488,6 +1489,7 @@ class Client:
         """|coro|
 
         Retrieves the bot's application information.
+        This will fill up :attr:`application_id` and :attr:`application_flags`.
 
         Raises
         -------
@@ -1502,6 +1504,8 @@ class Client:
         data = await self.http.application_info()
         if "rpc_origins" not in data:
             data["rpc_origins"] = None
+
+        self._connection.store_appinfo(data)
         return AppInfo(self._connection, data)
 
     async def fetch_user(self, user_id: int, /) -> User:
@@ -1535,10 +1539,11 @@ class Client:
         data = await self.http.get_user(user_id)
         return User(state=self._connection, data=data)
 
-    async def fetch_channel(self, channel_id: int, /) -> Union[GuildChannel, PrivateChannel, Thread]:
+    async def fetch_channel(self, channel_id: int, /) -> Union[GuildChannelABC, PrivateChannel, Thread]:
         """|coro|
 
         Retrieves a :class:`.abc.GuildChannel`, :class:`.abc.PrivateChannel`, or :class:`.Thread` with the specified ID.
+        If found, will store the Channel in the internal cache, meaning :meth:``get_channel`` will succeed afterwards.
 
         .. note::
 
@@ -1570,14 +1575,18 @@ class Client:
 
         if ch_type in (ChannelType.group, ChannelType.private):
             # the factory will be a DMChannel or GroupChannel here
-            channel = factory(me=self.user, data=data, state=self._connection)  # type: ignore
+            channel: PrivateChannel = factory(me=self.user, data=data, state=self._connection)  # type: ignore
+            self._connection._add_private_channel(channel)  # type: ignore
         else:
             # the factory can't be a DMChannel or GroupChannel here
             guild_id = int(data["guild_id"])  # type: ignore
-            guild = self.get_guild(guild_id) or Object(id=guild_id)
+            guild = self.get_guild(guild_id)
-            # GuildChannels expect a Guild, we may be passing an Object
-            channel = factory(guild=guild, state=self._connection, data=data)  # type: ignore
 
+            if guild is None:
+                return factory(guild=Object(guild_id), state=self._connection, data=data)  # type: ignore
+
+            channel: GuildChannel = factory(guild=guild, state=self._connection, data=data)  # type: ignore
+            guild._add_channel(channel)
         return channel
 
     async def fetch_webhook(self, webhook_id: int, /) -> Webhook:
@@ -1606,6 +1615,7 @@ class Client:
         """|coro|
 
         Retrieves a :class:`.Sticker` with the specified ID.
+        If found, will store the sticker in the internal cache, meaning :meth:``get_sticker`` will succeed afterwards.
 
         .. versionadded:: 2.0
 
@@ -1623,7 +1633,11 @@ class Client:
         """
         data = await self.http.get_sticker(sticker_id)
         cls, _ = _sticker_factory(data["type"])  # type: ignore
-        return cls(state=self._connection, data=data)  # type: ignore
+
+        if data["type"] == StickerType.guild:  # type: ignore
+            return self._connection.store_sticker(data)  # type: ignore
+        else:
+            return cls(state=self._connection, data=data)  # type: ignore
 
     async def fetch_premium_sticker_packs(self) -> List[StickerPack]:
         """|coro|

discord/ext/commands/context.py

@@ -465,6 +465,7 @@ class Context(discord.abc.Messageable, Generic[BotT]):
         kwargs.pop("nonce", None)
         kwargs.pop("stickers", None)
         kwargs.pop("reference", None)
+        kwargs.pop("delete_after", None)
         kwargs.pop("mention_author", None)
 
         if not (

discord/ext/commands/core.py

@@ -1694,7 +1694,9 @@ class Group(GroupMixin[CogT], Command[CogT, P, T]):
             "name": self.name,
             "type": int(not (nested - 1)) + 1,
             "description": self.short_doc or "no description",
-            "options": [cmd.to_application_command(nested=nested + 1) for cmd in sorted(self.commands, key=lambda x: x.name)],
+            "options": [
+                cmd.to_application_command(nested=nested + 1) for cmd in sorted(self.commands, key=lambda x: x.name)
+            ],
         }
 
 

discord/flags.py

@@ -951,6 +951,15 @@ class MemberCacheFlags(BaseFlags):
         """
         return 2
 
+    @flag_value
+    def fetched(self):
+        """:class:`bool`: Whether to cache members that are fetched via :meth:``Guild.fetch_member``
+        or :meth:``Guild.fetch_members``
+
+        Members that leave the guild are no longer cached.
+        """
+        return 4
+
     @classmethod
     def from_intents(cls: Type[MemberCacheFlags], intents: Intents) -> MemberCacheFlags:
         """A factory method that creates a :class:`MemberCacheFlags` based on
@@ -968,6 +977,8 @@ class MemberCacheFlags(BaseFlags):
         """
 
         self = cls.none()
+        self.fetched = True
+
         if intents.members:
             self.joined = True
         if intents.voice_states:

discord/guild.py

@@ -428,7 +428,7 @@ class Guild(Hashable):
         self.mfa_level: MFALevel = guild.get("mfa_level")
         self.emojis: Tuple[Emoji, ...] = tuple(map(lambda d: state.store_emoji(self, d), guild.get("emojis", [])))
         self.stickers: Tuple[GuildSticker, ...] = tuple(
-            map(lambda d: state.store_sticker(self, d), guild.get("stickers", []))
+            map(lambda d: state.store_sticker(d), guild.get("stickers", []))
         )
         self.features: List[GuildFeature] = guild.get("features", [])
         self._splash: Optional[str] = guild.get("splash")
@@ -1594,6 +1594,7 @@ class Guild(Hashable):
         """|coro|
 
         Retrieves all :class:`abc.GuildChannel` that the guild has.
+        Will store the Channels in the internal cache, meaning :meth:``get_channel`` will succeed afterwards.
 
         .. note::
 
@@ -1616,11 +1617,12 @@ class Guild(Hashable):
         data = await self._state.http.get_all_guild_channels(self.id)
 
         def convert(d):
-            factory, ch_type = _guild_channel_factory(d["type"])
+            factory, _ = _guild_channel_factory(d["type"])
             if factory is None:
                 raise InvalidData("Unknown channel type {type} for channel ID {id}.".format_map(d))
 
             channel = factory(guild=self, state=self._state, data=d)
+            self._add_channel(channel)
             return channel
 
         return [convert(d) for d in data]
@@ -1712,6 +1714,8 @@ class Guild(Hashable):
         """|coro|
 
         Retrieves a :class:`Member` from a guild ID, and a member ID.
+        If found, will store the Member in the internal cache, filling up :attr:`members`
+        and meaning :meth:``get_member`` will succeed afterwards.
 
         .. note::
 
@@ -1737,7 +1741,11 @@ class Guild(Hashable):
             The member from the member ID.
         """
         data = await self._state.http.get_member(self.id, member_id)
-        return Member(data=data, state=self._state, guild=self)
+        member = Member(data=data, state=self._state, guild=self)
+        if self._state.member_cache_flags.fetched:
+            self._add_member(member)
+
+        return member
 
     async def try_member(self, member_id: int, /) -> Optional[Member]:
         """|coro|
@@ -2257,7 +2265,7 @@ class Guild(Hashable):
         payload["tags"] = emoji
 
         data = await self._state.http.create_guild_sticker(self.id, payload, file, reason)
-        return self._state.store_sticker(self, data)
+        return self._state.store_sticker(data)
 
     async def delete_sticker(self, sticker: Snowflake, *, reason: Optional[str] = None) -> None:
         """|coro|

discord/interactions.py

@@ -137,7 +137,7 @@ class Interaction:
 
         self.message: Optional[Message]
         try:
-            self.message = Message(state=self._state, channel=self.channel, data=data["message"])  # type: ignore
+            self.message = self._state.store_message(channel=self.channel, data=data["message"])  # type: ignore
         except KeyError:
             self.message = None
 
@@ -337,7 +337,7 @@ class Interaction:
             self._state.store_view(view, message.id)
         return message
 
-    async def delete_original_message(self, delay: Optional[float] = None) -> None:
+    async def delete_original_message(self) -> None:
         """|coro|
 
         Deletes the original interaction response message.
@@ -345,14 +345,6 @@ class Interaction:
         This is a lower level interface to :meth:`InteractionMessage.delete` in case
         you do not want to fetch the message and save an HTTP request.
 
-        Parameters
-        ------------
-        delay: Optional[:class:`float`]
-            If provided, the number of seconds to wait before deleting the message.
-            The waiting is done in the background and deletion failures are ignored.
-            
-            .. versionadded:: 2.0
-
         Raises
         -------
         HTTPException
@@ -360,8 +352,6 @@ class Interaction:
         Forbidden
             Deleted a message that is not yours.
         """
-        if delay is not None:
-            await asyncio.sleep(delay)
         adapter = async_context.get()
         await adapter.delete_original_interaction_response(
             self.application_id,
@@ -470,7 +460,6 @@ class InteractionResponse:
         view: View = MISSING,
         tts: bool = False,
         ephemeral: bool = False,
-        delete_after: Optional[float] = None,
     ) -> None:
         """|coro|
 
@@ -494,9 +483,6 @@ class InteractionResponse:
             Indicates if the message should only be visible to the user who started the interaction.
             If a view is sent with an ephemeral message and it has no timeout set then the timeout
             is set to 15 minutes.
-        delete_after: Optional[:class:`float`]
-            The amount of seconds the bot should wait before deleting the message sent.
-            .. versionadded:: 2.0
 
         Raises
         -------
@@ -553,8 +539,6 @@ class InteractionResponse:
             self._parent._state.store_view(view)
 
         self.responded_at = utils.utcnow()
-        if delete_after is not None:
-            self._parent.delete_original_message(delay=delete_after)
 
     async def edit_message(
         self,
@@ -749,7 +733,7 @@ class InteractionMessage(Message):
             allowed_mentions=allowed_mentions,
         )
 
-    async def delete(self, *, delay: Optional[float] = None, silent: bool = False) -> None:
+    async def delete(self, *, delay: Optional[float] = None) -> None:
         """|coro|
 
         Deletes the message.
@@ -760,12 +744,6 @@ class InteractionMessage(Message):
             If provided, the number of seconds to wait before deleting the message.
             The waiting is done in the background and deletion failures are ignored.
 
-        silent: :class:`bool`
-            If silent is set to ``True``, the error will not be raised, it will be ignored.
-            This defaults to ``False`
-        
-        .. versionadded:: 2.0
-
         Raises
         ------
         Forbidden
@@ -779,15 +757,12 @@ class InteractionMessage(Message):
         if delay is not None:
 
             async def inner_call(delay: float = delay):
+                await asyncio.sleep(delay)
                 try:
-                    await self._state._interaction.delete_original_message(delay=delay)
+                    await self._state._interaction.delete_original_message()
                 except HTTPException:
                     pass
 
             asyncio.create_task(inner_call())
         else:
-            try:
+            await self._state._interaction.delete_original_message()
-                await self._state._interaction.delete_original_message(delay=delay)
-            except Exception:
-                if not silent:
-                    raise

discord/iterators.py

@@ -42,22 +42,12 @@ __all__ = (
 )
 
 if TYPE_CHECKING:
-    from .types.audit_log import (
+    from .types.member import MemberWithUser as MemberWithUserPayload
-        AuditLog as AuditLogPayload,
+    from .types.user import PartialUser as PartialUserPayload
-    )
+    from .types.audit_log import AuditLog as AuditLogPayload
-    from .types.guild import (
+    from .types.message import Message as MessagePayload
-        Guild as GuildPayload,
+    from .types.threads import Thread as ThreadPayload
-    )
+    from .types.guild import Guild as GuildPayload
-    from .types.message import (
-        Message as MessagePayload,
-    )
-    from .types.user import (
-        PartialUser as PartialUserPayload,
-    )
-
-    from .types.threads import (
-        Thread as ThreadPayload,
-    )
 
     from .member import Member
     from .user import User
@@ -354,7 +344,7 @@ class HistoryIterator(_AsyncIterator["Message"]):
 
             channel = self.channel
             for element in data:
-                await self.messages.put(self.state.create_message(channel=channel, data=element))
+                await self.messages.put(self.state.store_message(channel=channel, data=element))
 
     async def _retrieve_messages(self, retrieve) -> List[Message]:
         """Retrieve messages and update next parameters."""
@@ -615,14 +605,18 @@ class MemberIterator(_AsyncIterator["Member"]):
         if isinstance(after, datetime.datetime):
             after = Object(id=time_snowflake(after, high=True))
 
-        self.guild = guild
         self.limit = limit
+        self.guild: Guild = guild
         self.after = after or OLDEST_OBJECT
 
         self.state = self.guild._state
         self.get_members = self.state.http.get_members
         self.members = asyncio.Queue()
 
+        self.create_member = (
+            self.create_member_cache if self.state.member_cache_flags.fetched else self.create_member_no_cache
+        )
+
     async def next(self) -> Member:
         if self.members.empty():
             await self.fill_members()
@@ -657,11 +651,16 @@ class MemberIterator(_AsyncIterator["Member"]):
             for element in reversed(data):
                 await self.members.put(self.create_member(element))
 
-    def create_member(self, data):
+    def create_member_no_cache(self, data: MemberWithUserPayload) -> Member:
         from .member import Member
 
         return Member(data=data, guild=self.guild, state=self.state)
 
+    def create_member_cache(self, data: MemberWithUserPayload) -> Member:
+        member = self.create_member_no_cache(data)
+        self.guild._add_member(member)
+        return member
+
 
 class ArchivedThreadIterator(_AsyncIterator["Thread"]):
     def __init__(

discord/message.py

@@ -1331,7 +1331,7 @@ class Message(Hashable):
                 payload["components"] = []
 
         data = await self._state.http.edit_message(self.channel.id, self.id, **payload)
-        message = Message(state=self._state, channel=self.channel, data=data)
+        message = self._state.store_message(channel=self.channel, data=data)
 
         if view and not view.is_finished():
             self._state.store_view(view, self.id)
@@ -1756,7 +1756,7 @@ class PartialMessage(Hashable):
         """
 
         data = await self._state.http.get_message(self.channel.id, self.id)
-        return self._state.create_message(channel=self.channel, data=data)
+        return self._state.store_message(channel=self.channel, data=data)
 
     async def edit(self, **fields: Any) -> Optional[Message]:
         """|coro|
@@ -1873,7 +1873,7 @@ class PartialMessage(Hashable):
 
         if fields:
             # data isn't unbound
-            msg = self._state.create_message(channel=self.channel, data=data)  # type: ignore
+            msg = self._state.store_message(channel=self.channel, data=data)  # type: ignore
             if view and not view.is_finished():
                 self._state.store_view(view, self.id)
             return msg

discord/state.py

@@ -27,7 +27,6 @@ from __future__ import annotations
 import asyncio
 from collections import deque, OrderedDict
 import copy
-import datetime
 import itertools
 import logging
 from typing import Dict, Optional, TYPE_CHECKING, Union, Callable, Any, List, TypeVar, Coroutine, Sequence, Tuple, Deque
@@ -75,6 +74,7 @@ if TYPE_CHECKING:
     from .types.sticker import GuildSticker as GuildStickerPayload
     from .types.guild import Guild as GuildPayload
     from .types.message import Message as MessagePayload
+    from .types.appinfo import AppInfo as AppInfoPayload
 
     T = TypeVar("T")
     CS = TypeVar("CS", bound="ConnectionState")
@@ -323,6 +323,13 @@ class ConnectionState:
         for vc in self.voice_clients:
             vc.main_ws = ws  # type: ignore
 
+    def store_message(self, channel: MessageableChannel, data: MessagePayload) -> Message:
+        message = Message(state=self, channel=channel, data=data)
+        if self._messages is not None:
+            self._messages.append(message)
+
+        return message
+
     def store_user(self, data: UserPayload) -> User:
         user_id = int(data["id"])
         try:
@@ -353,11 +360,20 @@ class ConnectionState:
         self._emojis[emoji_id] = emoji = Emoji(guild=guild, state=self, data=data)
         return emoji
 
-    def store_sticker(self, guild: Guild, data: GuildStickerPayload) -> GuildSticker:
+    def store_sticker(self, data: GuildStickerPayload) -> GuildSticker:
         sticker_id = int(data["id"])
         self._stickers[sticker_id] = sticker = GuildSticker(state=self, data=data)
         return sticker
 
+    def store_appinfo(self, data: AppInfoPayload):
+        self.application_id = utils._get_as_snowflake(data, "id")
+
+        flags = data.get("flags")
+        if flags is not None:
+            self.application_flags = ApplicationFlags._from_value(flags)
+
+        return data
+
     def store_view(self, view: View, message_id: Optional[int] = None) -> None:
         self._view_store.add_view(view, message_id)
 
@@ -563,9 +579,7 @@ class ConnectionState:
             except KeyError:
                 pass
             else:
-                self.application_id = utils._get_as_snowflake(application, "id")
+                self.store_appinfo(application)
-                # flags will always be present here
-                self.application_flags = ApplicationFlags._from_value(application["flags"])  # type: ignore
 
         for guild_data in data["guilds"]:
             self._add_guild_from_data(guild_data)
@@ -581,8 +595,7 @@ class ConnectionState:
         # channel would be the correct type here
         message = Message(channel=channel, data=data, state=self)  # type: ignore
         self.dispatch("message", message)
-        if self._messages is not None:
+        self.store_message(channel, data)
-            self._messages.append(message)
         # we ensure that the channel is either a TextChannel or Thread
         if channel and channel.__class__ in (TextChannel, Thread):
             channel.last_message_id = message.id  # type: ignore
@@ -1032,7 +1045,7 @@ class ConnectionState:
         for emoji in before_stickers:
             self._stickers.pop(emoji.id, None)
         # guild won't be None here
-        guild.stickers = tuple(map(lambda d: self.store_sticker(guild, d), data["stickers"]))  # type: ignore
+        guild.stickers = tuple(map(lambda d: self.store_sticker(d), data["stickers"]))  # type: ignore
         self.dispatch("guild_stickers_update", guild, before_stickers, guild.stickers)
 
     def _get_create_guild(self, data):
@@ -1403,11 +1416,6 @@ class ConnectionState:
             if channel is not None:
                 return channel
 
-    def create_message(
-        self, *, channel: Union[TextChannel, Thread, DMChannel, GroupChannel, PartialMessageable], data: MessagePayload
-    ) -> Message:
-        return Message(state=self, channel=channel, data=data)
-
 
 class AutoShardedConnectionState(ConnectionState):
     def __init__(self, *args: Any, **kwargs: Any) -> None:

discord/webhook/async_.py

@@ -717,7 +717,7 @@ class WebhookMessage(Message):
             allowed_mentions=allowed_mentions,
         )
 
-    async def delete(self, *, delay: Optional[float] = None, silent: bool = False) -> None:
+    async def delete(self, *, delay: Optional[float] = None) -> None:
         """|coro|
 
         Deletes the message.
@@ -728,12 +728,6 @@ class WebhookMessage(Message):
             If provided, the number of seconds to wait before deleting the message.
             The waiting is done in the background and deletion failures are ignored.
 
-        silent: :class:`bool`
-            If silent is set to ``True``, the error will not be raised, it will be ignored.
-            This defaults to ``False`
-        
-        .. versionadded:: 2.0
-
         Raises
         ------
         Forbidden
@@ -747,18 +741,15 @@ class WebhookMessage(Message):
         if delay is not None:
 
             async def inner_call(delay: float = delay):
+                await asyncio.sleep(delay)
                 try:
-                    await self._state._webhook.delete_message(self.id, delay)
+                    await self._state._webhook.delete_message(self.id)
                 except HTTPException:
                     pass
 
             asyncio.create_task(inner_call())
         else:
-            try:
+            await self._state._webhook.delete_message(self.id)
-                await self._state._webhook.delete_message(self.id, delay)
-            except Exception:
-                if not silent:
-                    raise
 
 
 class BaseWebhook(Hashable):
@@ -1279,7 +1270,6 @@ class Webhook(BaseWebhook):
         view: View = MISSING,
         thread: Snowflake = MISSING,
         wait: bool = False,
-        delete_after: Optional[float] = None,
     ) -> Optional[WebhookMessage]:
         """|coro|
 
@@ -1346,11 +1336,6 @@ class Webhook(BaseWebhook):
 
             .. versionadded:: 2.0
 
-        delete_after: Optional[:class:`float`]
-            If provided, the number of seconds to wait before deleting the message.
-            The waiting is done in the background and deletion failures are ignored.
-            .. versionadded:: 2.0
-
         Raises
         --------
         HTTPException
@@ -1432,9 +1417,6 @@ class Webhook(BaseWebhook):
             message_id = None if msg is None else msg.id
             self._state.store_view(view, message_id)
 
-        if delete_after is not None and msg is not None:
-            await msg.delete(delay=delete_after)
-
         return msg
 
     async def fetch_message(self, id: int) -> WebhookMessage:
@@ -1588,7 +1570,7 @@ class Webhook(BaseWebhook):
             self._state.store_view(view, message_id)
         return message
 
-    async def delete_message(self, message_id: int, delay: Optional[float] = None, /) -> None:
+    async def delete_message(self, message_id: int, /) -> None:
         """|coro|
 
         Deletes a message owned by this webhook.
@@ -1603,12 +1585,6 @@ class Webhook(BaseWebhook):
         message_id: :class:`int`
             The message ID to delete.
 
-        delay: Optional[:class:`float`]
-            If provided, the number of seconds to wait before deleting the message.
-            The waiting is done in the background and deletion failures are ignored.
-            
-            .. versionadded:: 2.0
-
         Raises
         -------
         HTTPException
@@ -1619,9 +1595,6 @@ class Webhook(BaseWebhook):
         if self.token is None:
             raise InvalidArgument("This webhook does not have a token associated with it")
 
-        if delay is not None:
-            await asyncio.sleep(delay)
-
         adapter = async_context.get()
         await adapter.delete_webhook_message(
             self.id,