Merge branch 'Jerrie-Aries-dev-07' into development

Author: fourjr

bot.py

@@ -1188,6 +1188,14 @@ async def handle_reaction_events(self, payload):
                     # the reacted message is the corresponding thread creation embed
                     # closing thread
                     return await thread.close(closer=user)
+            if (
+                message.author == self.user
+                and message.embeds
+                and self.config.get("confirm_thread_creation")
+                and message.embeds[0].title == self.config["confirm_thread_creation_title"]
+                and message.embeds[0].description == self.config["confirm_thread_response"]
+            ):
+                return
             if not thread.recipient.dm_channel:
                 await thread.recipient.create_dm()
             try:
@@ -1238,15 +1246,33 @@ async def on_raw_reaction_add(self, payload):
                     if not member.bot:
                         message = await channel.fetch_message(payload.message_id)
                         await message.remove_reaction(payload.emoji, member)
+                        await message.add_reaction(emoji_fmt)  # bot adds as well
+
+                        if self.config["dm_disabled"] in (
+                            DMDisabled.NEW_THREADS,
+                            DMDisabled.ALL_THREADS,
+                        ):
+                            embed = discord.Embed(
+                                title=self.config["disabled_new_thread_title"],
+                                color=self.error_color,
+                                description=self.config["disabled_new_thread_response"],
+                            )
+                            embed.set_footer(
+                                text=self.config["disabled_new_thread_footer"],
+                                icon_url=self.guild.icon_url,
+                            )
+                            logger.info(
+                                "A new thread using react to contact was blocked from %s due to disabled Modmail.",
+                                member,
+                            )
+                            return await member.send(embed=embed)
 
                         ctx = await self.get_context(message)
                         ctx.author = member
                         await ctx.invoke(
                             self.get_command("contact"), user=member, manual_trigger=False
                         )
 
-                        await message.add_reaction(emoji_fmt)  # bot adds as well
-
     async def on_raw_reaction_remove(self, payload):
         if self.config["transfer_reactions"]:
             await self.handle_reaction_events(payload)

cogs/modmail.py

@@ -1026,7 +1026,15 @@ 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 thread.cancelled:
+                return
+
             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

@@ -1176,6 +1176,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"""
 
@@ -1216,8 +1217,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"],
@@ -1232,7 +1237,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),
@@ -1244,7 +1249,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
                     )
@@ -1258,7 +1263,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]