From 898e01abf4a611633f52f82865dc3b747587e3a7 Mon Sep 17 00:00:00 2001 From: neoarz Date: Mon, 20 Oct 2025 11:57:49 -0400 Subject: [PATCH] chore: server bot not selfbot self, selfuse slowing being rolled out --- cogs/fun/randomfact.py | 27 ++--- cogs/media/download.py | 239 ++++++++++++++++++++++++++++++----------- cogs/media/mcquote.py | 163 +++++++++++++++++++--------- cogs/media/tts.py | 122 +++++++++++++++------ 4 files changed, 387 insertions(+), 164 deletions(-) diff --git a/cogs/fun/randomfact.py b/cogs/fun/randomfact.py index 013b389..7a9f500 100644 --- a/cogs/fun/randomfact.py +++ b/cogs/fun/randomfact.py @@ -5,25 +5,12 @@ from discord.ext import commands def randomfact_command(): @commands.hybrid_command(name="randomfact", description="Get a random fact.") async def randomfact(self, context): - async with aiohttp.ClientSession() as session: - async with session.get( - "https://uselessfacts.jsph.pl/random.json?language=en" - ) as request: - if request.status == 200: - data = await request.json() - embed = discord.Embed( - title="Random Fact", - description=data["text"], - color=0x7289DA - ) - embed.set_author(name="Fun", icon_url="https://yes.nighty.works/raw/eW5lLm.webp") - else: - embed = discord.Embed( - title="Error!", - description="There is something wrong with the API, please try again later", - color=0xE02B2B, - ) - embed.set_author(name="Fun", icon_url="https://yes.nighty.works/raw/eW5lLm.webp") - await context.send(embed=embed) + embed = discord.Embed( + title="Command Disabled", + description="This command is currently disabled.", + color=0xE02B2B, + ) + embed.set_author(name="Fun", icon_url="https://yes.nighty.works/raw/eW5lLm.webp") + await context.send(embed=embed) return randomfact diff --git a/cogs/media/download.py b/cogs/media/download.py index 157f5a0..f7fa090 100644 --- a/cogs/media/download.py +++ b/cogs/media/download.py @@ -10,45 +10,6 @@ import logging logger = logging.getLogger("discord_bot") -async def send_error_message(context, description: str): - embed = discord.Embed( - title="Error", - description=description, - color=0xE02B2B, - ) - embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") - - interaction = getattr(context, "interaction", None) - if interaction is not None: - if not interaction.response.is_done(): - await interaction.response.send_message(embed=embed, ephemeral=True) - else: - await interaction.followup.send(embed=embed, ephemeral=True) - else: - await context.send(embed=embed, ephemeral=True) - -async def upload_to_catbox(path: str) -> str: - try: - file_size_bytes = os.path.getsize(path) - except Exception: - file_size_bytes = -1 - logger.info(f"Catbox upload start: name={os.path.basename(path)} size={file_size_bytes}") - form = aiohttp.FormData() - form.add_field('reqtype', 'fileupload') - with open(path, 'rb') as f: - form.add_field('fileToUpload', f, filename=os.path.basename(path)) - timeout = aiohttp.ClientTimeout(total=600) - async with aiohttp.ClientSession(timeout=timeout) as session: - async with session.post('https://catbox.moe/user/api.php', data=form) as resp: - text = await resp.text() - logger.info(f"Catbox response: status={resp.status} body_len={len(text)}") - if resp.status == 200 and text.startswith('https://'): - url_text = text.strip() - logger.info(f"Catbox upload success: url={url_text}") - return url_text - logger.error(f"Catbox upload failed: status={resp.status} body={text.strip()[:500]}") - raise RuntimeError(f"Upload failed: {text.strip()}") - def download_command(): @commands.hybrid_command( name="download", @@ -56,30 +17,111 @@ def download_command(): ) @commands.cooldown(1, 30, commands.BucketType.user) async def download(self, context, *, url: str): + if isinstance(context.channel, discord.DMChannel): + embed = discord.Embed( + title="Error", + description="This command can only be used in servers.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + + if isinstance(context.channel, discord.PartialMessageable): + embed = discord.Embed( + title="Error", + description="The bot needs send messages permissions in this channel.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + if not url: - await send_error_message(context, "Please provide a valid URL to download.") + embed = discord.Embed( + title="Error", + description="Please provide a valid URL to download.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) return try: parsed_url = urlparse(url) if not parsed_url.scheme or not parsed_url.netloc: - await send_error_message(context, "Please provide a valid URL.") + embed = discord.Embed( + title="Error", + description="Please provide a valid URL.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) return except Exception: - await send_error_message(context, "Please provide a valid URL.") + embed = discord.Embed( + title="Error", + description="Please provide a valid URL.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) return + processing_embed = discord.Embed( + title="Download (Processing)", + description=" Downloading video... This may take a moment.", + color=0x7289DA, + ) + processing_embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + interaction = getattr(context, "interaction", None) if interaction is not None: if not interaction.response.is_done(): - await interaction.response.defer(ephemeral=False) + await interaction.response.send_message(embed=processing_embed, ephemeral=True) + else: + await interaction.followup.send(embed=processing_embed, ephemeral=True) else: - processing_embed = discord.Embed( - title="Download (Processing)", - description=" Downloading video... This may take a moment.", - color=0x7289DA, - ) - processing_embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") processing_msg = await context.send(embed=processing_embed) temp_dir = tempfile.mkdtemp() @@ -116,7 +158,8 @@ def download_command(): video_uploader = info.get('uploader', 'Unknown') video_url = info.get('webpage_url') or info.get('original_url') or url platform = info.get('extractor') or info.get('extractor_key') or 'Unknown' - + view_count = info.get('view_count') + files = [f for f in os.listdir(temp_dir) if os.path.isfile(os.path.join(temp_dir, f))] if not files: @@ -128,11 +171,31 @@ def download_command(): if file_size > 24 * 1024 * 1024: # 24MB limit logger.info("File is over 24MB, uploading to Catbox") + async def upload_to_catbox(path: str) -> str: + try: + file_size_bytes = os.path.getsize(path) + except Exception: + file_size_bytes = -1 + logger.info(f"Catbox upload start: name={os.path.basename(path)} size={file_size_bytes}") + form = aiohttp.FormData() + form.add_field('reqtype', 'fileupload') + form.add_field('fileToUpload', open(path, 'rb'), filename=os.path.basename(path)) + timeout = aiohttp.ClientTimeout(total=600) + async with aiohttp.ClientSession(timeout=timeout) as session: + async with session.post('https://catbox.moe/user/api.php', data=form) as resp: + text = await resp.text() + logger.info(f"Catbox response: status={resp.status} body_len={len(text)}") + if resp.status == 200 and text.startswith('https://'): + url_text = text.strip() + logger.info(f"Catbox upload success: url={url_text}") + return url_text + logger.error(f"Catbox upload failed: status={resp.status} body={text.strip()[:500]}") + raise RuntimeError(f"Upload failed: {text.strip()}") try: link = await upload_to_catbox(video_file) minutes, seconds = divmod(video_duration_seconds, 60) duration_str = f"{minutes}:{seconds:02d}" - description_text = f"### **[{video_title}]({video_url})**\n\n{link}" if video_url else f"### **{video_title}**\n\n{link}" + description_text = f"### **[{video_title}]({video_url})**" if video_url else f"### **{video_title}**" embed = discord.Embed( title="Download", description=description_text, @@ -143,12 +206,18 @@ def download_command(): embed.add_field(name="Duration", value=duration_str, inline=True) embed.add_field(name="Platform", value=platform, inline=True) embed.set_footer(text=f"Requested by {context.author.name}", icon_url=context.author.display_avatar.url) - + if interaction is not None: - await interaction.followup.send(embed=embed) + await context.channel.send(embed=embed) + await context.channel.send(link) + try: + await interaction.delete_original_response() + except: + pass else: await processing_msg.delete() - await context.send(embed=embed) + await context.channel.send(embed=embed) + await context.channel.send(link) return except Exception as upload_error: logger.exception(f"Catbox upload exception: {upload_error}") @@ -164,8 +233,12 @@ def download_command(): color=0xE02B2B, ) embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") - + if interaction is not None: + try: + await interaction.delete_original_response() + except: + pass await interaction.followup.send(embed=embed, ephemeral=True) else: await processing_msg.delete() @@ -192,19 +265,45 @@ def download_command(): file = discord.File(f, filename=files[0]) if interaction is not None: - await interaction.followup.send(embeds=[embed], files=[file]) + await context.channel.send(embed=embed) + await context.channel.send(file=file) + try: + await interaction.delete_original_response() + except: + pass else: await processing_msg.delete() - await context.send(embeds=[embed], files=[file]) + await context.channel.send(embed=embed) + await context.channel.send(file=file) except discord.HTTPException as e: if e.status == 413: logger.info("Discord rejected file (413), falling back to Catbox upload") + async def upload_to_catbox(path: str) -> str: + try: + file_size_bytes = os.path.getsize(path) + except Exception: + file_size_bytes = -1 + logger.info(f"Catbox upload start: name={os.path.basename(path)} size={file_size_bytes}") + form = aiohttp.FormData() + form.add_field('reqtype', 'fileupload') + form.add_field('fileToUpload', open(path, 'rb'), filename=os.path.basename(path)) + timeout = aiohttp.ClientTimeout(total=600) + async with aiohttp.ClientSession(timeout=timeout) as session: + async with session.post('https://catbox.moe/user/api.php', data=form) as resp: + text = await resp.text() + logger.info(f"Catbox response: status={resp.status} body_len={len(text)}") + if resp.status == 200 and text.startswith('https://'): + url_text = text.strip() + logger.info(f"Catbox upload success: url={url_text}") + return url_text + logger.error(f"Catbox upload failed: status={resp.status} body={text.strip()[:500]}") + raise RuntimeError(f"Upload failed: {text.strip()}") try: link = await upload_to_catbox(video_file) description_text_with_link = f"### **[{video_title}]({video_url})**\n\n{link}" if video_url else f"### **{video_title}**\n\n{link}" embed = discord.Embed( title="Download", - description=description_text_with_link, + description=description_text, color=0x7289DA, ) embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") @@ -212,12 +311,18 @@ def download_command(): embed.add_field(name="Duration", value=duration_str, inline=True) embed.add_field(name="Platform", value=platform, inline=True) embed.set_footer(text=f"Requested by {context.author.name}", icon_url=context.author.display_avatar.url) - + if interaction is not None: - await interaction.followup.send(embed=embed) + await context.channel.send(embed=embed) + await context.channel.send(link) + try: + await interaction.delete_original_response() + except: + pass else: await processing_msg.delete() - await context.send(embed=embed) + await context.channel.send(embed=embed) + await context.channel.send(link) except Exception as upload_error: logger.exception(f"Catbox upload exception: {upload_error}") embed = discord.Embed( @@ -226,8 +331,12 @@ def download_command(): color=0xE02B2B, ) embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") - + if interaction is not None: + try: + await interaction.delete_original_response() + except: + pass await interaction.followup.send(embed=embed, ephemeral=True) else: await processing_msg.delete() @@ -242,8 +351,12 @@ def download_command(): color=0xE02B2B, ) embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") - + if interaction is not None: + try: + await interaction.delete_original_response() + except: + pass await interaction.followup.send(embed=embed, ephemeral=True) else: try: diff --git a/cogs/media/mcquote.py b/cogs/media/mcquote.py index 6ad77cb..b1a7886 100644 --- a/cogs/media/mcquote.py +++ b/cogs/media/mcquote.py @@ -6,23 +6,6 @@ from discord.ext import commands import aiohttp import random -async def send_error_message(context, description: str): - embed = discord.Embed( - title="Error", - description=description, - color=0xE02B2B, - ) - embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") - - interaction = getattr(context, "interaction", None) - if interaction is not None: - if not interaction.response.is_done(): - await interaction.response.send_message(embed=embed, ephemeral=True) - else: - await interaction.followup.send(embed=embed, ephemeral=True) - else: - await context.send(embed=embed, ephemeral=True) - def mcquote_command(): @commands.hybrid_command( name="mcquote", @@ -30,25 +13,92 @@ def mcquote_command(): ) @commands.cooldown(1, 10, commands.BucketType.user) async def mcquote(self, context, *, text: str = None): + if isinstance(context.channel, discord.DMChannel): + embed = discord.Embed( + title="Error", + description="This command can only be used in servers.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + + if isinstance(context.channel, discord.PartialMessageable): + embed = discord.Embed( + title="Error", + description="The bot needs send messages permissions in this channel.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + if not text: - await send_error_message(context, "Please provide text for the Minecraft quote.") + embed = discord.Embed( + title="Error", + description="Please provide text for the Minecraft quote.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) return if len(text) > 25: - await send_error_message(context, "Text must be 25 characters or less.") + embed = discord.Embed( + title="Error", + description="Text must be 25 characters or less.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) return + processing_embed = discord.Embed( + title="Minecraft Quote (Processing)", + description=" Generating quote... This may take a moment.", + color=0x7289DA, + ) + processing_embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + interaction = getattr(context, "interaction", None) if interaction is not None: if not interaction.response.is_done(): - await interaction.response.defer(ephemeral=False) + await interaction.response.send_message(embed=processing_embed, ephemeral=True) + else: + await interaction.followup.send(embed=processing_embed, ephemeral=True) else: - processing_embed = discord.Embed( - title="Minecraft Quote (Processing)", - description=" Generating quote... This may take a moment.", - color=0x7289DA, - ) - processing_embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") processing_msg = await context.send(embed=processing_embed) quote_text = text.replace(" ", "+") @@ -75,40 +125,55 @@ def mcquote_command(): with open(temp_file_path, 'rb') as f: file = discord.File(f, filename="mcquote.png") + interaction = getattr(context, "interaction", None) if interaction is not None: - await interaction.followup.send(embeds=[embed], files=[file]) + await context.channel.send(embed=embed) + await context.channel.send(file=file) + try: + await interaction.delete_original_response() + except: + pass else: await processing_msg.delete() - await context.send(embeds=[embed], files=[file]) + await context.channel.send(embed=embed) + await context.channel.send(file=file) os.remove(temp_file_path) except aiohttp.ClientError: + embed = discord.Embed( + title="Error", + description="Failed to generate Minecraft quote. Please try again later.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) if interaction is not None: - await interaction.followup.send(embed=discord.Embed( - title="Error", - description="Failed to generate Minecraft quote. Please try again later.", - color=0xE02B2B, - ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp"), ephemeral=True) + try: + await interaction.delete_original_response() + except: + pass + await interaction.followup.send(embed=embed, ephemeral=True) else: await processing_msg.delete() - await context.send(embed=discord.Embed( - title="Error", - description="Failed to generate Minecraft quote. Please try again later.", - color=0xE02B2B, - ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp"), ephemeral=True) + await context.send(embed=embed, ephemeral=True) except Exception as e: + embed = discord.Embed( + title="Error", + description=f"An unexpected error occurred: {str(e)}", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) if interaction is not None: - await interaction.followup.send(embed=discord.Embed( - title="Error", - description=f"An unexpected error occurred: {str(e)}", - color=0xE02B2B, - ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp"), ephemeral=True) + try: + await interaction.delete_original_response() + except: + pass + await interaction.followup.send(embed=embed, ephemeral=True) else: await processing_msg.delete() - await context.send(embed=discord.Embed( - title="Error", - description=f"An unexpected error occurred: {str(e)}", - color=0xE02B2B, - ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp"), ephemeral=True) + await context.send(embed=embed, ephemeral=True) - return mcquote + return mcquote \ No newline at end of file diff --git a/cogs/media/tts.py b/cogs/media/tts.py index b1bd70a..6d62295 100644 --- a/cogs/media/tts.py +++ b/cogs/media/tts.py @@ -11,23 +11,6 @@ from gtts import gTTS DEFAULT_LANG = "en" -async def send_error_message(context, description: str): - embed = discord.Embed( - title="Error", - description=description, - color=0xE02B2B, - ) - embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") - - interaction = getattr(context, "interaction", None) - if interaction is not None: - if not interaction.response.is_done(): - await interaction.response.send_message(embed=embed, ephemeral=True) - else: - await interaction.followup.send(embed=embed, ephemeral=True) - else: - await context.send(embed=embed, ephemeral=True) - def tts_command(): async def send_embed( @@ -81,22 +64,86 @@ def tts_command(): text="The text to convert to speech", ) async def tts(context: commands.Context, text: Optional[str] = None): + if isinstance(context.channel, discord.DMChannel): + embed = discord.Embed( + title="Error", + description="This command can only be used in servers.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + + if isinstance(context.channel, discord.PartialMessageable): + embed = discord.Embed( + title="Error", + description="The bot needs send messages permissions in this channel.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + if not text or not text.strip(): if context.message and context.message.reference and context.message.reference.resolved: referenced = context.message.reference.resolved if isinstance(referenced, discord.Message) and referenced.content: text = referenced.content if not text or not text.strip(): - await send_error_message(context, "Please provide text to convert or reply to a message containing text.") + embed = ( + discord.Embed( + title="Error", + description="Please provide text to convert or reply to a message containing text.", + color=0xE02B2B, + ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + ) + await send_embed(context, embed, ephemeral=True) return text = text.strip() if len(text) > 500: - await send_error_message(context, "Text is too long. Please limit to 500 characters.") + embed = ( + discord.Embed( + title="Error", + description="Text is too long. Please limit to 500 characters.", + color=0xE02B2B, + ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + ) + await send_embed(context, embed, ephemeral=True) return + processing_embed = ( + discord.Embed( + title="TTS (Processing)", + description=" Generating speech...", + color=0x7289DA, + ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + ) interaction = getattr(context, "interaction", None) + processing_message = None + sent_initial_interaction_response = False if interaction is not None: + if interaction.response.is_done(): + processing_message = await interaction.followup.send(embed=processing_embed, ephemeral=True) + else: + await interaction.response.send_message(embed=processing_embed, ephemeral=True) + sent_initial_interaction_response = True if not interaction.response.is_done(): await interaction.response.defer(ephemeral=False) else: @@ -112,19 +159,24 @@ def tts_command(): audio_bytes, error = await generate_tts_audio(text) if error or not audio_bytes: - if interaction is not None: - await interaction.followup.send(embed=discord.Embed( + embed = ( + discord.Embed( title="Error", description=f"Failed to generate speech. {error or 'Unknown error.'}", color=0xE02B2B, - ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp"), ephemeral=True) - else: - await processing_message.delete() - await context.send(embed=discord.Embed( - title="Error", - description=f"Failed to generate speech. {error or 'Unknown error.'}", - color=0xE02B2B, - ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp"), ephemeral=True) + ).set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + ) + await send_embed(context, embed, ephemeral=True) + if interaction is not None and sent_initial_interaction_response: + try: + await interaction.delete_original_response() + except Exception: + pass + if processing_message: + try: + await processing_message.delete() + except Exception: + pass return audio_file = discord.File( @@ -146,9 +198,15 @@ def tts_command(): ) if interaction is not None: - await interaction.followup.send(embeds=[embed], files=[audio_file]) + await context.channel.send(embed=embed) + await context.channel.send(file=audio_file) + try: + await interaction.delete_original_response() + except: + pass else: await processing_message.delete() - await context.send(embeds=[embed], files=[audio_file]) + await context.channel.send(embed=embed) + await context.channel.send(file=audio_file) - return tts + return tts \ No newline at end of file