Merge branch 'master' of https://github.com/Rapptz/discord.py into v2-martine

Author: PredaaA

Diff for: discord/embeds.py

@@ -46,7 +46,7 @@ def __len__(self) -> int:
         return len(self.__dict__)
 
     def __repr__(self) -> str:
-        inner = ', '.join((f'{k}={v!r}' for k, v in self.__dict__.items() if not k.startswith('_')))
+        inner = ', '.join((f'{k}={getattr(self, k)!r}' for k in dir(self) if not k.startswith('_')))
         return f'EmbedProxy({inner})'
 
     def __getattr__(self, attr: str) -> None:
@@ -56,6 +56,16 @@ def __eq__(self, other: object) -> bool:
         return isinstance(other, EmbedProxy) and self.__dict__ == other.__dict__
 
 
+class EmbedMediaProxy(EmbedProxy):
+    def __init__(self, layer: Dict[str, Any]):
+        super().__init__(layer)
+        self._flags = self.__dict__.pop('flags', 0)
+
+    @property
+    def flags(self) -> AttachmentFlags:
+        return AttachmentFlags._from_value(self._flags or 0)
+
+
 if TYPE_CHECKING:
     from typing_extensions import Self
 
@@ -77,12 +87,7 @@ class _EmbedMediaProxy(Protocol):
         proxy_url: Optional[str]
         height: Optional[int]
         width: Optional[int]
-        flags: Optional[AttachmentFlags]
-
-    class _EmbedVideoProxy(Protocol):
-        url: Optional[str]
-        height: Optional[int]
-        width: Optional[int]
+        flags: AttachmentFlags
 
     class _EmbedProviderProxy(Protocol):
         name: Optional[str]
@@ -148,10 +153,6 @@ class Embed:
     colour: Optional[Union[:class:`Colour`, :class:`int`]]
         The colour code of the embed. Aliased to ``color`` as well.
         This can be set during initialisation.
-    flags: Optional[:class:`EmbedFlags`]
-        The flags of this embed.
-
-        .. versionadded:: 2.5
     """
 
     __slots__ = (
@@ -168,7 +169,7 @@ class Embed:
         '_author',
         '_fields',
         'description',
-        'flags',
+        '_flags',
     )
 
     def __init__(
@@ -188,7 +189,7 @@ def __init__(
         self.type: EmbedType = type
         self.url: Optional[str] = url
         self.description: Optional[str] = description
-        self.flags: Optional[EmbedFlags] = None
+        self._flags: int = 0
 
         if self.title is not None:
             self.title = str(self.title)
@@ -223,6 +224,7 @@ def from_dict(cls, data: Mapping[str, Any]) -> Self:
         self.type = data.get('type', None)
         self.description = data.get('description', None)
         self.url = data.get('url', None)
+        self._flags = data.get('flags', 0)
 
         if self.title is not None:
             self.title = str(self.title)
@@ -253,11 +255,6 @@ def from_dict(cls, data: Mapping[str, Any]) -> Self:
             else:
                 setattr(self, '_' + attr, value)
 
-        try:
-            self.flags = EmbedFlags._from_value(data['flags'])
-        except KeyError:
-            pass
-
         return self
 
     def copy(self) -> Self:
@@ -318,8 +315,17 @@ def __eq__(self, other: Embed) -> bool:
             and self.image == other.image
             and self.provider == other.provider
             and self.video == other.video
+            and self._flags == other._flags
         )
 
+    @property
+    def flags(self) -> EmbedFlags:
+        """:class:`EmbedFlags`: The flags of this embed.
+
+        .. versionadded:: 2.5
+        """
+        return EmbedFlags._from_value(self._flags or 0)
+
     @property
     def colour(self) -> Optional[Colour]:
         return getattr(self, '_colour', None)
@@ -408,19 +414,16 @@ def image(self) -> _EmbedMediaProxy:
 
         Possible attributes you can access are:
 
-        - ``url``
-        - ``proxy_url``
-        - ``width``
-        - ``height``
-        - ``flags``
+        - ``url`` for the image URL.
+        - ``proxy_url`` for the proxied image URL.
+        - ``width`` for the image width.
+        - ``height`` for the image height.
+        - ``flags`` for the image's attachment flags.
 
         If the attribute has no value then ``None`` is returned.
         """
         # Lying to the type checker for better developer UX.
-        data = getattr(self, '_image', {})
-        if 'flags' in data:
-            data['flags'] = AttachmentFlags._from_value(data['flags'])
-        return EmbedProxy(data)  # type: ignore
+        return EmbedMediaProxy(getattr(self, '_image', {}))  # type: ignore
 
     def set_image(self, *, url: Optional[Any]) -> Self:
         """Sets the image for the embed content.
@@ -454,15 +457,16 @@ def thumbnail(self) -> _EmbedMediaProxy:
 
         Possible attributes you can access are:
 
-        - ``url``
-        - ``proxy_url``
-        - ``width``
-        - ``height``
+        - ``url`` for the thumbnail URL.
+        - ``proxy_url`` for the proxied thumbnail URL.
+        - ``width`` for the thumbnail width.
+        - ``height`` for the thumbnail height.
+        - ``flags`` for the thumbnail's attachment flags.
 
         If the attribute has no value then ``None`` is returned.
         """
         # Lying to the type checker for better developer UX.
-        return EmbedProxy(getattr(self, '_thumbnail', {}))  # type: ignore
+        return EmbedMediaProxy(getattr(self, '_thumbnail', {}))  # type: ignore
 
     def set_thumbnail(self, *, url: Optional[Any]) -> Self:
         """Sets the thumbnail for the embed content.
@@ -491,19 +495,21 @@ def set_thumbnail(self, *, url: Optional[Any]) -> Self:
         return self
 
     @property
-    def video(self) -> _EmbedVideoProxy:
+    def video(self) -> _EmbedMediaProxy:
         """Returns an ``EmbedProxy`` denoting the video contents.
 
         Possible attributes include:
 
         - ``url`` for the video URL.
+        - ``proxy_url`` for the proxied video URL.
         - ``height`` for the video height.
         - ``width`` for the video width.
+        - ``flags`` for the video's attachment flags.
 
         If the attribute has no value then ``None`` is returned.
         """
         # Lying to the type checker for better developer UX.
-        return EmbedProxy(getattr(self, '_video', {}))  # type: ignore
+        return EmbedMediaProxy(getattr(self, '_video', {}))  # type: ignore
 
     @property
     def provider(self) -> _EmbedProviderProxy:

Diff for: discord/types/embed.py

@@ -38,28 +38,14 @@ class EmbedField(TypedDict):
     inline: NotRequired[bool]
 
 
-class EmbedThumbnail(TypedDict, total=False):
+class EmbedMedia(TypedDict, total=False):
     url: Required[str]
     proxy_url: str
     height: int
     width: int
-
-
-class EmbedVideo(TypedDict, total=False):
-    url: str
-    proxy_url: str
-    height: int
-    width: int
     flags: int
 
 
-class EmbedImage(TypedDict, total=False):
-    url: Required[str]
-    proxy_url: str
-    height: int
-    width: int
-
-
 class EmbedProvider(TypedDict, total=False):
     name: str
     url: str
@@ -83,9 +69,9 @@ class Embed(TypedDict, total=False):
     timestamp: str
     color: int
     footer: EmbedFooter
-    image: EmbedImage
-    thumbnail: EmbedThumbnail
-    video: EmbedVideo
+    image: EmbedMedia
+    thumbnail: EmbedMedia
+    video: EmbedMedia
     provider: EmbedProvider
     author: EmbedAuthor
     fields: List[EmbedField]

Diff for: docs/api.rst

@@ -2418,7 +2418,7 @@ of :class:`enum.Enum`.
         When this is the action, the type of :attr:`~AuditLogEntry.extra` is
         set to an unspecified proxy object with two attributes:
 
-        - ``channel``: A :class:`TextChannel` or :class:`Object` with the channel ID where the members were moved.
+        - ``channel``: An :class:`abc.Connectable` or :class:`Object` with the channel ID where the members were moved.
         - ``count``: An integer specifying how many members were moved.
 
         .. versionadded:: 1.3

Diff for: docs/whats_new.rst

@@ -11,6 +11,30 @@ Changelog
 This page keeps a detailed human friendly rendering of what's new and changed
 in specific versions.
 
+.. _vp2p5p2:
+
+v2.5.2
+-------
+
+Bug Fixes
+~~~~~~~~~~
+
+- Fix a serialization issue when sending embeds (:issue:`10126`)
+
+.. _vp2p5p1:
+
+v2.5.1
+-------
+
+Bug Fixes
+~~~~~~~~~~
+
+- Fix :attr:`InteractionCallbackResponse.resource` having incorrect state (:issue:`10107`)
+- Create :class:`ScheduledEvent` on cache miss for :func:`on_scheduled_event_delete` (:issue:`10113`)
+- Add defaults for :class:`Message` creation preventing some crashes (:issue:`10115`)
+- Fix :meth:`Attachment.is_spoiler` and :meth:`Attachment.is_voice_message` being incorrect (:issue:`10122`)
+
+
 .. _vp2p5p0:
 
 v2.5.0
@@ -63,7 +87,6 @@ New Features
 
 - Add :attr:`PartialWebhookChannel.mention` attribute (:issue:`10101`)
 - Add support for sending stateless views for :class:`SyncWebhook` or webhooks with no state (:issue:`10089`)
-- Add
 - Add richer :meth:`Role.move` interface (:issue:`10100`)
 - Add support for :class:`EmbedFlags` via :attr:`Embed.flags` (:issue:`10085`)
 - Add new flags for :class:`AttachmentFlags` (:issue:`10085`)