Merge branch 'feat/components-v2' of https://github.com/DA-344/d.py into akiko

Author: Soheab

discord/abc.py

@@ -1678,7 +1678,7 @@ async def send(
             data = await state.http.send_message(channel.id, params=params)
 
         ret = state.create_message(channel=channel, data=data)
-        if view and not view.is_finished():
+        if view and not view.is_finished() and view.is_dispatchable():
             state.store_view(view, ret.id)
 
         if poll:

discord/activity.py

@@ -418,7 +418,7 @@ def __str__(self) -> str:
         return str(self.name)
 
     def __repr__(self) -> str:
-        return f'<Game name={self.name!r}>'
+        return f'<Game name={self.name!r} platform={self.platform!r}>'
 
     def to_dict(self) -> Dict[str, Any]:
         timestamps: Dict[str, Any] = {}
@@ -514,7 +514,7 @@ def __str__(self) -> str:
         return str(self.name)
 
     def __repr__(self) -> str:
-        return f'<Streaming name={self.name!r}>'
+        return f'<Streaming name={self.name!r} platform={self.platform!r}>'
 
     @property
     def twitch_name(self) -> Optional[str]:

discord/app_commands/installs.py

@@ -57,6 +57,9 @@ def __init__(self, *, guild: Optional[bool] = None, user: Optional[bool] = None)
         self._guild: Optional[bool] = guild
         self._user: Optional[bool] = user
 
+    def __repr__(self):
+        return f'<AppInstallationType guild={self.guild!r} user={self.user!r}>'
+
     @property
     def guild(self) -> bool:
         """:class:`bool`: Whether the integration is a guild install."""
@@ -142,6 +145,9 @@ def __init__(
         self._dm_channel: Optional[bool] = dm_channel
         self._private_channel: Optional[bool] = private_channel
 
+    def __repr__(self) -> str:
+        return f'<AppCommandContext guild={self.guild!r} dm_channel={self.dm_channel!r} private_channel={self.private_channel!r}>'
+
     @property
     def guild(self) -> bool:
         """:class:`bool`: Whether the context allows usage in a guild."""

discord/app_commands/models.py

@@ -1063,6 +1063,9 @@ def __init__(self, *, data: ApplicationCommandPermissions, guild: Guild, state:
 
         self.target: Union[Object, User, Member, Role, AllChannels, GuildChannel] = _object
 
+    def __repr__(self) -> str:
+        return f'<AppCommandPermissions id={self.id} type={self.type!r} guild={self.guild!r} permission={self.permission}>'
+
     def to_dict(self) -> ApplicationCommandPermissions:
         return {
             'id': self.target.id,
@@ -1106,6 +1109,9 @@ def __init__(self, *, data: GuildApplicationCommandPermissions, state: Connectio
             AppCommandPermissions(data=value, guild=guild, state=self._state) for value in data['permissions']
         ]
 
+    def __repr__(self) -> str:
+        return f'<GuildAppCommandPermissions id={self.id!r} guild_id={self.guild_id!r} permissions={self.permissions!r}>'
+
     def to_dict(self) -> Dict[str, Any]:
         return {'permissions': [p.to_dict() for p in self.permissions]}
 

discord/app_commands/transformers.py

@@ -52,7 +52,7 @@
 from ..abc import GuildChannel
 from ..threads import Thread
 from ..enums import Enum as InternalEnum, AppCommandOptionType, ChannelType, Locale
-from ..utils import MISSING, maybe_coroutine
+from ..utils import MISSING, maybe_coroutine, _human_join
 from ..user import User
 from ..role import Role
 from ..member import Member
@@ -631,7 +631,7 @@ def __init__(self, *channel_types: Type[Any]) -> None:
             display_name = channel_types[0].__name__
             types = CHANNEL_TO_TYPES[channel_types[0]]
         else:
-            display_name = '{}, and {}'.format(', '.join(t.__name__ for t in channel_types[:-1]), channel_types[-1].__name__)
+            display_name = _human_join([t.__name__ for t in channel_types])
             types = []
 
             for t in channel_types:
@@ -689,6 +689,7 @@ async def transform(self, interaction: Interaction[ClientT], value: Any, /):
         ChannelType.news,
         ChannelType.category,
         ChannelType.forum,
+        ChannelType.media,
     ],
     GuildChannel: [
         ChannelType.stage_voice,
@@ -697,14 +698,15 @@ async def transform(self, interaction: Interaction[ClientT], value: Any, /):
         ChannelType.news,
         ChannelType.category,
         ChannelType.forum,
+        ChannelType.media,
     ],
     AppCommandThread: [ChannelType.news_thread, ChannelType.private_thread, ChannelType.public_thread],
     Thread: [ChannelType.news_thread, ChannelType.private_thread, ChannelType.public_thread],
     StageChannel: [ChannelType.stage_voice],
     VoiceChannel: [ChannelType.voice],
     TextChannel: [ChannelType.text, ChannelType.news],
     CategoryChannel: [ChannelType.category],
-    ForumChannel: [ChannelType.forum],
+    ForumChannel: [ChannelType.forum, ChannelType.media],
 }
 
 BUILT_IN_TRANSFORMERS: Dict[Any, Transformer] = {

discord/channel.py

@@ -2852,6 +2852,7 @@ async def create_thread(
         files: Sequence[File] = ...,
         allowed_mentions: AllowedMentions = ...,
         mention_author: bool = ...,
+        applied_tags: Sequence[ForumTag] = ...,
         view: LayoutView,
         suppress_embeds: bool = ...,
         reason: Optional[str] = ...,
@@ -3026,7 +3027,7 @@ async def create_thread(
             data = await state.http.start_thread_in_forum(self.id, params=params, reason=reason)
             thread = Thread(guild=self.guild, state=self._state, data=data)
             message = Message(state=self._state, channel=thread, data=data['message'])
-            if view and not view.is_finished():
+            if view and not view.is_finished() and view.is_dispatchable():
                 self._state.store_view(view, message.id)
 
             return ThreadWithMessage(thread=thread, message=message)

discord/client.py

@@ -67,7 +67,7 @@
 from .http import HTTPClient
 from .state import ConnectionState
 from . import utils
-from .utils import MISSING, time_snowflake
+from .utils import MISSING, time_snowflake, deprecated
 from .object import Object
 from .backoff import ExponentialBackoff
 from .webhook import Webhook
@@ -2393,6 +2393,7 @@ async def fetch_guild_preview(self, guild_id: int) -> GuildPreview:
         data = await self.http.get_guild_preview(guild_id)
         return GuildPreview(data=data, state=self._connection)
 
+    @deprecated()
     async def create_guild(
         self,
         *,
@@ -2413,6 +2414,9 @@ async def create_guild(
             This function will now raise :exc:`ValueError` instead of
             ``InvalidArgument``.
 
+        .. deprecated:: 2.6
+            This function is deprecated and will be removed in a future version.
+
         Parameters
         ----------
         name: :class:`str`

discord/colour.py

@@ -21,6 +21,7 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
+
 from __future__ import annotations
 
 import colorsys
@@ -457,20 +458,59 @@ def greyple(cls) -> Self:
         """
         return cls(0x99AAB5)
 
+    @classmethod
+    def ash_theme(cls) -> Self:
+        """A factory method that returns a :class:`Colour` with a value of ``0x2E2E34``.
+
+        This will appear transparent on Discord's ash theme.
+
+        .. colour:: #2E2E34
+
+        .. versionadded:: 2.6
+        """
+        return cls(0x2E2E34)
+
     @classmethod
     def dark_theme(cls) -> Self:
-        """A factory method that returns a :class:`Colour` with a value of ``0x313338``.
+        """A factory method that returns a :class:`Colour` with a value of ``0x1A1A1E``.
 
         This will appear transparent on Discord's dark theme.
 
-        .. colour:: #313338
+        .. colour:: #1A1A1E
 
         .. versionadded:: 1.5
 
         .. versionchanged:: 2.2
             Updated colour from previous ``0x36393F`` to reflect discord theme changes.
+
+        .. versionchanged:: 2.6
+            Updated colour from previous ``0x313338`` to reflect discord theme changes.
         """
-        return cls(0x313338)
+        return cls(0x1A1A1E)
+
+    @classmethod
+    def onyx_theme(cls) -> Self:
+        """A factory method that returns a :class:`Colour` with a value of ``0x070709``.
+
+        This will appear transparent on Discord's onyx theme.
+
+        .. colour:: #070709
+
+        .. versionadded:: 2.6
+        """
+        return cls(0x070709)
+
+    @classmethod
+    def light_theme(cls) -> Self:
+        """A factory method that returns a :class:`Colour` with a value of ``0xFBFBFB``.
+
+        This will appear transparent on Discord's light theme.
+
+        .. colour:: #FBFBFB
+
+        .. versionadded:: 2.6
+        """
+        return cls(0xFBFBFB)
 
     @classmethod
     def fuchsia(cls) -> Self:
@@ -492,25 +532,52 @@ def yellow(cls) -> Self:
         """
         return cls(0xFEE75C)
 
+    @classmethod
+    def ash_embed(cls) -> Self:
+        """A factory method that returns a :class:`Colour` with a value of ``0x37373E``.
+
+        .. colour:: #37373E
+
+        .. versionadded:: 2.6
+
+        """
+        return cls(0x37373E)
+
     @classmethod
     def dark_embed(cls) -> Self:
-        """A factory method that returns a :class:`Colour` with a value of ``0x2B2D31``.
+        """A factory method that returns a :class:`Colour` with a value of ``0x242429``.
 
-        .. colour:: #2B2D31
+        .. colour:: #242429
 
         .. versionadded:: 2.2
+
+        .. versionchanged:: 2.6
+            Updated colour from previous ``0x2B2D31`` to reflect discord theme changes.
+        """
+        return cls(0x242429)
+
+    @classmethod
+    def onyx_embed(cls) -> Self:
+        """A factory method that returns a :class:`Colour` with a value of ``0x131416``.
+
+        .. colour:: #131416
+
+        .. versionadded:: 2.6
         """
-        return cls(0x2B2D31)
+        return cls(0x131416)
 
     @classmethod
     def light_embed(cls) -> Self:
-        """A factory method that returns a :class:`Colour` with a value of ``0xEEEFF1``.
+        """A factory method that returns a :class:`Colour` with a value of ``0xFFFFFF``.
 
         .. colour:: #EEEFF1
 
         .. versionadded:: 2.2
+
+        .. versionchanged:: 2.6
+            Updated colour from previous ``0xEEEFF1`` to reflect discord theme changes.
         """
-        return cls(0xEEEFF1)
+        return cls(0xFFFFFF)
 
     @classmethod
     def pink(cls) -> Self: