From 862eba1e5912fa74e7c77127d4a815d4cd4e9e25 Mon Sep 17 00:00:00 2001
From: Jonah Lawrence <jonah@freshidea.com>
Date: Thu, 14 Apr 2022 17:04:05 -0600
Subject: [PATCH] Add filename and description kwargs for to_file

---
 discord/asset.py   | 22 ++++++++++++++++------
 discord/message.py | 23 +++++++++++++++++++++--
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/discord/asset.py b/discord/asset.py
index 0edb338e4..0b5e3df61 100644
--- a/discord/asset.py
+++ b/discord/asset.py
@@ -125,7 +125,13 @@ class AssetMixin:
             with open(fp, 'wb') as f:
                 return f.write(data)
 
-    async def to_file(self, *, spoiler: bool = False) -> File:
+    async def to_file(
+        self,
+        *,
+        filename: Optional[str] = MISSING,
+        description: Optional[str] = None,
+        spoiler: bool = False,
+    ) -> File:
         """|coro|
 
         Converts the asset into a :class:`File` suitable for sending via
@@ -135,6 +141,11 @@ class AssetMixin:
 
         Parameters
         -----------
+        filename: Optional[:class:`str`]
+            The filename of the file. If not provided, then the filename from
+            the asset's URL is used.
+        description: Optional[:class:`str`]
+            The description for the file.
         spoiler: :class:`bool`
             Whether the file is a spoiler.
 
@@ -142,12 +153,12 @@ class AssetMixin:
         ------
         DiscordException
             The asset does not have an associated state.
+        ValueError
+            The asset is a unicode emoji.
         TypeError
             The asset is a sticker with lottie type.
         HTTPException
             Downloading the asset failed.
-        Forbidden
-            You do not have permissions to access this asset.
         NotFound
             The asset was deleted.
 
@@ -158,9 +169,8 @@ class AssetMixin:
         """
 
         data = await self.read()
-        url = yarl.URL(self.url)
-        _, _, filename = url.path.rpartition('/')
-        return File(io.BytesIO(data), filename=filename, spoiler=spoiler)
+        file_filename = filename if filename is not MISSING else yarl.URL(self.url).name
+        return File(io.BytesIO(data), filename=file_filename, description=description, spoiler=spoiler)
 
 
 class Asset(AssetMixin):
diff --git a/discord/message.py b/discord/message.py
index 4c427bc04..d672108ac 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -303,7 +303,14 @@ class Attachment(Hashable):
         data = await self._http.get_from_cdn(url)
         return data
 
-    async def to_file(self, *, use_cached: bool = False, spoiler: bool = False) -> File:
+    async def to_file(
+        self,
+        *,
+        filename: Optional[str] = MISSING,
+        description: Optional[str] = MISSING,
+        use_cached: bool = False,
+        spoiler: bool = False,
+    ) -> File:
         """|coro|
 
         Converts the attachment into a :class:`File` suitable for sending via
@@ -313,6 +320,16 @@ class Attachment(Hashable):
 
         Parameters
         -----------
+        filename: Optional[:class:`str`]
+            The filename to use for the file. If not specified then the filename
+            of the attachment is used instead.
+
+            .. versionadded:: 2.0
+        description: Optional[:class:`str`]
+            The description to use for the file. If not specified then the
+            description of the attachment is used instead.
+
+            .. versionadded:: 2.0
         use_cached: :class:`bool`
             Whether to use :attr:`proxy_url` rather than :attr:`url` when downloading
             the attachment. This will allow attachments to be saved after deletion
@@ -343,7 +360,9 @@ class Attachment(Hashable):
         """
 
         data = await self.read(use_cached=use_cached)
-        return File(io.BytesIO(data), filename=self.filename, description=self.description, spoiler=spoiler)
+        file_filename = filename if filename is not MISSING else self.filename
+        file_description = description if description is not MISSING else self.description
+        return File(io.BytesIO(data), filename=file_filename, description=file_description, spoiler=spoiler)
 
     def to_dict(self) -> AttachmentPayload:
         result: AttachmentPayload = {