Use a simpler confirmation

Author: Qwerty-133

mandatory_close_duration/mandatory_close_duration.py

@@ -7,29 +7,17 @@
 from core import time
 
 
-def quote(string: str) -> str:
-    """Format a string as a markdown blockquote."""
-    lines = string.splitlines(keepends=True)
-    return ''.join(f'> {line}' for line in lines)
-
-
-async def allow_duration_bypass(ctx: commands.Context, converted_arg: time.UserFriendlyTime) -> None:
+async def close_after_confirmation(ctx: commands.Context, converted_arg: time.UserFriendlyTime) -> None:
     """
     Send a message and allow users to react to it to close the thread.
 
-    The custom close message from the converted argument is used.
-
-    The reaction times out after 5 minutes, after which the message
-    is deleted.
+    The reaction times out after 5 minutes.
     """
     unicode_reaction = '\N{WHITE HEAVY CHECK MARK}'
+    warning_message = ("\N{WARNING SIGN} A time duration wasn't provided, reacting to this message will close"
+                       " this thread instantly. The provided custom close message will be utilised.")
 
-    embed = discord.Embed(
-        colour=ctx.bot.main_color,
-        description=f"Reacting to this message will close this thread with the message:\n\n{quote(converted_arg.arg)}"
-    )
-
-    message = await ctx.send(embed=embed)
+    message = await ctx.send(warning_message)
     await message.add_reaction(unicode_reaction)
 
     def checkmark_press_check(reaction: discord.Reaction, user: discord.User) -> bool:
@@ -44,40 +32,39 @@ def checkmark_press_check(reaction: discord.Reaction, user: discord.User) -> boo
     try:
         await ctx.bot.wait_for('reaction_add', check=checkmark_press_check, timeout=5 * 60)
     except asyncio.TimeoutError:
-        await message.delete()
+        await message.edit(content=message.content+'\n\n**Timed out.**')
+        await message.clear_reactions()
     else:
         await original_close_command(ctx, after=converted_arg)
 
 
-async def fail_without_duration(
+async def safe_close(
     self: time.UserFriendlyTime,
     ctx: commands.Context,
     *,
     after: time.UserFriendlyTime = None
 ) -> None:
     """
-    Fail if a time duration wasn't provided with a close message.
+    Close the current thread.
 
-    Unlike the default close command, a time duration must be provided
-    when a custom close message is provided.
+    Unlike the original close command, confirmation is awaited when
+    a time duration isn't provided but a custom close message is.
     """
     modifiers = {'silently', 'silent', 'cancel'}
 
     argument_passed = bool(after)
     not_a_modifier = after.arg not in modifiers
 
     if argument_passed and not_a_modifier and after.arg == after.raw:
-        # Fail since only a close message was provided.
-        err = commands.BadArgument("A time duration must be provided when closing with a custom message.")
-        await ctx.bot.on_command_error(ctx, err)  # Sends the error message
-        await allow_duration_bypass(ctx, after)
+        # Ask for confirmation since only a close message was provided.
+        await close_after_confirmation(ctx, after)
     else:
         await original_close_command(ctx, after=after)
 
 
 def setup(bot: ModmailBot) -> None:
     """
-    Monkey patch the close command's callback to fail_without_duration.
+    Monkey patch the close command's callback to safe_close.
 
     The help text is also updated to reflect the new behaviour.
     """
@@ -87,8 +74,8 @@ def setup(bot: ModmailBot) -> None:
     original_close_command = command.copy()
     original_close_command.cog = command.cog
 
-    command.callback = fail_without_duration
-    command.help += '\n\n*Note: Providing a time duration is necessary when closing with a custom message.*'
+    command.callback = safe_close
+    command.help += '\n\n*Note: A time duration should be provided when closing with a custom message.*'
 
 
 def teardown(bot: ModmailBot) -> None: