Merge pull request #1744 from interactions-py/unstable

5.14

Author: silasary

interactions/api/events/processors/_template.py

@@ -1,6 +1,7 @@
 import asyncio
 import functools
 import inspect
+import logging
 from typing import TYPE_CHECKING, Callable, Coroutine
 
 from interactions.client.const import Absent, MISSING, AsyncCallable
@@ -40,7 +41,9 @@ class EventMixinTemplate:
 
     cache: "GlobalCache"
     dispatch: Callable[["BaseEvent"], None]
+    fetch_members: bool
     _init_interactions: Callable[[], Coroutine]
+    logger: logging.Logger
     synchronise_interactions: Callable[[], Coroutine]
     _user: ClientUser
     _guild_event: asyncio.Event

interactions/api/events/processors/_template.pyi

@@ -15,24 +15,24 @@ class AutoModEvents(EventMixinTemplate):
     @Processor.define()
     async def _raw_auto_moderation_action_execution(self, event: "RawGatewayEvent") -> None:
         action = AutoModerationAction.from_dict(event.data.copy(), self)
-        channel = self.get_channel(event.data.get("channel_id"))
-        guild = self.get_guild(event.data["guild_id"])
+        channel = self.cache.get_channel(event.data.get("channel_id"))
+        guild = self.cache.get_guild(event.data["guild_id"])
         self.dispatch(events.AutoModExec(action, channel, guild))
 
     @Processor.define()
     async def raw_auto_moderation_rule_create(self, event: "RawGatewayEvent") -> None:
         rule = AutoModRule.from_dict(event.data, self)
-        guild = self.get_guild(event.data["guild_id"])
+        guild = self.cache.get_guild(event.data["guild_id"])
         self.dispatch(events.AutoModCreated(guild, rule))
 
     @Processor.define()
     async def raw_auto_moderation_rule_update(self, event: "RawGatewayEvent") -> None:
         rule = AutoModRule.from_dict(event.data, self)
-        guild = self.get_guild(event.data["guild_id"])
+        guild = self.cache.get_guild(event.data["guild_id"])
         self.dispatch(events.AutoModUpdated(guild, rule))
 
     @Processor.define()
     async def raw_auto_moderation_rule_delete(self, event: "RawGatewayEvent") -> None:
         rule = AutoModRule.from_dict(event.data, self)
-        guild = self.get_guild(event.data["guild_id"])
+        guild = self.cache.get_guild(event.data["guild_id"])
         self.dispatch(events.AutoModDeleted(guild, rule))

interactions/api/events/processors/auto_mod.py

@@ -23,7 +23,7 @@ async def _raw_application_command_permissions_update(self, event: "RawGatewayEv
         command_id = to_snowflake(event.data["id"])
         application_id = to_snowflake(event.data["application_id"])
 
-        if guild := self.get_guild(guild_id):
+        if guild := self.cache.get_guild(guild_id):
             if guild.permissions:
                 if command_id not in guild.command_permissions:
                     guild.command_permissions[command_id] = CommandPermissions(

interactions/api/events/processors/integrations.py

@@ -13,7 +13,7 @@
 class VoiceEvents(EventMixinTemplate):
     @Processor.define()
     async def _on_raw_voice_state_update(self, event: "RawGatewayEvent") -> None:
-        if str(event.data["user_id"]) == str(self.user.id):
+        if str(event.data["user_id"]) == str(self._user.id):
             # User is the bot itself
             before = copy.copy(self.cache.get_bot_voice_state(event.data["guild_id"])) or None
             after = await self.cache.place_voice_state_data(event.data, update_cache=False)

interactions/api/events/processors/voice_events.py

@@ -110,3 +110,88 @@ async def delete_guild_emoji(
             Route("DELETE", "/guilds/{guild_id}/emojis/{emoji_id}", guild_id=guild_id, emoji_id=emoji_id),
             reason=reason,
         )
+
+    async def get_application_emojis(self, application_id: "Snowflake_Type") -> list[discord_typings.EmojiData]:
+        """
+        Fetch all emojis for this application
+
+        Args:
+            application_id: The id of the application
+
+        Returns:
+            List of emojis
+
+        """
+        result = await self.request(Route("GET", f"/applications/{application_id}/emojis"))
+        result = cast(dict, result)
+        return cast(list[discord_typings.EmojiData], result["items"])
+
+    async def get_application_emoji(
+        self, application_id: "Snowflake_Type", emoji_id: "Snowflake_Type"
+    ) -> discord_typings.EmojiData:
+        """
+        Fetch an emoji for this application
+
+        Args:
+            application_id: The id of the application
+            emoji_id: The id of the emoji
+
+        Returns:
+            Emoji object
+
+        """
+        result = await self.request(Route("GET", f"/applications/{application_id}/emojis/{emoji_id}"))
+        return cast(discord_typings.EmojiData, result)
+
+    async def create_application_emoji(
+        self, payload: dict, application_id: "Snowflake_Type", reason: str | None = None
+    ) -> discord_typings.EmojiData:
+        """
+        Create an emoji for this application
+
+        Args:
+            application_id: The id of the application
+            name: The name of the emoji
+            imagefile: The image file to use for the emoji
+
+        Returns:
+            Emoji object
+
+        """
+        result = await self.request(
+            Route("POST", f"/applications/{application_id}/emojis"), payload=payload, reason=reason
+        )
+        return cast(discord_typings.EmojiData, result)
+
+    async def edit_application_emoji(
+        self, application_id: "Snowflake_Type", emoji_id: "Snowflake_Type", name: str
+    ) -> discord_typings.EmojiData:
+        """
+        Edit an emoji for this application
+
+        Args:
+            application_id: The id of the application
+            emoji_id: The id of the emoji
+            name: The new name for the emoji
+
+        Returns:
+            Emoji object
+
+        """
+        result = await self.request(
+            Route("PATCH", f"/applications/{application_id}/emojis/{emoji_id}"), payload={"name": name}
+        )
+        return cast(discord_typings.EmojiData, result)
+
+    async def delete_application_emoji(
+        self, application_id: discord_typings.Snowflake, emoji_id: discord_typings.Snowflake
+    ) -> None:
+        """
+        Delete an emoji for this application
+
+        Args:
+            application_id: The id of the application
+            emoji_id: The id of the emoji
+
+        """
+        await self.request(Route("DELETE", f"/applications/{application_id}/emojis/{emoji_id}"))

interactions/api/http/http_requests/emojis.py

@@ -126,6 +126,7 @@ async def execute_webhook(
         payload: dict,
         wait: bool = False,
         thread_id: "Snowflake_Type" = None,
+        thread_name: Optional[str] = None,
         files: list["UPLOADABLE_TYPE"] | None = None,
     ) -> Optional[discord_typings.MessageData]:
         """
@@ -136,13 +137,16 @@ async def execute_webhook(
             webhook_token: The token for the webhook
             payload: The JSON payload for the message
             wait: Waits for server confirmation of message send before response
-            thread_id: Send a message to the specified thread
+            thread_id: Send a message to the specified thread. Note that this cannot be used with `thread_name`
+            thread_name: Create a thread with this name. Note that this is only valid for forum channel and cannot be used with `thread_id`
             files: The files to send with this message
 
         Returns:
             The sent `message`, if `wait` is True else None
 
         """
+        if thread_name is not None:
+            payload["thread_name"] = thread_name
         return await self.request(
             Route("POST", "/webhooks/{webhook_id}/{webhook_token}", webhook_id=webhook_id, webhook_token=webhook_token),
             params=dict_filter_none({"wait": "true" if wait else "false", "thread_id": thread_id}),

interactions/api/http/http_requests/webhooks.py

@@ -534,6 +534,16 @@ def guilds(self) -> List["Guild"]:
         """Returns a list of all guilds the bot is in."""
         return self.user.guilds
 
+    @property
+    def guild_count(self) -> int:
+        """
+        Returns the number of guilds the bot is in.
+
+        This function is faster than using `len(client.guilds)` as it does not require using the cache.
+        As such, this is preferred when you only need the count of guilds.
+        """
+        return self.user.guild_count
+
     @property
     def status(self) -> Status:
         """

interactions/client/client.py

@@ -642,7 +642,7 @@ def place_guild_data(self, data: discord_typings.GuildData) -> Guild:
 
         """
         guild_id = to_snowflake(data["id"])
-        guild: Guild = self.guild_cache.get(guild_id)
+        guild: Guild | None = self.guild_cache.get(guild_id)
         if guild is None:
             guild = Guild.from_dict(data, self._client)
             self.guild_cache[guild_id] = guild
@@ -914,7 +914,7 @@ def get_emoji(self, emoji_id: Optional["Snowflake_Type"]) -> Optional["CustomEmo
         """
         return self.emoji_cache.get(to_optional_snowflake(emoji_id)) if self.emoji_cache is not None else None
 
-    def place_emoji_data(self, guild_id: "Snowflake_Type", data: discord_typings.EmojiData) -> "CustomEmoji":
+    def place_emoji_data(self, guild_id: "Snowflake_Type | None", data: discord_typings.EmojiData) -> "CustomEmoji":
         """
         Take json data representing an emoji, process it, and cache it. This cache is disabled by default, start your bot with `Client(enable_emoji_cache=True)` to enable it.
 
@@ -929,7 +929,7 @@ def place_emoji_data(self, guild_id: "Snowflake_Type", data: discord_typings.Emo
         with suppress(KeyError):
             del data["guild_id"]  # discord sometimes packages a guild_id - this will cause an exception
 
-        emoji = CustomEmoji.from_dict(data, self._client, to_snowflake(guild_id))
+        emoji = CustomEmoji.from_dict(data, self._client, to_optional_snowflake(guild_id))
         if self.emoji_cache is not None:
             self.emoji_cache[emoji.id] = emoji
 

interactions/client/smart_cache.py

@@ -76,7 +76,7 @@ async def debug_info(self, ctx: InteractionContext) -> None:
 
         e.add_field("Loaded Exts", ", ".join(self.bot.ext))
 
-        e.add_field("Guilds", str(len(self.bot.guilds)))
+        e.add_field("Guilds", str(self.bot.guild_count))
 
         await ctx.send(embeds=[e])