Merge pull request #358 from Weirdllamas/feature

Features: Show Message ID and Thread_Move_Notify

Author: Taaku18

CHANGELOG.md

@@ -12,6 +12,8 @@ however, insignificant breaking changes does not guarantee a major version bump,
 
 - Ability to change permission levels of individual commands.
   - See `?permissions override` for more information.
+- `thread_move_notify` and `thread_move_response` to notify recipients if a thread is moved.
+- IDs of messages sent to Modmail are now viewable.
 
 ### Fixed
 

cogs/modmail.py

@@ -17,7 +17,7 @@
 from core.models import PermissionLevel
 from core.paginator import EmbedPaginatorSession
 from core.time import UserFriendlyTime, human_timedelta
-from core.utils import format_preview, User, create_not_found_embed, format_description
+from core.utils import format_preview, User, create_not_found_embed, format_description, strtobool
 
 logger = logging.getLogger("Modmail")
 
@@ -286,14 +286,35 @@ async def snippet_edit(self, ctx, name: str.lower, *, value):
     @commands.command()
     @checks.has_permissions(PermissionLevel.MODERATOR)
     @checks.thread_only()
-    async def move(self, ctx, *, category: discord.CategoryChannel):
+    async def move(self, ctx, category: discord.CategoryChannel, *, specifics: str = None):
         """
         Move a thread to another category.
 
         `category` may be a category ID, mention, or name.
+        `specifics` is a string which takes in arguments on how to perform the move. Ex: "silently"
         """
         thread = ctx.thread
+        silent = False
+
+        if specifics:
+            silent_words = ['silent', 'silently']
+            silent = any(word in silent_words for word in specifics.split())
+
         await thread.channel.edit(category=category, sync_permissions=True)
+
+        try:
+            thread_move_notify = strtobool(self.bot.config["thread_move_notify"])
+        except ValueError:
+            thread_move_notify = self.bot.config.remove("thread_move_notify")
+
+        if thread_move_notify and not silent:
+            embed = discord.Embed(
+                title="Thread Moved",
+                description=self.bot.config["thread_move_response"],
+                color=self.bot.main_color
+
+            await thread.recipient.send(embed=embed)
+
         sent_emoji, _ = await self.bot.retrieve_emoji()
         try:
             await ctx.message.add_reaction(sent_emoji)

core/config.py

@@ -53,6 +53,8 @@ class ConfigManager:
         "thread_close_title": "Thread Closed",
         "thread_close_response": "{closer.mention} has closed this Modmail thread.",
         "thread_self_close_response": "You have closed this Modmail thread.",
+        "thread_move_notify": False,
+        "thread_move_response": "This thread has been moved.",
         # moderation
         "recipient_color": str(discord.Color.gold()),
         "mod_color": str(discord.Color.green()),
@@ -109,6 +111,7 @@ class ConfigManager:
         "reply_without_command",
         "recipient_thread_close",
         "thread_auto_close_silently",
+        "thread_move_notify",
     }
 
     defaults = {**public_keys, **private_keys, **protected_keys}

core/config_help.json

@@ -300,6 +300,28 @@
       "See also: `thread_close_title`, `thread_close_footer`, `thread_close_response`."
     ]
   },
+  "thread_move_notify": {
+    "default": "No",
+    "description": "Notify the recipient if the thread was moved.",
+    "examples": [
+      "`{prefix}config set thread_move_notify yes`",
+      "`{prefix}config set thread_move_notify no`"
+    ],
+    "notes": [
+      "See also: `thread_move_response`."
+    ]
+  },
+  "thread_move_response": {
+    "default": "This thread has been moved.",
+    "description": "This is the message to display to the user when the thread is moved.",
+    "examples": [
+      "`{prefix}config set thread_move_response This thread has been moved to another category for review!`"
+    ],
+    "notes": [
+      "Only has an effect when `thread_move_notify` is on.",
+      "See also: `thread_move_notify`."
+    ]
+  },
   "recipient_color": {
     "default": "Discord Gold [#F1C40F](https://placehold.it/100/f1c40f?text=+)",
     "description": "This is the color of the messages sent by the recipient, this applies to messages received in the thread channel.",
@@ -446,4 +468,4 @@
       "This configuration can only to be set through `.env` file or environment (config) variables."
     ]
   }
-}
+}

core/thread.py

@@ -763,7 +763,7 @@ async def send(
         elif note:
             embed.colour = discord.Color.blurple()
         else:
-            embed.set_footer(text=f"Recipient")
+            embed.set_footer(text=f"Message ID: {message.id}")
             embed.colour = self.bot.recipient_color
 
         try: