From e9f6021c63a0b57bb6c502e2986f3604c6648869 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sun, 21 Aug 2022 21:33:24 -0600 Subject: [PATCH] Fix issues in remindme --- jarvis/cogs/remindme.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jarvis/cogs/remindme.py b/jarvis/cogs/remindme.py index 4d93538..a9aa431 100644 --- a/jarvis/cogs/remindme.py +++ b/jarvis/cogs/remindme.py @@ -25,7 +25,7 @@ from naff.models.naff.application_commands import ( from jarvis.utils import build_embed -valid = re.compile(r"[\w\s\-\\/.!@#$%^*()+=<>:,\u0080-\U000E0FFF]*") +valid = re.compile(r"[\w\s\-\\/.!@#$%^*()+=<>:'\",\u0080-\U000E0FFF]*") time_pattern = re.compile(r"(\d+\.?\d?[s|m|h|d|w]{1})\s?", flags=re.IGNORECASE) invites = re.compile( r"(?:https?://)?(?:www.)?(?:discord.(?:gg|io|me|li)|discord(?:app)?.com/invite)/([^\s/]+?)(?=\b)", # noqa: E501 @@ -84,8 +84,8 @@ class RemindmeCog(Extension): await ctx.send_modal(modal) try: response = await self.bot.wait_for_modal(modal, author=ctx.author.id, timeout=60 * 5) - message = response.responses.get("message") - delay = response.responses.get("delay") + message = response.responses.get("message").strip() + delay = response.responses.get("delay").strip() except asyncio.TimeoutError: return if len(message) > 500: @@ -100,6 +100,11 @@ class RemindmeCog(Extension): elif not valid.fullmatch(message): await response.send("Hey, you should probably make this readable", ephemeral=True) return + elif len(message) == 0: + await response.send( + "Hey, you should probably add content to your reminder", ephemeral=True + ) + return base_settings = { "PREFER_DATES_FROM": "future",