Fix time args, and use literals for close

Author: fourjr

cogs/modmail.py

@@ -464,7 +464,7 @@ async def send_scheduled_close_message(self, ctx, after, silent=False):
     @commands.command(usage="[after] [close message]")
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def close(self, ctx, *, after: UserFriendlyTime = None):
+    async def close(self, ctx, option: Optional[Literal["silent", "silently", "cancel"]]='', *, after: UserFriendlyTime = None):
         """
         Close the current thread.
 
@@ -486,15 +486,11 @@ async def close(self, ctx, *, after: UserFriendlyTime = None):
 
         thread = ctx.thread
 
-        now = discord.utils.utcnow()
-
-        close_after = (after.dt - now).total_seconds() if after else 0
-        message = after.arg if after else None
-        silent = str(message).lower() in {"silent", "silently"}
-        cancel = str(message).lower() == "cancel"
+        close_after = (after.dt - after.now).total_seconds() if after else 0
+        silent = any(x == option for x in {"silent", "silently"})
+        cancel = option == "cancel"
 
         if cancel:
-
             if thread.close_task is not None or thread.auto_close_task is not None:
                 await thread.cancel_closure(all=True)
                 embed = discord.Embed(
@@ -508,10 +504,11 @@ async def close(self, ctx, *, after: UserFriendlyTime = None):
 
             return await ctx.send(embed=embed)
 
+        message = after.arg if after else None
         if self.bot.config["require_close_reason"] and message is None:
             raise commands.BadArgument("Provide a reason for closing the thread.")
 
-        if after and after.dt > now:
+        if after and after.dt > after.now:
             await self.send_scheduled_close_message(ctx, after, silent)
 
         await thread.close(closer=ctx.author, after=close_after, message=message, silent=silent)
@@ -1530,7 +1527,6 @@ async def contact(
             except ValueError:
                 pass
 
-        print(users, silent)
         if isinstance(category, str):
             category = category.split()
 
@@ -1857,7 +1853,6 @@ async def block(
             return await ctx.send(embed=embed)
 
         reason = f"by {escape_markdown(ctx.author.name)}#{ctx.author.discriminator}"
-        now = discord.utils.utcnow()
 
         if after is not None:
             if "%" in reason:
@@ -1866,7 +1861,7 @@ async def block(
 
             if after.arg:
                 reason += f" until: <t:{unixtime}:R>"
-            if after.dt > now:
+            if after.dt > after.now:
                 reason += f" until <t:{unixtime}:f>"
 
         reason += "."

core/time.py

@@ -20,8 +20,8 @@
 units["seconds"].append("secs")
 
 if TYPE_CHECKING:
+    from discord.ext.commands import Context
     from typing_extensions import Self
-    from cogs.utils.context import Context
 
 
 class plural:
@@ -82,7 +82,7 @@ def __init__(self, argument: str, *, now: Optional[datetime.datetime] = None):
         self.dt = now + relativedelta(**data)
 
     @classmethod
-    async def convert(cls, ctx: Context, argument: str) -> Self:
+    async def convert(cls, ctx:  Context, argument: str) -> Self:
         return cls(argument, now=ctx.message.created_at)
 
 
@@ -146,14 +146,23 @@ async def transform(self, interaction, value: str) -> datetime.datetime:
             return short.dt
 
 
+## CHANGE: Added now
 class FriendlyTimeResult:
     dt: datetime.datetime
+    now: datetime.datetime
     arg: str
 
-    __slots__ = ("dt", "arg")
+    __slots__ = ("dt", "arg", "now")
 
-    def __init__(self, dt: datetime.datetime):
+    def __init__(self, dt: datetime.datetime, now: datetime.datetime=None):
         self.dt = dt
+        self.now = now
+
+        if now is None:
+            self.now = dt
+        else:
+            self.now = now
+
         self.arg = ""
 
     async def ensure_constraints(
@@ -162,6 +171,7 @@ async def ensure_constraints(
         if self.dt < now:
             raise commands.BadArgument("This time is in the past.")
 
+        # CHANGE
         # if not remaining:
         #     if uft.default is None:
         #         raise commands.BadArgument("Missing argument after the time.")
@@ -200,15 +210,15 @@ async def convert(self, ctx: Context, argument: str) -> FriendlyTimeResult:
         if match is not None and match.group(0):
             data = {k: int(v) for k, v in match.groupdict(default=0).items()}
             remaining = argument[match.end() :].strip()
-            result = FriendlyTimeResult(now + relativedelta(**data))
+            result = FriendlyTimeResult(now + relativedelta(**data), now)
             await result.ensure_constraints(ctx, self, now, remaining)
             return result
 
         if match is None or not match.group(0):
             match = ShortTime.discord_fmt.match(argument)
             if match is not None:
                 result = FriendlyTimeResult(
-                    datetime.datetime.fromtimestamp(int(match.group("ts")), tz=datetime.timezone.utc)
+                    datetime.datetime.fromtimestamp(int(match.group("ts")), now, tz=datetime.timezone.utc)
                 )
                 remaining = argument[match.end() :].strip()
                 await result.ensure_constraints(ctx, self, now, remaining)
@@ -226,7 +236,10 @@ async def convert(self, ctx: Context, argument: str) -> FriendlyTimeResult:
 
         elements = calendar.nlp(argument, sourceTime=now)
         if elements is None or len(elements) == 0:
-            raise commands.BadArgument('Invalid time provided, try e.g. "tomorrow" or "3 days".')
+            # CHANGE
+            result = FriendlyTimeResult(now)
+            await result.ensure_constraints(ctx, self, now, argument)
+            return result
 
         # handle the following cases:
         # "date time" foo
@@ -254,7 +267,7 @@ async def convert(self, ctx: Context, argument: str) -> FriendlyTimeResult:
         if status.accuracy == pdt.pdtContext.ACU_HALFDAY:
             dt = dt.replace(day=now.day + 1)
 
-        result = FriendlyTimeResult(dt.replace(tzinfo=datetime.timezone.utc))
+        result = FriendlyTimeResult(dt.replace(tzinfo=datetime.timezone.utc), now)
         remaining = ""
 
         if begin in (0, 1):