Merge branch 'master' into appinf

Author: Paillat-dev

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: end-of-file-fixer
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/PyCQA/autoflake
-    rev: v2.3.1
+    rev: v2.3.2
     hooks:
       - id: autoflake
   #        args:

CHANGELOG.md

@@ -14,19 +14,39 @@ These changes are available on the `master` branch, but have not yet been releas
 
 - Added `Member.colours` and `Member.colors` properties.
   ([#3063](https://github.com/Pycord-Development/pycord/pull/3063))
+- Added the ability to respond to interactions with suppressed push and desktop
+  notifications. ([#3062](https://github.com/Pycord-Development/pycord/pull/3062))
+- Added `User.collectibles` property.
+  ([#3107](https://github.com/Pycord-Development/pycord/pull/3107))
+- Added the ability to compare instances of `Nameplate`.
+  ([#3107](https://github.com/Pycord-Development/pycord/pull/3107))
+- Added `Member.display_avatar_decoration` and `Member.guild_avatar_decoration`.
+  ([#3109](https://github.com/Pycord-Development/pycord/pull/3109))
 
 ### Changed
 
 - Changed `Member.colour` and `Member.color` to be aliases for `Member.colours.primary`.
   ([#3063](https://github.com/Pycord-Development/pycord/pull/3063))
+- Changed `User.nameplate` to be an alias for `User.collectibles.nameplate`.
+  ([#3107](https://github.com/Pycord-Development/pycord/pull/3107))
+- Changed `FileComponent.name` and `FileComponent.size` to be optional.
+  ([#3115](https://github.com/Pycord-Development/pycord/pull/3115))
 
 ### Fixed
 
 - Fixed some `Item` attributes not being set correctly.
   ([#3102](https://github.com/Pycord-Development/pycord/pull/3102))
+- Fixed use of deprecated `float` type for `timeout=...` in `ws_connect()`.
+  ([#3105](https://github.com/Pycord-Development/pycord/pull/3105))
+- Fixed the update of a user's `avatar_decoration` to now cause an `on_user_update`
+  event to fire. ([#3103](https://github.com/Pycord-Development/pycord/pull/3103))
 
 ### Deprecated
 
+- Deprecated the `suppress` parameter in all applicable message-related methods in favor
+  of `suppress_embeds`.
+  ([#3062](https://github.com/Pycord-Development/pycord/pull/3062))
+
 ### Removed
 
 - Removed the guild creation and ownership-related methods and arguments due to updated
@@ -42,9 +62,14 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#3055](https://github.com/Pycord-Development/pycord/pull/3055))
 - Added the ability to compare instances of `PrimaryGuild`.
   ([#3077](https://github.com/Pycord-Development/pycord/pull/3077))
+- Added `cache_default_sounds` parameter to `Client` and its subclasses.
+  ([#3113](https://github.com/Pycord-Development/pycord/pull/3113))
 
 ### Changed
 
+- Migrated away from `utils.deprecated` in favor of `warnings.deprecated`. Added type
+  checker warnings support for function deprecations.
+  ([#3042](https://github.com/Pycord-Development/pycord/pull/3042))
 - Updated `Role.is_assignable()` to also check whether the bot has the `MANAGE_ROLES`
   permission. ([#3048](https://github.com/Pycord-Development/pycord/pull/3048))
 - Updated the docs' Sphinx version to v9.

discord/_version.py

@@ -30,14 +30,12 @@
 import warnings
 from importlib.metadata import PackageNotFoundError, version
 
-from typing_extensions import TypedDict
+from typing_extensions import TypedDict, deprecated
 
 __all__ = ("__version__", "VersionInfo", "version_info")
 
 from typing import Literal, NamedTuple
 
-from .utils import deprecated
-
 try:
     __version__ = version("py-cord")
 except PackageNotFoundError:
@@ -84,27 +82,37 @@ def advanced(self, value: object) -> None:
         _advanced = value
 
     @property
-    @deprecated("releaselevel", "2.4")
+    @deprecated(
+        "VersionInfo.release_level is deprecated since version 2.4, consider using releaselevel instead."
+    )
     def release_level(self) -> Literal["alpha", "beta", "candidate", "final"]:
         return self.releaselevel
 
     @property
-    @deprecated('.advanced["serial"]', "2.4")
+    @deprecated(
+        'VersionInfo.serial is deprecated since version 2.4, consider using .advanced["serial"] instead.'
+    )
     def serial(self) -> int:
         return self.advanced["serial"]
 
     @property
-    @deprecated('.advanced["build"]', "2.4")
+    @deprecated(
+        'VersionInfo.build is deprecated since version 2.4, consider using .advanced["build"] instead.'
+    )
     def build(self) -> int | None:
         return self.advanced["build"]
 
     @property
-    @deprecated('.advanced["commit"]', "2.4")
+    @deprecated(
+        'VersionInfo.commit is deprecated since version 2.4, consider using .advanced["commit"] instead.'
+    )
     def commit(self) -> str | None:
         return self.advanced["commit"]
 
     @property
-    @deprecated('.advanced["date"]', "2.4")
+    @deprecated(
+        'VersionInfo.date is deprecated since version 2.4, consider using .advanced["date"] instead.'
+    )
     def date(self) -> datetime.date | None:
         return self.advanced["date"]
 

discord/abc.py

@@ -55,6 +55,7 @@
 from .role import Role
 from .scheduled_events import ScheduledEvent
 from .sticker import GuildSticker, StickerItem
+from .utils import warn_deprecated
 from .voice_client import VoiceClient, VoiceProtocol
 
 __all__ = (
@@ -1358,6 +1359,7 @@ async def send(
         view: BaseView = ...,
         poll: Poll = ...,
         suppress: bool = ...,
+        suppress_embeds: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
 
@@ -1379,6 +1381,7 @@ async def send(
         view: BaseView = ...,
         poll: Poll = ...,
         suppress: bool = ...,
+        suppress_embeds: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
 
@@ -1400,6 +1403,7 @@ async def send(
         view: BaseView = ...,
         poll: Poll = ...,
         suppress: bool = ...,
+        suppress_embeds: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
 
@@ -1421,6 +1425,7 @@ async def send(
         view: BaseView = ...,
         poll: Poll = ...,
         suppress: bool = ...,
+        suppress_embeds: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
 
@@ -1443,6 +1448,7 @@ async def send(
         view=None,
         poll=None,
         suppress=None,
+        suppress_embeds=None,
         silent=None,
     ):
         """|coro|
@@ -1521,6 +1527,12 @@ async def send(
             .. versionadded:: 2.0
         suppress: :class:`bool`
             Whether to suppress embeds for the message.
+
+            .. deprecated:: 2.8
+        suppress_embeds: :class:`bool`
+            Whether to suppress embeds for the message.
+
+            .. versionadded:: 2.8
         silent: :class:`bool`
             Whether to suppress push and desktop notifications for the message.
 
@@ -1568,8 +1580,13 @@ async def send(
                 )
             embeds = [embed.to_dict() for embed in embeds]
 
+        if suppress is not None:
+            warn_deprecated("suppress", "suppress_embeds", "2.8")
+            if suppress_embeds is None:
+                suppress_embeds = suppress
+
         flags = MessageFlags(
-            suppress_embeds=bool(suppress),
+            suppress_embeds=bool(suppress_embeds),
             suppress_notifications=bool(silent),
         )
 

discord/channel.py

@@ -38,6 +38,8 @@
     overload,
 )
 
+from typing_extensions import deprecated
+
 import discord.abc
 
 from . import utils
@@ -3118,21 +3120,17 @@ async def create_forum_channel(self, name: str, **options: Any) -> ForumChannel:
         """
         return await self.guild.create_forum_channel(name, category=self, **options)
 
-    @utils.deprecated(
-        since="2.7",
-        removed="3.0",
-        reference="NSFW categories are not available in the Discord API.",
+    @deprecated(
+        "CategoryChannel.is_nsfw is deprecated since version 2.7 and will be removed in version 3.0. NSFW categories are not available in the Discord API."
     )
     def is_nsfw(self) -> bool:
         return False
 
     # TODO: Remove in 3.0
 
     @property
-    @utils.deprecated(
-        since="2.7",
-        removed="3.0",
-        reference="NSFW categories are not available in the Discord API.",
+    @deprecated(
+        "CategoryChannel.nsfw is deprecated since version 2.7 and will be removed in version 3.0. NSFW categories are not available in the Discord API."
     )
     def nsfw(self) -> bool:
         return False

discord/client.py

@@ -42,6 +42,7 @@
 )
 
 import aiohttp
+from typing_extensions import deprecated
 
 from . import utils
 from .activity import ActivityTypes, BaseActivity, create_activity
@@ -224,6 +225,10 @@ class Client:
             run :func:`fetch_emojis`.
 
         .. versionadded:: 2.7
+    cache_default_sounds: :class:`bool`
+        Whether to automatically fetch and cache the default soundboard sounds on startup. Defaults to ``True``.
+
+        .. versionadded:: 2.8
 
     Attributes
     -----------
@@ -1176,10 +1181,8 @@ def get_all_members(self) -> Generator[Member]:
         for guild in self.guilds:
             yield from guild.members
 
-    @utils.deprecated(
-        instead="Client.get_or_fetch(User, id)",
-        since="2.7",
-        removed="3.0",
+    @deprecated(
+        "Client.get_or_fetch_user is deprecated since version 2.7 and will be removed in version 3.0, consider using Client.get_or_fetch(User, id) instead."
     )
     async def get_or_fetch_user(self, id: int, /) -> User | None:  # TODO: Remove in 3.0
         """|coro|

discord/collectibles.py

@@ -25,18 +25,72 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+from .asset import Asset
+from .types.collectibles import Collectibles as CollectiblesPayload
+from .types.collectibles import Nameplate as NameplatePayload
+
 if TYPE_CHECKING:
     from .state import ConnectionState
 
-from .asset import Asset
-from .types.collectibles import Nameplate as NameplatePayload
+__all__ = (
+    "Collectibles",
+    "Nameplate",
+)
+
+
+class Collectibles:
+    """
+    Represents a user or member's equipped collectibles.
+
+    .. versionadded:: 2.8
+
+    .. container:: operations
+
+        .. describe:: x == y
+
+            Checks if two sets of collectibles are equal.
+
+        .. describe:: x != y
+
+            Checks if two sets of collectibles are not equal.
+
+    Attributes
+    ----------
+    nameplate: :class:`Nameplate`
+        The user's nameplate.
+    """
+
+    def __init__(self, data: CollectiblesPayload, state: "ConnectionState") -> None:
+        if nameplate_data := data.get("nameplate"):
+            self.nameplate = Nameplate(data=nameplate_data, state=state)
+        else:
+            self.nameplate = None
+        self._state = state
+
+    def __repr__(self) -> str:
+        return f"<Collectibles nameplate={self.nameplate}>"
+
+    def __eq__(self, other: object) -> bool:
+        return isinstance(other, Collectibles) and self.nameplate == other.nameplate
 
 
 class Nameplate:
     """
     Represents a Discord Nameplate.
 
     .. versionadded:: 2.7
+    .. versionchanged:: 2.8
+        Nameplates are now comparable.
+
+    .. container:: operations
+
+        .. describe:: x == y
+
+            Checks if two nameplates are equal.
+
+        .. describe:: x != y
+
+            Checks if two nameplates are not equal.
 
     Attributes
     ----------
@@ -56,6 +110,13 @@ def __init__(self, data: NameplatePayload, state: "ConnectionState") -> None:
     def __repr__(self) -> str:
         return f"<Nameplate sku_id={self.sku_id} palette={self.palette}>"
 
+    def __eq__(self, other: object) -> bool:
+        return (
+            isinstance(other, Nameplate)
+            and self.sku_id == other.sku_id
+            and self.palette == other.palette
+        )
+
     @cached_property
     def static_asset(self) -> Asset:
         """
@@ -73,6 +134,3 @@ def animated_asset(self) -> Asset:
         .. versionadded:: 2.7
         """
         return Asset._from_collectible(self._state, self._asset, animated=True)
-
-
-__all__ = ("Nameplate",)

discord/commands/context.py

@@ -294,6 +294,8 @@ async def respond(
         files: list[File] | None = None,
         poll: Poll | None = None,
         delete_after: float | None = None,
+        silent: bool = False,
+        suppress_embeds: bool = False,
     ) -> Interaction | WebhookMessage: ...
 
     @overload
@@ -309,6 +311,8 @@ async def respond(
         files: list[File] | None = None,
         poll: Poll | None = None,
         delete_after: float | None = None,
+        silent: bool = False,
+        suppress_embeds: bool = False,
     ) -> Interaction | WebhookMessage: ...
 
     @discord.utils.copy_doc(Interaction.respond)