feat: add moderation commands

.gitignore

@@ -1,7 +1,6 @@
 
 # Python Stuffs
 __pycache__/
-
 # Config Stuffs
 .env
 
@@ -10,4 +9,7 @@ aerich.ini
 migrations/
 
 # Cache
-*.pickle
+*.pickle
+
+# Random Stuff
+test.py

.vscode/settings.json

@@ -10,5 +10,7 @@
       "source.organizeImports": true
     }
   },
-  "python.linting.pylintEnabled": false
-}
+  "python.linting.pylintEnabled": false,
+  "python.linting.flake8Enabled": false,
+  "python.linting.enabled": false
+}

models.py

@@ -22,6 +22,9 @@ class GuildModel(CustomModel):
         max_length=10,
         description="Custom Prefix for the guild",
     )
+    mod_log_channel = fields.BigIntField(
+        description="Mod Log channel for the guild!", null=True
+    )
 
     class Meta:
         """Class to set the table name and description"""
@@ -63,3 +66,37 @@ class Meta:
         table = "autoresponses"
         table_description = "Represents the autoresponses for each GuildModel"
         unique_together = (("guild", "trigger"),)
+
+
+class ModerationRoles(CustomModel):
+    id = fields.IntField(pk=True)
+    admin_role = fields.BigIntField(description="ID of the Admin role", null=True)
+    mod_role = fields.BigIntField(description="ID of the Mod role", null=True)
+    moderation_role = fields.BigIntField(
+        description="ID of the General Moderation Role", null=True
+    )
+    guild = fields.ForeignKeyField("main.GuildModel", related_name="ModerationRoles")
+
+    class Meta:
+        table = "staff_roles"
+        table_description = "Stores the roles for the moderation"
+        unique = "guild"
+
+
+class ModLogs(CustomModel):
+    id = fields.IntField(description="ID of the Case", pk=True)
+    guild = fields.ForeignKeyField("main.GuildModel", related_name="ModLogs")
+    moderator = fields.TextField(description="Moderator that performed the action")
+    target = fields.TextField(description="Victim of the moderation action")
+    reason = fields.TextField(description="Reason of Moderation Action")
+    type = fields.TextField(description="Type of Moderation action")
+    timestamp = fields.DatetimeField(
+        description="Timestamp of the action", auto_now=True
+    )
+    message = fields.TextField(description="Message Link of the action")
+    channel = fields.TextField(description="Channel of action")
+
+    class Meta:
+        table = "mod_logs"
+        table_description = "Stores all the moderation actions"
+        unique = "guild"

peacebot/__init__.py

@@ -1,3 +1 @@
 from .config import bot_config, db_config, lavalink_config
-
-__all__ = ["bot_config", "db_config"]

peacebot/config/__init__.py

@@ -1,3 +1,5 @@
 from .bot import bot_config
 from .database import db_config
 from .lavalink import lavalink_config
+
+__all__ = ["bot_config", "db_config", "lavalink_config"]

peacebot/config/bot.py

@@ -5,6 +5,7 @@ class BotConfig(BaseSettings):
     token: str
     prefix: str
     test_guilds: list[int]
+    log_webhook: int
 
     class Config:
         env_file = ".env"

peacebot/core/bot.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import logging
-from pathlib import Path
 
 import aioredis
 import hikari
@@ -20,7 +19,6 @@
 from peacebot.core.event_handler import EventHandler
 from peacebot.core.utils.activity import CustomActivity
 from peacebot.core.utils.embed_colors import EmbedColors
-from peacebot.core.utils.errors import on_error
 from tortoise_config import tortoise_config
 
 logger = logging.getLogger("peacebot.main")
@@ -74,7 +72,6 @@ def run(self) -> None:
         self.event_manager.subscribe(hikari.StartedEvent, self.on_started)
         self.event_manager.subscribe(hikari.StoppingEvent, self.on_stopping)
         self.event_manager.subscribe(hikari.StoppedEvent, self.on_stopped)
-        self.event_manager.subscribe(lightbulb.CommandErrorEvent, on_error)
         self.event_manager.subscribe(hikari.ShardReadyEvent, self.on_shard_ready)
         self.event_manager.subscribe(hikari.GuildMessageCreateEvent, self.on_message)
 

peacebot/core/plugins/Admin/__init__.py

@@ -4,10 +4,7 @@
 import lightbulb
 
 from peacebot.core.utils.embed_colors import EmbedColors
-
-
-class CommandError(lightbulb.LightbulbError):
-    pass
+from peacebot.core.utils.errors import CommandError
 
 
 async def handle_plugins(ctx: lightbulb.Context, plugin_str: str, action: str) -> None:

peacebot/core/plugins/Admin/admin.py

@@ -1,7 +1,11 @@
+import math
+import re
+
 import hikari
 import lightbulb
 
 from models import GuildModel
+from peacebot.core.utils.embed_colors import EmbedColors
 
 admin_plugin = lightbulb.Plugin(
     name="Admin", description="Admin commands for the server"
@@ -24,6 +28,79 @@ async def changeprefix(ctx: lightbulb.Context) -> None:
     await ctx.respond(f"I set your guild's prefix to `{prefix}`")
 
 
+@admin_plugin.listener(lightbulb.CommandErrorEvent)
+async def on_error(event: lightbulb.CommandErrorEvent) -> None:
+
+    error = event.exception
+    if isinstance(error, lightbulb.CommandNotFound):
+        return
+
+    if isinstance(error, lightbulb.BotMissingRequiredPermission):
+        missing = [
+            perm.replace("_", " ").replace("guild", "server").title()
+            for perm in str(error.missing_perms).split("|")
+        ]
+        if len(missing) > 2:
+            fmt = "{}, and {}".format("**, **".join(missing[:-1]), missing[-1])
+        else:
+            fmt = " and ".join(missing)
+
+        _message = f"I need the **{fmt}** permission(s) to run this command."
+
+        embed = hikari.Embed(
+            title="I am Missing Permissions",
+            color=EmbedColors.ALERT,
+            description=_message,
+        )
+        return await event.context.respond(
+            embed=embed, flags=hikari.MessageFlag.EPHEMERAL
+        )
+
+    if isinstance(error, lightbulb.CommandIsOnCooldown):
+        embed = hikari.Embed(
+            title="Command on Cooldown",
+            color=EmbedColors.ALERT,
+            description=f"This command is on cooldown, please retry in {math.ceil(error.retry_after)}s.",
+        )
+        return await event.context.respond(
+            embed=embed, flags=hikari.MessageFlag.EPHEMERAL
+        )
+
+    if isinstance(error, lightbulb.NotEnoughArguments):
+        return await event.bot.help_command.send_command_help(
+            event.context, event.context.command
+        )
+
+    if isinstance(error, lightbulb.MissingRequiredPermission):
+        missing = [
+            perm.replace("_", " ").replace("guild", "server").title()
+            for perm in str(error.missing_perms).split("|")
+        ]
+        if len(missing) > 2:
+            fmt = "{}, and {}".format("**, **".join(missing[:-1]), missing[-1])
+        else:
+            fmt = " and ".join(missing)
+        _message = "You need the **{}** permission(s) to use this command.".format(fmt)
+
+        embed = hikari.Embed(
+            title="You are missing permissions",
+            color=EmbedColors.ALERT,
+            description=_message,
+        )
+        return await event.context.respond(
+            embed=embed, flags=hikari.MessageFlag.EPHEMERAL
+        )
+
+    title = " ".join(re.compile(r"[A-Z][a-z]*").findall(error.__class__.__name__))
+    await event.context.respond(
+        embed=hikari.Embed(
+            title=title, description=str(error), color=EmbedColors.ALERT
+        ),
+        flags=hikari.MessageFlag.EPHEMERAL,
+    )
+    raise error
+
+
 def load(bot: lightbulb.BotApp) -> None:
     bot.add_plugin(admin_plugin)
 

peacebot/core/plugins/Admin/owner.py

@@ -13,7 +13,7 @@
 import yuyo
 from lightbulb.utils import nav
 
-import peacebot.core.utils.helper_functions as hf
+from peacebot.core.utils.helper_functions import error_handler
 
 from . import CommandError, handle_plugins
 
@@ -76,7 +76,7 @@ async def eval_python_code_no_capture(ctx: lightbulb.Context, code: str) -> None
 @lightbulb.set_help(docstring=True)
 @lightbulb.command("eval", "Run Evals as Bot owner")
 @lightbulb.implements(lightbulb.PrefixCommand)
-@hf.error_handler()
+@error_handler()
 async def eval_command(ctx: lightbulb.Context) -> None:
     """
     Dynamically evaluate a script in the bot's environment.
@@ -113,7 +113,7 @@ async def eval_command(ctx: lightbulb.Context) -> None:
 @lightbulb.option("plugin", "Name of the plugin")
 @lightbulb.command("reload", "Reload a specific plugin.")
 @lightbulb.implements(lightbulb.SlashCommand, lightbulb.PrefixCommand)
-@hf.error_handler()
+@error_handler()
 async def reload_plugin(ctx: lightbulb.Context) -> None:
     plugin = ctx.options.plugin
     await handle_plugins(ctx, plugin, "reload")
@@ -123,7 +123,7 @@ async def reload_plugin(ctx: lightbulb.Context) -> None:
 @lightbulb.option("plugin", "Name of the plugin")
 @lightbulb.command("unload", "Unload a specific plugin.")
 @lightbulb.implements(lightbulb.SlashCommand, lightbulb.PrefixCommand)
-@hf.error_handler()
+@error_handler()
 async def unload_plugin(ctx: lightbulb.Context) -> None:
     plugin = ctx.options.plugin
     if plugin in [
@@ -139,7 +139,7 @@ async def unload_plugin(ctx: lightbulb.Context) -> None:
 @lightbulb.option("plugin", "Name of the plugin")
 @lightbulb.command("load", "Load a specific plugin.")
 @lightbulb.implements(lightbulb.SlashCommand, lightbulb.PrefixCommand)
-@hf.error_handler()
+@error_handler()
 async def load_plugin(ctx: lightbulb.Context) -> None:
     plugin = ctx.options.plugin
     await handle_plugins(ctx, plugin, "load")

peacebot/core/plugins/AutoResponse/autoresponse.py

@@ -6,9 +6,9 @@
 import hikari
 import lightbulb
 
-import peacebot.core.utils.helper_functions as hf
 from models import AutoResponseModel, GuildModel
 from peacebot.core.utils.embed_colors import EmbedColors
+from peacebot.core.utils.helper_functions import error_handler
 
 from . import AutoResponseError, clone_autoresponse, handle_message, is_valid_uuid
 
@@ -234,7 +234,7 @@ async def autoresponse_export(ctx: lightbulb.Context) -> None:
 @lightbulb.add_checks(lightbulb.has_guild_permissions(hikari.Permissions.MANAGE_GUILD))
 @lightbulb.command("import", "Import autoreponse(s) from another server")
 @lightbulb.implements(lightbulb.PrefixSubCommand, lightbulb.SlashSubCommand)
-@hf.error_handler()
+@error_handler()
 async def autoresponse_import(ctx: lightbulb.Context) -> None:
     _id: str = ctx.options.id
     if _id == str(ctx.guild_id):
@@ -291,7 +291,7 @@ async def autoresponse_import(ctx: lightbulb.Context) -> None:
 @lightbulb.add_checks(lightbulb.has_guild_permissions(hikari.Permissions.MANAGE_GUILD))
 @lightbulb.command("toggle", "Enable or disable the autoresponse", aliases=["tgl"])
 @lightbulb.implements(lightbulb.PrefixSubCommand, lightbulb.SlashSubCommand)
-@hf.error_handler()
+@error_handler()
 async def autoresponse_toggle(ctx: lightbulb.Context) -> None:
     autoresponse = await AutoResponseModel.get_or_none(
         guild__id=ctx.guild_id, trigger__iexact=ctx.options.trigger

peacebot/core/plugins/Miscellaneous/__init__.py

@@ -1,17 +1,9 @@
 import lightbulb
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
-from peacebot.core.utils.time import TimeConverter
-
 
 def fetch_scheduler(ctx: lightbulb.Context) -> AsyncIOScheduler:
-    return ctx.bot.d.scheduler
-
-
-async def convert_time(ctx: lightbulb.Context, time: str) -> float:
-    seconds = await TimeConverter.convert(TimeConverter, ctx, time)
-
-    return seconds
+    return ctx.bot.scheduler
 
 
 async def send_remainder(ctx: lightbulb.Context, text: str) -> None: