plain_snippets, ?fpareply and ?fpreply, resolves #3083

Author: fourjr

CHANGELOG.md

@@ -16,7 +16,9 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 ### Added
 
 - `use_hoisted_top_role` config to use change how default mod tags work, see `v3.10.0#Added` for details. ([PR #3093](https://github.com/kyb3r/modmail/pull/3093))
-- `require_close_reason` to require a reason to close a thread. ([GH #3107](https://github.com/kyb3r/modmail/issues/3107))
+- `require_close_reason` config to require a reason to close a thread. ([GH #3107](https://github.com/kyb3r/modmail/issues/3107))
+- `plain_snippets` config to force all snippets to be plain. ([GH #3083](https://github.com/kyb3r/modmail/issues/3083))
+- `?fpareply` and `?fpreply` to reply to messages with variables plainly.
 
 ### Improved
 

bot.py

@@ -1144,10 +1144,12 @@ async def process_commands(self, message):
             cmd = cmd.lower()
             if cmd in self.snippets:
                 snippet = self.snippets[cmd]
+                modifiers = "f"
+                if self.config["plain_snippets"]:
+                    modifiers += "p"
                 if self.config["anonymous_snippets"]:
-                    message.content = f"{self.prefix}fareply {snippet}"
-                else:
-                    message.content = f"{self.prefix}freply {snippet}"
+                    modifiers += "a"
+                message.content = f"{self.prefix}{modifiers}reply {snippet}"
 
         ctxs = await self.get_contexts(message)
         for ctx in ctxs:

cogs/modmail.py

@@ -1,5 +1,4 @@
 import asyncio
-from asyncio import tasks
 import re
 from datetime import datetime
 from itertools import zip_longest
@@ -739,7 +738,7 @@ async def adduser(self, ctx, *users_arg: Union[discord.Member, discord.Role, str
             ctx.command.reset_cooldown(ctx)
             return
 
-        tasks = []
+        to_exec = []
         if not silent:
             description = self.bot.formatter.format(
                 self.bot.config["private_added_to_group_response"], moderator=ctx.author
@@ -753,7 +752,7 @@ async def adduser(self, ctx, *users_arg: Union[discord.Member, discord.Role, str
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(text=str(ctx.author), icon_url=ctx.author.display_avatar.url)
             for u in users:
-                tasks.append(u.send(embed=em))
+                to_exec.append(u.send(embed=em))
 
             description = self.bot.formatter.format(
                 self.bot.config["public_added_to_group_response"],
@@ -771,11 +770,11 @@ async def adduser(self, ctx, *users_arg: Union[discord.Member, discord.Role, str
 
             for i in ctx.thread.recipients:
                 if i not in users:
-                    tasks.append(i.send(embed=em))
+                    to_exec.append(i.send(embed=em))
 
         await ctx.thread.add_users(users)
-        if tasks:
-            await asyncio.gather(*tasks)
+        if to_exec:
+            await asyncio.gather(*to_exec)
 
         sent_emoji, _ = await self.bot.retrieve_emoji()
         await self.bot.add_reaction(ctx.message, sent_emoji)
@@ -832,7 +831,7 @@ async def removeuser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
             ctx.command.reset_cooldown(ctx)
             return
 
-        tasks = []
+        to_exec = []
         if not silent:
             description = self.bot.formatter.format(
                 self.bot.config["private_removed_from_group_response"], moderator=ctx.author
@@ -846,7 +845,7 @@ async def removeuser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(text=str(ctx.author), icon_url=ctx.author.display_avatar.url)
             for u in users:
-                tasks.append(u.send(embed=em))
+                to_exec.append(u.send(embed=em))
 
             description = self.bot.formatter.format(
                 self.bot.config["public_removed_from_group_response"],
@@ -864,11 +863,11 @@ async def removeuser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
 
             for i in ctx.thread.recipients:
                 if i not in users:
-                    tasks.append(i.send(embed=em))
+                    to_exec.append(i.send(embed=em))
 
         await ctx.thread.remove_users(users)
-        if tasks:
-            await asyncio.gather(*tasks)
+        if to_exec:
+            await asyncio.gather(*to_exec)
 
         sent_emoji, _ = await self.bot.retrieve_emoji()
         await self.bot.add_reaction(ctx.message, sent_emoji)
@@ -919,7 +918,7 @@ async def anonadduser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
             ctx.command.reset_cooldown(ctx)
             return
 
-        tasks = []
+        to_exec = []
         if not silent:
             em = discord.Embed(
                 title=self.bot.config["private_added_to_group_title"],
@@ -941,7 +940,7 @@ async def anonadduser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
             em.set_footer(text=name, icon_url=avatar_url)
 
             for u in users:
-                tasks.append(u.send(embed=em))
+                to_exec.append(u.send(embed=em))
 
             description = self.bot.formatter.format(
                 self.bot.config["public_added_to_group_description_anon"],
@@ -958,11 +957,11 @@ async def anonadduser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
 
             for i in ctx.thread.recipients:
                 if i not in users:
-                    tasks.append(i.send(embed=em))
+                    to_exec.append(i.send(embed=em))
 
         await ctx.thread.add_users(users)
-        if tasks:
-            await asyncio.gather(*tasks)
+        if to_exec:
+            await asyncio.gather(*to_exec)
 
         sent_emoji, _ = await self.bot.retrieve_emoji()
         await self.bot.add_reaction(ctx.message, sent_emoji)
@@ -1008,7 +1007,7 @@ async def anonremoveuser(self, ctx, *users_arg: Union[discord.Member, discord.Ro
                 ctx.command.reset_cooldown(ctx)
                 return
 
-        tasks = []
+        to_exec = []
         if not silent:
             em = discord.Embed(
                 title=self.bot.config["private_removed_from_group_title"],
@@ -1030,7 +1029,7 @@ async def anonremoveuser(self, ctx, *users_arg: Union[discord.Member, discord.Ro
             em.set_footer(text=name, icon_url=avatar_url)
 
             for u in users:
-                tasks.append(u.send(embed=em))
+                to_exec.append(u.send(embed=em))
 
             description = self.bot.formatter.format(
                 self.bot.config["public_removed_from_group_description_anon"],
@@ -1047,11 +1046,11 @@ async def anonremoveuser(self, ctx, *users_arg: Union[discord.Member, discord.Ro
 
             for i in ctx.thread.recipients:
                 if i not in users:
-                    tasks.append(i.send(embed=em))
+                    to_exec.append(i.send(embed=em))
 
         await ctx.thread.remove_users(users)
-        if tasks:
-            await asyncio.gather(*tasks)
+        if to_exec:
+            await asyncio.gather(*to_exec)
 
         sent_emoji, _ = await self.bot.retrieve_emoji()
         await self.bot.add_reaction(ctx.message, sent_emoji)
@@ -1253,6 +1252,50 @@ async def fareply(self, ctx, *, msg: str = ""):
         async with ctx.typing():
             await ctx.thread.reply(ctx.message, anonymous=True)
 
+    @commands.command(aliases=["formatplainreply"])
+    @checks.has_permissions(PermissionLevel.SUPPORTER)
+    @checks.thread_only()
+    async def fpreply(self, ctx, *, msg: str = ""):
+        """
+        Reply to a Modmail thread with variables and a plain message.
+
+        Works just like `{prefix}areply`, however with the addition of three variables:
+          - `{{channel}}` - the `discord.TextChannel` object
+          - `{{recipient}}` - the `discord.User` object of the recipient
+          - `{{author}}` - the `discord.User` object of the author
+
+        Supports attachments and images as well as
+        automatically embedding image URLs.
+        """
+        msg = self.bot.formatter.format(
+            msg, channel=ctx.channel, recipient=ctx.thread.recipient, author=ctx.message.author
+        )
+        ctx.message.content = msg
+        async with ctx.typing():
+            await ctx.thread.reply(ctx.message, plain=True)
+
+    @commands.command(aliases=["formatplainanonreply"])
+    @checks.has_permissions(PermissionLevel.SUPPORTER)
+    @checks.thread_only()
+    async def fpareply(self, ctx, *, msg: str = ""):
+        """
+        Anonymously reply to a Modmail thread with variables and a plain message.
+
+        Works just like `{prefix}areply`, however with the addition of three variables:
+          - `{{channel}}` - the `discord.TextChannel` object
+          - `{{recipient}}` - the `discord.User` object of the recipient
+          - `{{author}}` - the `discord.User` object of the author
+
+        Supports attachments and images as well as
+        automatically embedding image URLs.
+        """
+        msg = self.bot.formatter.format(
+            msg, channel=ctx.channel, recipient=ctx.thread.recipient, author=ctx.message.author
+        )
+        ctx.message.content = msg
+        async with ctx.typing():
+            await ctx.thread.reply(ctx.message, anonymous=True, plain=True)
+
     @commands.command(aliases=["anonreply", "anonymousreply"])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()

core/config.py

@@ -91,6 +91,7 @@ class ConfigManager:
         "silent_alert_on_mention": False,
         "show_timestamp": True,
         "anonymous_snippets": False,
+        "plain_snippets": False,
         "require_close_reason": False,
         # group conversations
         "private_added_to_group_title": "New Thread (Group)",
@@ -207,6 +208,7 @@ class ConfigManager:
         "update_notifications",
         "thread_contact_silently",
         "anonymous_snippets",
+        "plain_snippets",
         "require_close_reason",
         "recipient_thread_close",
         "thread_show_roles",

core/config_help.json

@@ -794,7 +794,17 @@
       "`{prefix}config set anonymous_snippets yes`"
     ],
     "notes": [
-      "See also: `anon_avatar_url`, `anon_tag`."
+      "See also: `anon_avatar_url`, `anon_tag`, `plain_snippets`."
+    ]
+  },
+  "plain_snippets": {
+    "default": "No",
+    "description": "Sends snippets with a plain interface.",
+    "examples":[
+      "`{prefix}config set plain_snippets yes`"
+    ],
+    "notes": [
+      "See also: `anonymous_snippets`."
     ]
   },
   "require_close_reason": {