Refactor AdPreview to handle image attachments

This fixes a bug where, if the user didn't choose to upload
their clan emblem, while entering
the Slash Command, the bot will
throw an excption, saying the URL is invalid.

Author: MasterJ93

utils/helpers.py

@@ -105,8 +105,12 @@ async def download(self, url):
         Args:
             url (str): The URL used to download the image.
         """
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as resp:
-                if resp.status != 200:
-                    raise RequestFailedException()
-                return io.BytesIO(await resp.read())
+        
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.get(url) as resp:
+                    if resp.status != 200:
+                        raise RequestFailedException()
+                    return io.BytesIO(await resp.read())
+        except aiohttp.client.InvalidURL as exc:
+            raise RequestFailedException(f"Invalid URL: {url}") from exc

views/billboard_views.py

@@ -330,14 +330,21 @@ async def edit_message(self, _content):
         """
         member_id = self.member.id
         clan_ad_details = await self._get_clan_ad_details(member_id)
-        color = self._determine_color(
-            clan_ad_details[ClanAdKey.INVITE_STATUS]
-            )
-        emblem_img = await self._download_emblem_image(
-            clan_ad_details[ClanAdKey.CLAN_EMBLEM_URL]
-            )
+        color = self._determine_color(clan_ad_details[ClanAdKey.INVITE_STATUS])
+
+        url = clan_ad_details[ClanAdKey.CLAN_EMBLEM_URL]
+        if url:
+            emblem_img = await self._download_emblem_image(url)
+        else:
+            emblem_img = None
+
         embed = self._build_embed(clan_ad_details, color, emblem_img)
-        await self._send_embed(embed, _content)
+        file = None
+        if url and emblem_img:
+            file = discord.File(emblem_img, filename="emblem.png")
+            embed.set_thumbnail(url="attachment://emblem.png")
+
+        await self._send_embed(embed, _content, file)
 
     async def _get_clan_ad_details(self, member_id):
         keys = [
@@ -348,7 +355,7 @@ async def _get_clan_ad_details(self, member_id):
             key: await self.ad_manager.read(
                 member_id, key=key
                 ) for key in keys
-                }
+            }
 
     def _determine_color(self, invite_status):
         return Color.green() if invite_status == '0x0' else Color.red()
@@ -393,7 +400,9 @@ def _build_embed(self, details, color, emblem_img):
 
         return embed
 
-    async def _send_embed(self, embed, _content):
+    async def _send_embed(self, embed, _content, file=None):
         await self.interaction.edit_original_response(
-            content=_content, embed=embed, view=self.view
-            )
+            content=_content, embed=embed,
+            attachments=[] if file is None else [file],
+            view=self.view
+        )