misc help and return user_typing

Author: Taaku18

CHANGELOG.md

@@ -21,6 +21,7 @@ however, insignificant breaking changes does not guarantee a major version bump,
 - Added a minimalistic version of requirements.txt (named requirements.min.txt) that contains only the absolute minimum of Modmail.
   - For users having trouble with pipenv or any other reason.
 - Multi-step alias, see `?help alias add`. Public beta testing, might be unstable.
+- Misc commands without cogs are now displayed in `?help`.
 
 ### Changes
 
@@ -38,7 +39,7 @@ however, insignificant breaking changes does not guarantee a major version bump,
 
 - `?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.
+- `mod_typing` ~~and `user_typing`~~ (`user_typing` is by-design to show now) will no longer show when user is blocked.
 - Better `?block` usage message.
 - Resolves errors when message was sent by mods after thread is closed somehow.
 - Recipient join/leave server messages are limited to only the guild set by `GUILD_ID`.

bot.py

@@ -838,13 +838,6 @@ async def _void(*_args, **_kwargs):
             pass
 
         if isinstance(channel, discord.DMChannel):
-            if await self._process_blocked(
-                SimpleNamespace(
-                    author=user, channel=SimpleNamespace(send=_void), add_reaction=_void
-                )
-            ):
-                return
-
             try:
                 user_typing = strtobool(self.config["user_typing"])
             except ValueError:

cogs/utility.py

@@ -39,13 +39,13 @@
 
 
 class ModmailHelpCommand(commands.HelpCommand):
-    async def format_cog_help(self, cog):
+    async def format_cog_help(self, cog, *, no_cog=False):
         bot = self.context.bot
         prefix = self.clean_prefix
 
         formats = [""]
         for cmd in await self.filter_commands(
-            cog.get_commands(), sort=True, key=get_perm_level
+            cog.get_commands() if not no_cog else cog, sort=True, key=get_perm_level
         ):
             perm_level = get_perm_level(cmd)
             if perm_level is PermissionLevel.INVALID:
@@ -63,16 +63,19 @@ async def format_cog_help(self, cog):
 
         embeds = []
         for format_ in formats:
+            description = cog.description or "No description." \
+                if not no_cog else "Miscellaneous commands without a category."
             embed = Embed(
-                description=f'*{cog.description or "No description."}*',
+                description=f'*{description}*',
                 color=bot.main_color,
             )
 
             embed.add_field(name="Commands", value=format_ or "No commands.")
 
             continued = " (Continued)" if embeds else ""
+            name = cog.qualified_name + " - Help" if not no_cog else "Miscellaneous Commands"
             embed.set_author(
-                name=cog.qualified_name + " - Help" + continued,
+                name=name + continued,
                 icon_url=bot.user.avatar_url,
             )
 
@@ -88,9 +91,8 @@ def process_help_msg(self, help_: str):
 
     async def send_bot_help(self, mapping):
         embeds = []
-        # TODO: Implement for no cog commands
-
-        cogs = list(filter(None, mapping))
+        no_cog_commands = sorted(mapping.pop(None), key=lambda c: c.qualified_name)
+        cogs = sorted(mapping, key=lambda c: c.qualified_name)
 
         bot = self.context.bot
 
@@ -105,6 +107,8 @@ async def send_bot_help(self, mapping):
 
         for cog in default_cogs:
             embeds.extend(await self.format_cog_help(cog))
+        if no_cog_commands:
+            embeds.extend(await self.format_cog_help(no_cog_commands, no_cog=True))
 
         p_session = PaginatorSession(
             self.context, *embeds, destination=self.get_destination()

core/config.py

@@ -115,7 +115,6 @@ class ConfigManager:
 
     def __init__(self, bot):
         self.bot = bot
-        self.api = self.bot.api
         self._cache = {}
         self.ready_event = asyncio.Event()
 
@@ -207,11 +206,11 @@ async def clean_data(self, key: str, val: typing.Any) -> typing.Tuple[str, str]:
 
     async def update(self):
         """Updates the config with data from the cache"""
-        await self.api.update_config(self.filter_default(self._cache))
+        await self.bot.api.update_config(self.filter_default(self._cache))
 
     async def refresh(self) -> dict:
         """Refreshes internal cache with data from database"""
-        for k, v in (await self.api.get_config()).items():
+        for k, v in (await self.bot.api.get_config()).items():
             k = k.lower()
             if k in self.all_keys:
                 self._cache[k] = v

core/utils.py

@@ -8,8 +8,6 @@
 import discord
 from discord.ext import commands
 
-from core.models import PermissionLevel
-
 
 def strtobool(val):
     if isinstance(val, bool):
@@ -194,7 +192,9 @@ def match_user_id(text: str) -> int:
     return -1
 
 
-def get_perm_level(cmd) -> PermissionLevel:
+def get_perm_level(cmd):
+    from core.models import PermissionLevel
+
     for check in cmd.checks:
         perm = getattr(check, "permission_level", None)
         if perm is not None: