refactor: move everything to flat hiearchy, lots of in-file changes

- bot now uses loguru as logger.xxx instead of log.xxx for simplicity
- bot now prints the Cog loaded: in the load_cogs function instead of in every cogs setup()
- removed report message as it's sort of useless with tickets and the way discord reports work makes it unnecessarily confusing, cool idea
- changed cogs from XXXCommands and XXXListeners to just XXXCog
- replaced some legacy dataset code in BanCog
- removed unnecessary functions in boost.py
- too lazy to finish this up!

Author: Snaacky

chiya/bot.py

@@ -1,12 +1,12 @@
 import asyncio
 import glob
+import logging
 import os
 import sys
-import logging
 
 import discord
 from discord.ext import commands
-from loguru import logger as log
+from loguru import logger
 
 from chiya import database  # noqa
 from chiya.config import config
@@ -23,7 +23,7 @@
 @bot.event
 async def on_ready() -> None:
     "Called when the client is done preparing the data received from Discord."
-    log.info(f"Logged in as: {str(bot.user)}")
+    logger.info(f"Logged in as: {str(bot.user)}")
     await bot.tree.sync(guild=discord.Object(config.guild_id))
 
 
@@ -37,7 +37,7 @@ async def setup_logger():
     log_level = config.bot.log_level
     if not log_level:
         log_level = "NOTSET"
-    log.remove()
+    logger.remove()
 
     class InterceptHandler(logging.Handler):
         "Setup up an Interceptor class to redirect all logs from the standard logging library to loguru."
@@ -46,11 +46,11 @@ def emit(self, record: logging.LogRecord) -> None:
             # Get corresponding Loguru level if it exists.
             level: str | int
             try:
-                level = log.level(record.levelname).name
+                level = logger.level(record.levelname).name
             except ValueError:
                 level = record.levelno
 
-            log.opt(exception=record.exc_info).log(level, record.getMessage())
+            logger.opt(exception=record.exc_info).log(level, record.getMessage())
 
     # TODO: Replace deprecated getLevelName call
     discord.utils.setup_logging(
@@ -59,15 +59,16 @@ def emit(self, record: logging.LogRecord) -> None:
 
     # TODO: Replace with pathlib
     fmt = "<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan> | <level>{message}</level>"
-    log.add(sys.stdout, format=fmt, level=log_level, backtrace=False)
-    log.add(os.path.join("logs", "bot.log"), format=fmt, rotation="1 day")
+    logger.add(sys.stdout, format=fmt, level=log_level, backtrace=False)
+    logger.add(os.path.join("logs", "bot.log"), format=fmt, rotation="1 day")
 
 
 async def load_cogs():
     # TODO: Replace with pathlib
     # TODO: Honestly, rewrite this logic, it's so icky
     for cog in glob.iglob(os.path.join("cogs", "**", "[!^_]*.py"), root_dir="chiya", recursive=True):
         await bot.load_extension(cog.replace("/", ".").replace("\\", ".").replace(".py", ""))
+        logger.info(f"Cog loaded: {list(bot.cogs.keys())[-1]}")
 
 
 if __name__ == "__main__":

chiya/cogs/apps/report_message.py

@@ -1,17 +1,17 @@
 import time
 
+import arrow
 import discord
 from discord import app_commands
 from discord.ext import commands
-from loguru import logger as log
 
-from chiya import database
 from chiya.config import config
+from chiya.database import ModLog
 from chiya.utils import embeds
 from chiya.utils.helpers import can_action_member, log_embed_to_channel
 
 
-class BansCommands(commands.Cog):
+class BanCog(commands.Cog):
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
 
@@ -93,18 +93,13 @@ async def ban(
                 ),
             )
 
-        db = database.Database().get()
-        db["mod_logs"].insert(
-            dict(
-                user_id=user.id,
-                mod_id=ctx.user.id,
-                timestamp=int(time.time()),
-                reason=reason,
-                type="ban",
-            )
-        )
-        db.commit()
-        db.close()
+        ModLog(
+            user_id=user.id,
+            mod_id=ctx.user.id,
+            timestamp=arrow.utcnow().timestamp(),
+            reason=reason,
+            type="ban",
+        ).save()
 
         await ctx.guild.ban(user=user, reason=reason, delete_message_days=daystodelete or 0)
         await ctx.followup.send(embed=mod_embed)
@@ -140,18 +135,35 @@ async def unban(self, ctx: discord.Interaction, user: discord.Member | discord.U
             color=discord.Color.green(),
         )
 
-        db = database.Database().get()
-        db["mod_logs"].insert(
-            dict(user_id=user.id, mod_id=ctx.user.id, timestamp=int(time.time()), reason=reason, type="unban")
-        )
-        db.commit()
-        db.close()
+        ModLog(
+            user_id=user.id,
+            mod_id=ctx.user.id,
+            timestamp=arrow.utcnow().timestamp(),
+            reason=reason,
+            type="unban",
+        ).save()
 
         await ctx.guild.unban(user, reason=reason)
         await ctx.followup.send(embed=mod_embed)
         await log_embed_to_channel(ctx=ctx, embed=mod_embed)
 
+    @commands.Cog.listener()
+    async def on_member_ban(self, guild: discord.Guild, user: discord.Member | discord.User) -> None:
+        """
+        Add the user's ban entry to the database if they were banned manually.
+        """
+        # TODO: Emit an embed in #moderation when this happens
+        ban_entry = await guild.fetch_ban(user)
+        logs = [log async for log in guild.audit_logs(limit=1, action=discord.AuditLogAction.ban)]
+        if logs[0].user != self.bot.user:
+            ModLog(
+                user_id=user.id,
+                mod_log=logs[0].user.id,
+                timestamp=int(time.time()),
+                reason=ban_entry.reason,
+                type="ban",
+            )
+
 
 async def setup(bot: commands.Bot) -> None:
-    await bot.add_cog(BansCommands(bot))
-    log.info("Commands loaded: ban")
+    await bot.add_cog(BanCog(bot))