Merge branch 'master' into channel

Author: Lumabots

.pre-commit-config.yaml

@@ -87,7 +87,7 @@ repos:
         args: [--prose-wrap=always, --print-width=88]
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/DanielNoord/pydocstringformatter
-    rev: v0.7.3
+    rev: v0.7.5
     hooks:
       - id: pydocstringformatter
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -154,8 +154,8 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Removed
 
-- Removed deprecated support for `Option` in `BridgeCommand`. Use `BridgeOption`
-  instead. ([#2731])(https://github.com/Pycord-Development/pycord/pull/2731))
+- Removed deprecated support for `Option` in `BridgeCommand`, use `BridgeOption`
+  instead. ([#2731](https://github.com/Pycord-Development/pycord/pull/2731))
 
 ## [2.6.1] - 2024-09-15
 

discord/abc.py

@@ -1615,6 +1615,12 @@ async def send(
                 )
 
             components = view.to_components()
+            if view.is_components_v2():
+                if embeds or content:
+                    raise TypeError(
+                        "cannot send embeds or content with a view using v2 component logic"
+                    )
+                flags.is_components_v2 = True
         else:
             components = None
 
@@ -1679,8 +1685,10 @@ async def send(
 
         ret = state.create_message(channel=channel, data=data)
         if view:
-            state.store_view(view, ret.id)
+            if view.is_dispatchable():
+                state.store_view(view, ret.id)
             view.message = ret
+            view.refresh(ret.components)
 
         if delete_after is not None:
             await ret.delete(delay=delete_after)

discord/bot.py

@@ -884,15 +884,15 @@ async def process_application_commands(
 
         ctx = await self.get_application_context(interaction)
         if command:
-            ctx.command = command
+            interaction.command = command
         await self.invoke_application_command(ctx)
 
     async def on_application_command_auto_complete(
         self, interaction: Interaction, command: ApplicationCommand
     ) -> None:
         async def callback() -> None:
             ctx = await self.get_autocomplete_context(interaction)
-            ctx.command = command
+            interaction.command = command
             return await command.invoke_autocomplete_callback(ctx)
 
         autocomplete_task = self._bot.loop.create_task(callback())

discord/channel.py

@@ -26,7 +26,16 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Mapping, TypeVar, overload
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Iterable,
+    Mapping,
+    Sequence,
+    TypeVar,
+    overload,
+)
 
 import discord.abc
 
@@ -45,7 +54,7 @@
 )
 from .errors import ClientException, InvalidArgument
 from .file import File
-from .flags import ChannelFlags
+from .flags import ChannelFlags, MessageFlags
 from .invite import Invite
 from .iterators import ArchivedThreadIterator
 from .mixins import Hashable
@@ -71,12 +80,15 @@
 
 if TYPE_CHECKING:
     from .abc import Snowflake, SnowflakeTime
+    from .embeds import Embed
     from .guild import Guild
     from .guild import GuildChannel as GuildChannelType
     from .member import Member, VoiceState
+    from .mentions import AllowedMentions
     from .message import EmojiInputType, Message, PartialMessage
     from .role import Role
     from .state import ConnectionState
+    from .sticker import GuildSticker, StickerItem
     from .types.channel import CategoryChannel as CategoryChannelPayload
     from .types.channel import DMChannel as DMChannelPayload
     from .types.channel import ForumChannel as ForumChannelPayload
@@ -87,6 +99,7 @@
     from .types.channel import VoiceChannel as VoiceChannelPayload
     from .types.snowflake import SnowflakeList
     from .types.threads import ThreadArchiveDuration
+    from .ui.view import View
     from .user import BaseUser, ClientUser, User
     from .webhook import Webhook
 
@@ -1183,18 +1196,20 @@ async def edit(self, *, reason=None, **options):
     async def create_thread(
         self,
         name: str,
-        content=None,
+        content: str | None = None,
         *,
-        embed=None,
-        embeds=None,
-        file=None,
-        files=None,
-        stickers=None,
-        delete_message_after=None,
-        nonce=None,
-        allowed_mentions=None,
-        view=None,
-        applied_tags=None,
+        embed: Embed | None = None,
+        embeds: list[Embed] | None = None,
+        file: File | None = None,
+        files: list[File] | None = None,
+        stickers: Sequence[GuildSticker | StickerItem] | None = None,
+        delete_message_after: float | None = None,
+        nonce: int | str | None = None,
+        allowed_mentions: AllowedMentions | None = None,
+        view: View | None = None,
+        applied_tags: list[ForumTag] | None = None,
+        suppress: bool = False,
+        silent: bool = False,
         auto_archive_duration: ThreadArchiveDuration = MISSING,
         slowmode_delay: int = MISSING,
         reason: str | None = None,
@@ -1294,13 +1309,24 @@ async def create_thread(
         else:
             allowed_mentions = allowed_mentions.to_dict()
 
+        flags = MessageFlags(
+            suppress_embeds=bool(suppress),
+            suppress_notifications=bool(silent),
+        )
+
         if view:
             if not hasattr(view, "__discord_ui_view__"):
                 raise InvalidArgument(
                     f"view parameter must be View not {view.__class__!r}"
                 )
 
             components = view.to_components()
+            if view.is_components_v2():
+                if embeds or content:
+                    raise TypeError(
+                        "cannot send embeds or content with a view using v2 component logic"
+                    )
+                flags.is_components_v2 = True
         else:
             components = None
 
@@ -1339,6 +1365,7 @@ async def create_thread(
                 or self.default_auto_archive_duration,
                 rate_limit_per_user=slowmode_delay or self.slowmode_delay,
                 applied_tags=applied_tags,
+                flags=flags.value,
                 reason=reason,
             )
         finally:
@@ -1348,7 +1375,7 @@ async def create_thread(
 
         ret = Thread(guild=self.guild, state=self._state, data=data)
         msg = ret.get_partial_message(int(data["last_message_id"]))
-        if view:
+        if view and view.is_dispatchable():
             state.store_view(view, msg.id)
 
         if delete_message_after is not None:

discord/client.py

@@ -68,9 +68,11 @@
 if TYPE_CHECKING:
     from .abc import GuildChannel, PrivateChannel, Snowflake, SnowflakeTime
     from .channel import DMChannel
+    from .interaction import Interaction
     from .member import Member
     from .message import Message
     from .poll import Poll
+    from .ui.item import Item
     from .voice_client import VoiceProtocol
 
 __all__ = ("Client",)
@@ -541,6 +543,38 @@ async def on_error(self, event_method: str, *args: Any, **kwargs: Any) -> None:
         print(f"Ignoring exception in {event_method}", file=sys.stderr)
         traceback.print_exc()
 
+    async def on_view_error(
+        self, error: Exception, item: Item, interaction: Interaction
+    ) -> None:
+        """|coro|
+
+        The default view error handler provided by the client.
+
+        This only fires for a view if you did not define its :func:`~discord.ui.View.on_error`.
+        """
+
+        print(
+            f"Ignoring exception in view {interaction.view} for item {item}:",
+            file=sys.stderr,
+        )
+        traceback.print_exception(
+            error.__class__, error, error.__traceback__, file=sys.stderr
+        )
+
+    async def on_modal_error(self, error: Exception, interaction: Interaction) -> None:
+        """|coro|
+
+        The default modal error handler provided by the client.
+        The default implementation prints the traceback to stderr.
+
+        This only fires for a modal if you did not define its :func:`~discord.ui.Modal.on_error`.
+        """
+
+        print(f"Ignoring exception in modal {interaction.modal}:", file=sys.stderr)
+        traceback.print_exception(
+            error.__class__, error, error.__traceback__, file=sys.stderr
+        )
+
     # hooks
 
     async def _call_before_identify_hook(

discord/commands/context.py

@@ -80,16 +80,13 @@ class ApplicationContext(discord.abc.Messageable):
         The bot that the command belongs to.
     interaction: :class:`.Interaction`
         The interaction object that invoked the command.
-    command: :class:`.ApplicationCommand`
-        The command that this context belongs to.
     """
 
     def __init__(self, bot: Bot, interaction: Interaction):
         self.bot = bot
         self.interaction = interaction
 
         # below attributes will be set after initialization
-        self.command: ApplicationCommand = None  # type: ignore
         self.focused: Option = None  # type: ignore
         self.value: str = None  # type: ignore
         self.options: dict = None  # type: ignore
@@ -136,6 +133,15 @@ async def invoke(
         """
         return await command(self, *args, **kwargs)
 
+    @property
+    def command(self) -> ApplicationCommand | None:
+        """The command that this context belongs to."""
+        return self.interaction.command
+
+    @command.setter
+    def command(self, value: ApplicationCommand | None) -> None:
+        self.interaction.command = value
+
     @cached_property
     def channel(self) -> InteractionChannel | None:
         """Union[:class:`abc.GuildChannel`, :class:`PartialMessageable`, :class:`Thread`]:
@@ -393,8 +399,6 @@ class AutocompleteContext:
         The bot that the command belongs to.
     interaction: :class:`.Interaction`
         The interaction object that invoked the autocomplete.
-    command: :class:`.ApplicationCommand`
-        The command that this context belongs to.
     focused: :class:`.Option`
         The option the user is currently typing.
     value: :class:`.str`
@@ -403,13 +407,12 @@ class AutocompleteContext:
         A name to value mapping of the options that the user has selected before this option.
     """
 
-    __slots__ = ("bot", "interaction", "command", "focused", "value", "options")
+    __slots__ = ("bot", "interaction", "focused", "value", "options")
 
     def __init__(self, bot: Bot, interaction: Interaction):
         self.bot = bot
         self.interaction = interaction
 
-        self.command: ApplicationCommand = None  # type: ignore
         self.focused: Option = None  # type: ignore
         self.value: str = None  # type: ignore
         self.options: dict = None  # type: ignore
@@ -423,3 +426,12 @@ def cog(self) -> Cog | None:
             return None
 
         return self.command.cog
+
+    @property
+    def command(self) -> ApplicationCommand | None:
+        """The command that this context belongs to."""
+        return self.interaction.command
+
+    @command.setter
+    def command(self, value: ApplicationCommand | None) -> None:
+        self.interaction.command = value