Fix contact with category and silent, #3076

Author: fourjr

CHANGELOG.md

@@ -19,6 +19,7 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 - Blocked users are now no longer allowed to use `?contact` and react to contact. ([COMMENT #819004157](https://github.com/kyb3r/modmail/issues/2969#issuecomment-819004157), [PR #3027](https://github.com/kyb3r/modmail/pull/3027))
 - UnicodeEncodeError will no longer be raised on Windows. ([PR #3043](https://github.com/kyb3r/modmail/pull/3043))
 - Notifications are no longer duplicated when using both `?notify` and `subscribe`. ([PR #3015](https://github.com/kyb3r/modmail/pull/3015))
+- `?contact` now works properly with both category and silent. ([GH #3076](https://github.com/kyb3r/modmail/issues/3076))
 
 ## Internal
 

bot.py

@@ -284,7 +284,7 @@ def _cancel_tasks():
                     loop.run_until_complete(loop.shutdown_asyncgens())
             finally:
                 logger.info("Closing the event loop.")
-                loop.close()
+                # loop.close()
 
         if not future.cancelled():
             try:

cogs/modmail.py

@@ -1038,7 +1038,14 @@ async def contact(
         if isinstance(category, str):
             if "silent" in category or "silently" in category:
                 silent = True
-            category = None
+                category = category.strip("silently").strip("silent").strip()
+                try:
+                    category = await SimilarCategoryConverter().convert(ctx, category)  # attempt to find a category again
+                except commands.BadArgument:
+                    category = None
+
+            if isinstance(category, str):
+                category = None
 
         if user.bot:
             embed = discord.Embed(color=self.bot.error_color, description="Cannot start a thread with a bot.")

core/thread.py

@@ -487,10 +487,17 @@ async def _close(self, closer, silent=False, delete_channel=True, message=None,
         if self.bot.config["show_timestamp"]:
             embed.timestamp = datetime.utcnow()
 
+        if not message:
+            if self.id == closer.id:
+                message = self.bot.config["thread_self_close_response"]
+            else:
+                message = self.bot.config["thread_close_response"]
+
         message = self.bot.formatter.format(
             message, closer=closer, loglink=log_url, logkey=log_data["key"] if log_data else None
         )
 
+        embed.description = message
         footer = self.bot.config["thread_close_footer"]
         embed.set_footer(text=footer, icon_url=self.bot.guild.icon_url)