From 393487946cb0444b3bab743064fcbb8685fce6f9 Mon Sep 17 00:00:00 2001
From: Zevaryx <zevaryx@gmail.com>
Date: Sun, 21 Aug 2022 21:33:14 -0600
Subject: [PATCH] Fixes to mute command and modlog, closes #174

---
 jarvis/cogs/admin/mute.py | 8 ++++----
 jarvis/utils/cogs.py      | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jarvis/cogs/admin/mute.py b/jarvis/cogs/admin/mute.py
index a9b0e2c..1e99280 100644
--- a/jarvis/cogs/admin/mute.py
+++ b/jarvis/cogs/admin/mute.py
@@ -151,8 +151,8 @@ class MuteCog(ModcaseCog):
         choices=[
             SlashCommandChoice(name="Minute(s)", value=1),
             SlashCommandChoice(name="Hour(s)", value=60),
-            SlashCommandChoice(name="Day(s)", value=3600),
-            SlashCommandChoice(name="Week(s)", value=604800),
+            SlashCommandChoice(name="Day(s)", value=1440),
+            SlashCommandChoice(name="Week(s)", value=10080),
         ],
     )
     @check(
@@ -178,8 +178,8 @@ class MuteCog(ModcaseCog):
 
         # Max 4 weeks (2419200 seconds) per API
         duration = time * scale
-        if duration > 2419200:
-            await ctx.send("Mute must be less than 4 weeks (2419200 seconds)", ephemeral=True)
+        if duration > 40320:
+            await ctx.send("Mute must be less than 4 weeks (40,320 minutes)", ephemeral=True)
             return
 
         until = datetime.now(tz=timezone.utc) + timedelta(minutes=duration)
diff --git a/jarvis/utils/cogs.py b/jarvis/utils/cogs.py
index 792ef7e..1dde758 100644
--- a/jarvis/utils/cogs.py
+++ b/jarvis/utils/cogs.py
@@ -80,6 +80,9 @@ class ModcaseCog(Extension):
                     description=f"Admin action has been taken against you in {ctx.guild.name}",
                     fields=fields,
                 )
+                if name == "Mute":
+                    mts = int(user.communication_disabled_until.timestamp())
+                    embed.add_field(name="Muted Until", value=f"<t:{mts}:F> (<t:{mts}:R>)")
                 guild_url = f"https://discord.com/channels/{ctx.guild.id}"
                 embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon.url, url=guild_url)
                 embed.set_thumbnail(url=ctx.guild.icon.url)
@@ -117,6 +120,9 @@ class ModcaseCog(Extension):
                     name=f"{user.username}#{user.discriminator}", icon_url=user.display_avatar.url
                 )
                 embed.set_footer(text=f"User ID: {user.id}")
+                if name == "Mute":
+                    mts = int(user.communication_disabled_until.timestamp())
+                    embed.add_field(name="Muted Until", value=f"<t:{mts}:F> (<t:{mts}:R>)")
                 await channel.send(embeds=embed)
 
             lookup_key = f"{user.id}|{ctx.guild.id}"