v3.0.2

Author: Taaku18

bot.py

@@ -398,7 +398,7 @@ async def on_ready(self):
                 silent=items["silent"],
                 delete_channel=items["delete_channel"],
                 message=items["message"],
-                auto_close=items.get("auto_close", False)
+                auto_close=items.get("auto_close", False),
             )
 
         logger.info(LINE)
@@ -440,9 +440,22 @@ async def retrieve_emoji(self) -> typing.Tuple[str, str]:
 
         return sent_emoji, blocked_emoji
 
-    async def process_modmail(self, message: discord.Message) -> None:
-        """Processes messages sent to the bot."""
+    async def _process_blocked(self, message: discord.Message) -> bool:
         sent_emoji, blocked_emoji = await self.retrieve_emoji()
+
+        if str(message.author.id) in self.config.blocked_whitelist:
+            if str(message.author.id) in self.blocked_users:
+                del self.config.blocked[str(message.author.id)]
+                await self.config.update()
+
+            if sent_emoji != "disable":
+                try:
+                    await message.add_reaction(sent_emoji)
+                except (discord.HTTPException, discord.InvalidArgument):
+                    pass
+
+            return False
+
         now = datetime.utcnow()
 
         account_age = self.config.get("account_age")
@@ -579,8 +592,12 @@ async def process_modmail(self, message: discord.Message) -> None:
                 await message.add_reaction(reaction)
             except (discord.HTTPException, discord.InvalidArgument):
                 pass
+        return str(message.author.id) in self.blocked_users
 
-        if str(message.author.id) not in self.blocked_users:
+    async def process_modmail(self, message: discord.Message) -> None:
+        """Processes messages sent to the bot."""
+        blocked = await self._process_blocked(message)
+        if not blocked:
             thread = await self.threads.find_or_create(message.author)
             await thread.send(message)
 

cogs/modmail.py

@@ -759,7 +759,7 @@ async def contact(
 
         await ctx.send(embed=embed)
 
-    @commands.command()
+    @commands.group(invoke_without_command=True)
     @checks.has_permissions(PermissionLevel.MODERATOR)
     @trigger_typing
     async def blocked(self, ctx):
@@ -804,6 +804,63 @@ async def blocked(self, ctx):
 
         await PaginatorSession(ctx, *embeds).run()
 
+    @blocked.command(name="whitelist")
+    @checks.has_permissions(PermissionLevel.MODERATOR)
+    @trigger_typing
+    async def blocked_whitelist(self, ctx, *, user: User = None):
+        """
+        Whitelist or un-whitelist a user from getting blocked.
+
+        Useful for preventing users from getting blocked by account_age/guild_age restrictions.
+        """
+        if user is None:
+            thread = ctx.thread
+            if thread:
+                user = thread.recipient
+            else:
+                return await ctx.send_help(ctx.command)
+
+        mention = getattr(user, "mention", f"`{user.id}`")
+        msg = ""
+
+        if str(user.id) in self.bot.config.blocked_whitelist:
+            embed = discord.Embed(
+                title="Success",
+                description=f"{mention} is no longer whitelisted.",
+                color=self.bot.main_color,
+            )
+            self.bot.config.blocked_whitelist.remove(str(user.id))
+            return await ctx.send(embed=embed)
+
+        self.bot.config.blocked_whitelist.append(str(user.id))
+
+        if str(user.id) in self.bot.blocked_users:
+            msg = self.bot.blocked_users.get(str(user.id))
+            if msg is None:
+                msg = ""
+            del self.bot.config.blocked[str(user.id)]
+
+        await self.bot.config.update()
+
+        if msg.startswith("System Message: "):
+            # If the user is blocked internally (for example: below minimum account age)
+            # Show an extended message stating the original internal message
+            reason = msg[16:].strip().rstrip(".") or "no reason"
+            embed = discord.Embed(
+                title="Success",
+                description=f"{mention} was previously blocked internally due to "
+                f'"{reason}". {mention} is now whitelisted.',
+                color=self.bot.main_color,
+            )
+        else:
+            embed = discord.Embed(
+                title="Success",
+                color=self.bot.main_color,
+                description=f"{mention} is now whitelisted.",
+            )
+
+        return await ctx.send(embed=embed)
+
     @commands.command()
     @checks.has_permissions(PermissionLevel.MODERATOR)
     @trigger_typing
@@ -832,6 +889,16 @@ async def block(
             else:
                 raise commands.BadArgument(f'User "{after.arg}" not found')
 
+        mention = getattr(user, "mention", f"`{user.id}`")
+
+        if str(user.id) in self.bot.config.blocked_whitelist:
+            embed = discord.Embed(
+                title="Error",
+                description=f"Cannot block {mention}, user is whitelisted.",
+                color=discord.Color.red(),
+            )
+            return await ctx.send(embed=embed)
+
         if after is not None:
             reason = after.arg
             if reason.startswith("System Message: "):
@@ -846,8 +913,6 @@ async def block(
         if not reason:
             reason = None
 
-        mention = user.mention if hasattr(user, "mention") else f"`{user.id}`"
-
         extend = f" for `{reason}`" if reason is not None else ""
         msg = self.bot.blocked_users.get(str(user.id), "")
 
@@ -901,7 +966,7 @@ async def unblock(self, ctx, *, user: User = None):
             else:
                 raise commands.MissingRequiredArgument(param(name="user"))
 
-        mention = user.mention if hasattr(user, "mention") else f"`{user.id}`"
+        mention = getattr(user, "mention", f"`{user.id}`")
 
         if str(user.id) in self.bot.blocked_users:
             msg = self.bot.blocked_users.get(str(user.id))
@@ -920,6 +985,11 @@ async def unblock(self, ctx, *, user: User = None):
                     f'"{reason}". {mention} is no longer blocked.',
                     color=self.bot.main_color,
                 )
+                embed.set_footer(
+                    text="However, if the original system block reason still apply, "
+                    f"{mention} will be automatically blocked again. Use "
+                    f'"{self.bot.prefix}blocked whitelist {mention}" to whitelist the user.'
+                )
             else:
                 embed = discord.Embed(
                     title="Success",

core/config.py

@@ -62,6 +62,7 @@ class ConfigManager:
         "oauth_whitelist",
         # moderation
         "blocked",
+        "blocked_whitelist",
         "command_permissions",
         "level_permissions",
         # threads
@@ -126,6 +127,7 @@ def populate_cache(self) -> dict:
             "plugins": [],
             "aliases": {},
             "blocked": {},
+            "blocked_whitelist": [],
             "oauth_whitelist": [],
             "command_permissions": {},
             "level_permissions": {},

core/thread.py

@@ -209,7 +209,7 @@ async def close(
                 "silent": silent,
                 "delete_channel": delete_channel,
                 "message": message,
-                "auto_close": auto_close
+                "auto_close": auto_close,
             }
             self.bot.config.closures[str(self.id)] = items
             await self.bot.config.update()