v3.2.0 dev

Author: Taaku18

CHANGELOG.md

@@ -1,10 +1,28 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes does not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319).
 
+# v3.2.0
+
+### Added
+
+- Ability to change permission levels of individual commands.
+  - See `?permissions override` for more information.
+
+### Fixed
+
+- `?help <some sub command>`, will return `Perhaps you meant: <some sub command>`, now its fixed.
+  - For example, `?help add` used to return `Perhaps you meant: add`, now it wouldn't do this.
+- Aliases and Permissions command names are always saved lowercase now.
+
+### Internal
+
+- Use regex to parse Changes, Added, Fixed, etc and description.
+
 # v3.1.1
 
 ### Fixed

README.md

@@ -82,7 +82,9 @@ This list is ever-growing thanks to active development and our exceptional contr
 
 ## Installation
 
-Where is the Modmail bot invite link? Unfortunately, due to how this bot functions, it cannot be invited. This is to ensure the individuality to your server and grant you full control over your bot and data. Nonetheless, you can easily obtain a free copy of Modmail for your server by following one of the methods listed below (roughly takes 15 minutes of your time):
+Where can I find the Modmail bot invite link? 
+
+Unfortunately, due to how this bot functions, it cannot be invited. This is to ensure the individuality to your server and grant you full control over your bot and data. Nonetheless, you can easily obtain a free copy of Modmail for your server by following one of the methods listed below (roughly takes 15 minutes of your time)...
 
 ### Heroku
 
@@ -104,7 +106,7 @@ If you don't want to go through the trouble of setting up your very own Modmail
 
 ### Locally
 
-Local hosting of Modmail is also possible, first you will need [`python 3.7`](https://www.python.org/downloads/).
+Local hosting of Modmail is also possible, first you will need [`Python 3.7`](https://www.python.org/downloads/).
 
 Follow the [**installation guide**](https://github.com/kyb3r/modmail/wiki/Installation) and disregard deploying the Heroku bot application. If you run into any problems, join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for help and support.
 

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.1.1"
+__version__ = "3.2.0"
 
 import asyncio
 import logging
@@ -382,6 +382,34 @@ def recipient_color(self) -> int:
     def main_color(self) -> int:
         return self._parse_color("main_color")
 
+    def command_perm(self, command_name: str) -> PermissionLevel:
+        level = self.config["override_command_level"].get(command_name)
+        if level is not None:
+            try:
+                return PermissionLevel[level.upper()]
+            except KeyError:
+                logger.warning(
+                    "Invalid override_command_level for command %s.", command_name
+                )
+                self.config["override_command_level"].pop(command_name)
+
+        command = self.get_command(command_name)
+        if command is None:
+            logger.debug("Command %s not found.", command_name)
+            return PermissionLevel.INVALID
+        level = next(
+            (
+                check.permission_level
+                for check in command.checks
+                if hasattr(check, "permission_level")
+            ),
+            None,
+        )
+        if level is None:
+            logger.debug("Command %s does not have a permission level.", command_name)
+            return PermissionLevel.INVALID
+        return level
+
     async def on_connect(self):
         logger.line()
         try:
@@ -1039,12 +1067,23 @@ async def on_command_error(self, context, exception):
             await context.send_help(context.command)
         elif isinstance(exception, commands.CheckFailure):
             for check in context.command.checks:
-                if not await check(context) and hasattr(check, "fail_msg"):
-                    await context.send(
-                        embed=discord.Embed(
-                            color=discord.Color.red(), description=check.fail_msg
+                if not await check(context):
+                    if hasattr(check, "fail_msg"):
+                        await context.send(
+                            embed=discord.Embed(
+                                color=discord.Color.red(), description=check.fail_msg
+                            )
+                        )
+                    if hasattr(check, 'permission_level'):
+                        corrected_permission_level = self.command_perm(
+                            context.command.qualified_name
+                        )
+                        logger.warning(
+                            "User %s does not have permission to use this command: `%s` (%s).",
+                            context.author.name,
+                            context.command.qualified_name,
+                            corrected_permission_level.name,
                         )
-                    )
             logger.warning("CheckFailure: %s", exception)
         else:
             logger.error("Unexpected exception:", exc_info=exception)

cogs/modmail.py

@@ -912,10 +912,10 @@ async def blocked(self, ctx):
                 line = mention + f" - `{reason or 'No reason provided'}`\n"
                 if len(embed.description) + len(line) > 2048:
                     embed = discord.Embed(
-                            title="Blocked Users (Continued)",
-                            color=self.bot.main_color,
-                            description=line,
-                        )
+                        title="Blocked Users (Continued)",
+                        color=self.bot.main_color,
+                        description=line,
+                    )
                     embeds.append(embed)
                 else:
                     embed.description += line