From edf461f460ad7cbb547ffae9f9b23bc8b3d19212 Mon Sep 17 00:00:00 2001 From: Pukimaa Date: Thu, 2 Feb 2023 21:08:35 +0000 Subject: [PATCH] refactor(topic): better warning if index out of range # --- cogs/misc/revive.py | 8 +++++--- i18n/misc/en.yml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cogs/misc/revive.py b/cogs/misc/revive.py index 467fd1ee..d7f21bcf 100644 --- a/cogs/misc/revive.py +++ b/cogs/misc/revive.py @@ -1,5 +1,6 @@ import i18n import discord +from asyncio import sleep from random import randint from .topics import questions from discord import app_commands @@ -21,7 +22,6 @@ async def topic( id: int | None = None, ): locale = get_language(self.bot, interaction.guild_id) - original_id = id id = randint(0, len(questions)) if id is None else id index = id - 1 embeds = [] @@ -44,8 +44,8 @@ async def topic( if not valid_topic: embed2, file = error_embed( self.bot, - i18n.t("misc.topic_invalid_title", locale=locale, id=original_id), - i18n.t("misc.topic_invalid", locale=locale), + i18n.t("misc.topic_invalid_title", locale=locale), + i18n.t("misc.topic_invalid", amount=len(questions), locale=locale), interaction.guild_id, style="warning", ) @@ -53,3 +53,5 @@ async def topic( files.append(file) await interaction.response.send_message(embeds=embeds, files=files) + await sleep(5) + await interaction.edit_original_response(embed=embed, attachments=[]) diff --git a/i18n/misc/en.yml b/i18n/misc/en.yml index c2e1afce..b3954b7b 100644 --- a/i18n/misc/en.yml +++ b/i18n/misc/en.yml @@ -35,8 +35,8 @@ en: auto_translate_delete_original: "Deletion of the original message is now set to %{value}" topic_title: "Here's your topic:" topic_footer: "Topic ID: %{id}" - topic_invalid_title: "We couldn't find a Topic with the ID of `%{id}`" - topic_invalid: "We searched far and wide. Unfortunately, no topics were found.\nThat's why we picked a random topic for you. We hope you like it." + topic_invalid_title: "We searched far and wide. Unfortunately, no topics were found." + topic_invalid: "We've selected one of our %{amount} topics at random just for you. We hope you like it." auto_react_added: "%{emoji} will now be added to every message in %{channel}" auto_react_removed: "%{emoji} will no longer be added to every message in %{channel}" auto_react_empty: "No emojis are set to be added to every message in %{channel}"