feat(aurora): implemented the per-type configuration options so they actually do something

aurora/utilities/factory.py

@@ -64,7 +64,11 @@ async def message_factory(
         timestamp=datetime.now(),
     )
 
-    if await config.guild(guild).show_moderator() and moderator is not None:
+    show_moderator = await config.custom("types", guild.id, moderation_type.key).show_moderator()
+    if show_moderator is None:
+        show_moderator = await config.guild(guild).show_moderator()
+
+    if show_moderator and moderator is not None:
         embed.add_field(
             name="Moderator", value=f"`{moderator.name} ({moderator.id})`", inline=False
         )
@@ -572,10 +576,12 @@ async def type_embed(ctx: commands.Context, moderation_type = Type) -> Embed:
     guild_str = "\n".join(guild_str)
 
     e = await _config(ctx)
-    e.title += ": Server Configuration"
+    e.title += f": {moderation_type.string} Configuration"
     e.description = (
-        """
-    Use the buttons below to manage Aurora's server configuration.\n
+    f"""
+    Use the buttons below to manage Aurora's configuration for the {moderation_type.string} moderation type.
+    If an option has a question mark (\N{BLACK QUESTION MARK ORNAMENT}\N{VARIATION SELECTOR-16}) next to it, Aurora will default to the guild level setting instead.
+    See `{ctx.prefix}aurora set guild` for more information.\n
     """
         + guild_str
     )

aurora/utilities/moderate.py

@@ -28,13 +28,16 @@ async def moderate(ctx: Union[commands.Context, discord.Interaction], target: di
         ctx = await commands.Context.from_interaction(interaction)
         if isinstance(interaction.command, app_commands.ContextMenu):
             ctx.author = interaction.user
-    if not await check_moddable(target, ctx, permissions):
+    if not await check_moddable(target=target, ctx=ctx, permissions=permissions, moderation_type=moderation_type):
         return
     if silent is None:
-        silent = not await config.guild(ctx.guild).dm_users()
+        dm_users = await config.custom("types", ctx.guild.id, moderation_type.key).dm_users()
+        if dm_users is None:
+            dm_users = await config.guild(ctx.guild).dm_users()
+        silent = not dm_users
     return await moderation_type.handler(
-        ctx,
-        target,
-        silent,
+        ctx=ctx,
+        target=target,
+        silent=silent,
         **kwargs
     )

aurora/utilities/utils.py

@@ -9,6 +9,7 @@ from discord.errors import Forbidden
 from redbot.core import commands, data_manager
 from redbot.core.utils.chat_formatting import error
 
+from ..models.type import Type
 from ..utilities.config import config
 from ..utilities.json import dumps
 from ..utilities.logger import logger
@@ -43,10 +44,15 @@ def check_permissions(
 
 
 async def check_moddable(
-    target: Union[User, Member, TextChannel], ctx: commands.Context, permissions: Tuple[str]
+    target: Union[User, Member, TextChannel], ctx: commands.Context, permissions: Tuple[str], moderation_type: Type,
 ) -> bool:
     """Checks if a moderator can moderate a target."""
     is_channel = isinstance(target, TextChannel)
+
+    use_discord_permissions = await config.custom("types", ctx.guild.id, moderation_type.key).use_discord_permissions()
+    if use_discord_permissions is None:
+        use_discord_permissions = await config.guild(ctx.guild).use_discord_permissions()
+
     if check_permissions(ctx.bot.user, permissions, guild=ctx.guild):
         await ctx.send(
             error(
@@ -56,7 +62,7 @@ async def check_moddable(
         )
         return False
 
-    if await config.guild(ctx.guild).use_discord_permissions() is True:
+    if use_discord_permissions is True:
         if check_permissions(ctx.author, permissions, guild=ctx.guild):
             await ctx.send(
                 error(