thread_auto_close_silently + some fixes

Author: Taaku18

CHANGELOG.md

@@ -12,21 +12,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `disable_recipient_thread_close` is removed, a new configuration variable `recipient_thread_close` replaces it which defaults to False.
 - Truthy and falsy values for binary configuration variables are now interpreted respectfully.
 
+### Added
+
+- `?sfw`, mark a thread as "safe for work", undos `?nsfw`.
+- New config variable, `thread_auto_close_silently`, when set to a truthy value, no message will be sent when thread is auto-closed.
+- New configuration variable `thread_self_closable_creation_footer` — the footer when `recipient_thread_close` is enabled.
+
 ### Changes
 
 - `thread_auto_close_response` has a configurable variable `{timeout}`.
-- New configuration variable `thread_self_closable_creation_footer`, the footer when `recipient_thread_close` is enabled.
 - `?snippet` is now the default command name instead of `?snippets` (`?snippets` is still usable). This is to make this consistent with `?alias`/`?aliases`.
 
 ### Fixes
 
 - `?notify` no longer carries over to the next thread.
 - `discord.NotFound` errors for `on_raw_reaction_add`.
 - `mod_typing` and `user_typing` will no longer show when user is blocked.
-
-### Added
-
-- `?sfw`, mark a thread as "safe for work", undos `?nsfw`.
+- Better `?block` usage message.
+- Resolves errors when message was sent by mods after thread is closed somehow.
 
 ### Internal
 

cogs/modmail.py

@@ -917,7 +917,7 @@ async def blocked_whitelist(self, ctx, *, user: User = None):
 
         return await ctx.send(embed=embed)
 
-    @commands.command()
+    @commands.command(usage="[user] [duration] [close message]")
     @checks.has_permissions(PermissionLevel.MODERATOR)
     @trigger_typing
     async def block(
@@ -931,7 +931,7 @@ async def block(
         Leave `user` blank when this command is used within a
         thread channel to block the current recipient.
         `user` may be a user ID, mention, or name.
-        `after` may be a simple "human-readable" time text. See `{prefix}help close` for examples.
+        `duration` may be a simple "human-readable" time text. See `{prefix}help close` for examples.
         """
 
         reason = ""

core/config.py

@@ -42,6 +42,7 @@ class ConfigManager:
         "blocked_emoji": "🚫",
         "close_emoji": "🔒",
         "recipient_thread_close": False,
+        "thread_auto_close_silently": False,
         "thread_auto_close": 0,
         "thread_auto_close_response": "This thread has been closed automatically due to inactivity after {timeout}.",
         "thread_creation_response": "The staff team will get back to you as soon as possible.",
@@ -106,6 +107,7 @@ class ConfigManager:
         "mod_typing",
         "reply_without_command",
         "recipient_thread_close",
+        "thread_auto_close_silently"
     }
 
     defaults = {**public_keys, **private_keys, **protected_keys}

core/thread.py

@@ -232,7 +232,11 @@ async def close(
     async def _close(
         self, closer, silent=False, delete_channel=True, message=None, scheduled=False
     ):
-        self.manager.cache.pop(self.id)
+        try:
+            self.manager.cache.pop(self.id)
+        except KeyError:
+            logger.warning('Thread already closed.', exc_info=True)
+            return
 
         await self.cancel_closure(all=True)
 
@@ -396,6 +400,21 @@ async def _restart_close_timer(self):
         reset_time = datetime.utcnow() + timedelta(seconds=seconds)
         human_time = human_timedelta(dt=reset_time)
 
+        try:
+            thread_auto_close_silently = strtobool(
+                self.bot.config["thread_auto_close_silently"]
+            )
+        except ValueError:
+            thread_auto_close_silently = self.bot.config.remove("thread_auto_close_silently")
+
+        if thread_auto_close_silently:
+            return await self.close(
+                closer=self.bot.user,
+                silent=True,
+                after=int(seconds),
+                auto_close=True,
+            )
+
         # Grab message
         close_message = self.bot.config["thread_auto_close_response"].format(
             timeout=human_time
@@ -674,7 +693,11 @@ async def send(
             # noinspection PyUnresolvedReferences,PyDunderSlots
             embed.color = self.bot.recipient_color  # pylint: disable=E0237
 
-        await destination.trigger_typing()
+        try:
+            await destination.trigger_typing()
+        except discord.NotFound:
+            logger.warning('Channel not found.', exc_info=True)
+            return
 
         if not from_mod and not note:
             mentions = self.get_notifications()