From 8594dd1b309fd66bc2defc1f73540dfa9357e2c7 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Tue, 4 Mar 2025 18:24:38 -0500
Subject: [PATCH] Fix embed media flags regression
---
discord/embeds.py | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/discord/embeds.py b/discord/embeds.py
index b35582b9f..7f84e410d 100644
--- a/discord/embeds.py
+++ b/discord/embeds.py
@@ -46,7 +46,7 @@ class EmbedProxy:
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 @@ class EmbedProxy:
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
@@ -413,9 +423,7 @@ class Embed:
If the attribute has no value then ``None`` is returned.
"""
# Lying to the type checker for better developer UX.
- data = getattr(self, '_image', {})
- data['flags'] = AttachmentFlags._from_value(data.get('flags', 0))
- 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.
@@ -458,9 +466,7 @@ class Embed:
If the attribute has no value then ``None`` is returned.
"""
# Lying to the type checker for better developer UX.
- data = getattr(self, '_thumbnail', {})
- data['flags'] = AttachmentFlags._from_value(data.get('flags', 0))
- return EmbedProxy(data) # type: ignore
+ return EmbedMediaProxy(getattr(self, '_thumbnail', {})) # type: ignore
def set_thumbnail(self, *, url: Optional[Any]) -> Self:
"""Sets the thumbnail for the embed content.
@@ -503,9 +509,7 @@ class Embed:
If the attribute has no value then ``None`` is returned.
"""
# Lying to the type checker for better developer UX.
- data = getattr(self, '_video', {})
- data['flags'] = AttachmentFlags._from_value(data.get('flags', 0))
- return EmbedProxy(data) # type: ignore
+ return EmbedMediaProxy(getattr(self, '_video', {})) # type: ignore
@property
def provider(self) -> _EmbedProviderProxy: