From 5e51a9a20331c93887e9f514091d56014935d523 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Wed, 30 Mar 2022 10:12:27 -0600 Subject: [PATCH] Fix unmute, past dates on mute --- jarvis/cogs/admin/mute.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jarvis/cogs/admin/mute.py b/jarvis/cogs/admin/mute.py index 7cc022b..3ad3a56 100644 --- a/jarvis/cogs/admin/mute.py +++ b/jarvis/cogs/admin/mute.py @@ -109,6 +109,7 @@ class MuteCog(ModcaseCog): at_settings["PARSERS"] = [x for x in default_parsers if x != "relative-time"] at_until = parse(until, settings=at_settings) + old_until = until if rt_until: until = rt_until elif at_until: @@ -119,6 +120,11 @@ class MuteCog(ModcaseCog): f"`{until}` is not a parsable date, please try again", ephemeral=True ) return + if until < datetime.now(tz=timezone.utc): + await response.send( + f"`{old_until}` is in the past, which isn't allowed", ephemeral=True + ) + return embed = await self._apply_timeout(ctx, ctx.target, reason, until) await response.send(embed=embed) @@ -194,7 +200,7 @@ class MuteCog(ModcaseCog): await ctx.send("User is not muted", ephemeral=True) return - await user.timeout(communication_disabled_until=0) + await user.timeout(communication_disabled_until=datetime.now(tz=timezone.utc)) embed = build_embed( title="User Unmuted",