chore: merge staging onto master to resync branches

Author: Snaacky

chiya/__init__.py

@@ -1,14 +1,15 @@
 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
 
-import __init__  # noqa
 import database
-from config import config
+from chiya.config import config
 
 
 bot = commands.Bot(
@@ -25,7 +26,6 @@
         reactions=config["bot"]["intents"]["reactions"],
     ),
 )
-log = logging.getLogger(__name__)
 
 
 @bot.event
@@ -38,9 +38,42 @@ async def on_ready() -> None:
 
 
 async def main():
+    await setup_logger()
+    await load_cogs()
+    await bot.start(config["bot"]["token"])
+
+
+async def setup_logger():
+    log_level = config["bot"]["log_level"]
+    if not log_level:
+        log_level = "NOTSET"
+    log.remove()
+    
+    class InterceptHandler(logging.Handler):
+        """
+        Setup up an Interceptor class to redirect all logs from the standard logging library to loguru.
+        """
+        def emit(self, record: logging.LogRecord) -> None:
+            # Get corresponding Loguru level if it exists.
+            level: str | int
+            try:
+                level = log.level(record.levelname).name
+            except ValueError:
+                level = record.levelno
+
+            log.opt(exception=record.exc_info).log(level, record.getMessage())
+
+    discord.utils.setup_logging(handler=InterceptHandler(),level=logging.getLevelName(config["bot"]["log_level"]), root=False)
+
+    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")
+
+
+async def load_cogs():
     for cog in glob.iglob(os.path.join("cogs", "**", "[!^_]*.py"), root_dir="chiya", recursive=True):
         await bot.load_extension(cog.replace("/", ".").replace("\\", ".").replace(".py", ""))
-    await bot.start(config["bot"]["token"])
+
 
 if __name__ == "__main__":
     database.Database().setup()

chiya/bot.py

@@ -0,0 +1,86 @@
+from subprocess import call
+
+import aiohttp
+import discord
+from discord import app_commands, Webhook
+from discord.ext import commands
+from loguru import logger as log
+
+from chiya.config import config
+from chiya.utils import embeds
+
+
+
+class MoveQuestionApp(commands.Cog):
+    def __init__(self, bot) -> None:
+        self.bot = bot
+        self.move_question_command = app_commands.ContextMenu(name="Move Question", callback=self.move_question)
+        self.bot.tree.add_command(self.move_question_command)
+
+    @app_commands.guilds(config["guild_id"])
+    @app_commands.guild_only()
+    async def move_question(self, ctx: discord.Interaction, message: discord.Message) -> None:
+        """
+        Staff only context menu command for moving questions to the appropriate channel.
+        """
+        await ctx.response.defer(thinking=True, ephemeral=True)
+
+        staff = [x for x in ctx.user.roles if x.id == config["roles"]["staff"] or x.id == config["roles"]["trial"]]
+        if not staff:
+            return await embeds.error_message(ctx=ctx, description="You do not have permissions to use this command.")
+
+        if ctx.channel.category_id in [
+            config["categories"]["moderation"],
+            config["categories"]["development"],
+            config["categories"]["logs"],
+            config["categories"]["tickets"],
+        ]:
+            return await embeds.error_message(
+                ctx=ctx,
+                description="You do not have permissions to use this command in this category.",
+            )
+
+        channel = discord.utils.get(
+            ctx.guild.text_channels,
+            id=config["channels"]["public"]["questions_and_help"],
+        )
+
+        async with aiohttp.ClientSession() as session:
+            webhook = Webhook.from_url(
+                url=config["bot"]["webhook_url"],
+                session=session,
+            )
+
+            content = f"{message.content}\n\n"
+            for attachment in message.attachments:
+                content += f"{attachment.url}\n"
+
+            await webhook.send(
+                content=content,
+                username=message.author.name,
+                avatar_url=message.author.display_avatar.url,
+            )
+
+        success_embed = embeds.make_embed(
+            description=f"Successfully moved message to: {channel.mention}",
+            color=discord.Color.green(),
+        )
+        await ctx.followup.send(embed=success_embed)
+
+        await embeds.warning_message(
+            ctx=ctx,
+            title="Warning: Your question was moved",
+            description=(
+                f"{message.author.mention}, your message was moved to {channel.mention} "
+                "which is the more appropriate channel for help, questions, and support type "
+                "topics. Please continue your conversation in that channel."
+            ),
+        )
+        ping = await channel.send(message.author.mention)
+        await ping.delete()
+        await message.delete()
+
+
+async def setup(bot: commands.Bot) -> None:
+    await bot.add_cog(MoveQuestionApp(bot))
+    log.info("App loaded: move_question")

chiya/cogs/apps/move_question.py

@@ -1,26 +1,14 @@
 import asyncio
-import logging
 
 import discord
 from discord import app_commands
 from discord.ext import commands
+from loguru import logger as log
 
-from chiya import config
+from chiya.config import config
 from chiya.utils import embeds
 
 
-log = logging.getLogger(__name__)
-
-
-@commands.Cog.listener()
-async def on_ready(self) -> None:
-    """
-    Register the close report button that persists between bot
-    restarts.
-    """
-    self.bot.add_view(ReportCloseButton())
-
-
 class ReportCloseButton(discord.ui.View):
     def __init__(self) -> None:
         super().__init__(timeout=None)
@@ -77,7 +65,7 @@ async def submit(self, interaction: discord.Interaction, button: discord.ui.Butt
         style=discord.ButtonStyle.secondary,
         custom_id="cancel_report",
     )
-    async def cancel(self, button: discord.ui.Button, interaction: discord.Interaction) -> None:
+    async def cancel(self, interaction: discord.Interaction, button: discord.ui.Button) -> None:
         """
         Create a View for the report message embed cancel button.
         """
@@ -92,6 +80,14 @@ def __init__(self, bot) -> None:
         self.report_message_command = app_commands.ContextMenu(name="Report Message", callback=self.report_message)
         self.bot.tree.add_command(self.report_message_command)
 
+    @commands.Cog.listener()
+    async def on_ready(self) -> None:
+        """
+        Register the close report button that persists between bot
+        restarts.
+        """
+        self.bot.add_view(ReportCloseButton())
+
     @app_commands.guilds(config["guild_id"])
     @app_commands.guild_only()
     async def report_message(self, ctx: discord.Interaction, message: discord.Message) -> None:

chiya/cogs/apps/report_message.py

@@ -1,18 +1,16 @@
-import logging
 import time
 
 import discord
 from discord import app_commands
 from discord.ext import commands
+from loguru import logger as log
 
-from chiya import config, database
+from chiya import database
+from chiya.config import config
 from chiya.utils import embeds
 from chiya.utils.helpers import can_action_member, log_embed_to_channel
 
 
-log = logging.getLogger(__name__)
-
-
 class BansCommands(commands.Cog):
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot