Confirm thread creation when user opens a thread using react to contact.

Author: Jerrie-Aries

cogs/modmail.py

@@ -1027,7 +1027,12 @@ async def contact(
             await ctx.channel.send(embed=embed, delete_after=3)
 
         else:
-            thread = await self.bot.threads.create(user, creator=ctx.author, category=category)
+            thread = await self.bot.threads.create(
+                recipient=user,
+                creator=ctx.author,
+                category=category,
+                manual_trigger=manual_trigger,
+            )
             if self.bot.config["dm_disabled"] in (DMDisabled.NEW_THREADS, DMDisabled.ALL_THREADS):
                 logger.info("Contacting user %s when Modmail DM is disabled.", user)
 

core/thread.py

@@ -1175,6 +1175,7 @@ async def create(
         message: discord.Message = None,
         creator: typing.Union[discord.Member, discord.User] = None,
         category: discord.CategoryChannel = None,
+        manual_trigger: bool = True,
     ) -> Thread:
         """Creates a Modmail thread"""
 
@@ -1215,8 +1216,12 @@ async def create(
                 self.bot.config.set("fallback_category_id", category.id)
                 await self.bot.config.update()
 
-        if message and self.bot.config["confirm_thread_creation"]:
-            confirm = await message.channel.send(
+        if (message or not manual_trigger) and self.bot.config["confirm_thread_creation"]:
+            if not manual_trigger:
+                destination = recipient
+            else:
+                destination = message.channel
+            confirm = await destination.send(
                 embed=discord.Embed(
                     title=self.bot.config["confirm_thread_creation_title"],
                     description=self.bot.config["confirm_thread_response"],
@@ -1231,7 +1236,7 @@ async def create(
             try:
                 r, _ = await self.bot.wait_for(
                     "reaction_add",
-                    check=lambda r, u: u.id == message.author.id
+                    check=lambda r, u: u.id == recipient.id
                     and r.message.id == confirm.id
                     and r.message.channel.id == confirm.channel.id
                     and str(r.emoji) in (accept_emoji, deny_emoji),
@@ -1243,7 +1248,7 @@ async def create(
                 await confirm.remove_reaction(accept_emoji, self.bot.user)
                 await asyncio.sleep(0.2)
                 await confirm.remove_reaction(deny_emoji, self.bot.user)
-                await message.channel.send(
+                await destination.send(
                     embed=discord.Embed(
                         title="Cancelled", description="Timed out", color=self.bot.error_color
                     )
@@ -1257,7 +1262,7 @@ async def create(
                     await confirm.remove_reaction(accept_emoji, self.bot.user)
                     await asyncio.sleep(0.2)
                     await confirm.remove_reaction(deny_emoji, self.bot.user)
-                    await message.channel.send(
+                    await destination.send(
                         embed=discord.Embed(title="Cancelled", color=self.bot.error_color)
                     )
                     del self.cache[recipient.id]