Organize code.

Author: keydevelops

README.md

@@ -10,5 +10,4 @@ This project is licensed under the GNU General Public License v3.
 
 # TODO: 
 - [ ] Make better README
-- [x] Make code readable
-- [ ] Use DB instead of json
+- [x] Make code readable

example_config.py

@@ -1,3 +1,5 @@
+"""Example configuration file for CommitBot"""
+
 TOKEN = ""
 PREFIX = ""
 VERSION = ""

main.py

@@ -1,11 +1,12 @@
-# This project is licensed under GPL-v3.
+"""This project is licensed under GPL-v3."""
 
-import disnake
 import json
 import os
 import asyncio
 import time
 
+import disnake
+
 from disnake.ext import commands
 
 import config as cfg
@@ -16,20 +17,33 @@
 
 start_time = time.time()
 
+def bot_embed(inter):
+    """Create a standard reponse embed"""
+    err_embed = disnake.Embed(title="Ошибка", color=disnake.Color.red())
+    user_avatar = (
+        inter.author.display_avatar.url
+        if inter.author.display_avatar
+        else client.user.display_avatar.url
+    )
+    err_embed.set_footer(text=f"{inter.author.name}", icon_url=user_avatar)
+
 
 def load_data():
+    """Load data from the JSON file"""
     if not os.path.exists(DATA_FILE):
         return {}
     with open(DATA_FILE, "r", encoding="utf-8") as f:
         return json.load(f)
 
 
 def save_data(data):
+    """Save data to the JSON file"""
     with open(DATA_FILE, "w", encoding="utf-8") as f:
         json.dump(data, f, indent=4)
 
 
 def ensure_defaults():
+    """Ensure that all guilds have the default data structure"""
     data = load_data()
     updated = False
     for guild in client.guilds:
@@ -38,7 +52,10 @@ def ensure_defaults():
             data[sid] = {
                 "forumchannels": [],
                 "closeAfter": 1,
-                "welcomeMessage": "Hello! {thread_author}, welcome to your thread {thread_id} - {thread_name}",
+                "welcomeMessage": (
+                    "Hello! {thread_author}, welcome to your thread "
+                    "{thread_id} - {thread_name}"
+                ),
                 "delete_closed": True,
                 "welcome_enabled": True,
             }
@@ -63,6 +80,7 @@ def ensure_defaults():
 
 
 async def send_close_embed(thread, closer, closer_type="автоматически"):
+    """Send an embed when a thread is closed"""
     data = load_data()
     sid = str(thread.guild.id)
     auto_delete = data.get(sid, {}).get("delete_closed", True)
@@ -99,6 +117,7 @@ async def send_close_embed(thread, closer, closer_type="автоматическ
 
 
 async def check_inactivity_thread(thread_id: int):
+    """Check if a thread is inactive and close it if necessary"""
     await asyncio.sleep(5)
 
     while True:
@@ -135,7 +154,7 @@ async def check_inactivity_thread(thread_id: int):
             try:
                 await t.edit(locked=True, archived=True)
                 await send_close_embed(t, client.user, "автоматически")
-            except Exception:
+            except (disnake.Forbidden, disnake.HTTPException, disnake.NotFound):
                 pass
             del data[sid]["threads"][str(thread_id)]
             save_data(data)
@@ -149,15 +168,16 @@ async def check_inactivity_thread(thread_id: int):
 client.check_inactivity_thread = check_inactivity_thread
 client.send_close_embed = send_close_embed
 client.start_time = start_time
+client.bot_embed = bot_embed
 
 # Load cogs
 for filename in os.listdir("./modules"):
     if filename.endswith(".py"):
-        cog_name = f"modules.{filename[:-3]}"
+        COG_NAME = f"modules.{filename[:-3]}"
         try:
-            client.load_extension(cog_name)
+            client.load_extension(COG_NAME)
             print(f"Debug: Ког {filename} загружен")
-        except Exception as e:
+        except (disnake.ext.commands.errors.ExtensionError, ImportError) as e:
             print(f"ERR: Ког {filename} не удалось загрузить: {e}")
 
 client.run(cfg.TOKEN)

modules/errors.py

@@ -1,64 +1,67 @@
-# GPL-v3
+"""GPL-3.0 License"""
+
+import uuid
+import traceback
+import datetime
+import os
 
 import disnake
-import uuid, traceback, datetime, os
 
 from disnake.ext import commands
 
 
 class NotOwner(commands.CheckFailure):
-    pass
+    """Exception raised when a user is not the bot owner."""
+    def __init__(self, message: str = "You are not the bot owner."):
+        super().__init__(message)
 
 
 class ErrorsModule(commands.Cog):
+    """Cog for handling errors in commands and interactions."""
     def __init__(self, bot):
         self.bot = bot
 
     ### Triggers when an error occurs in a command ###
 
     @commands.Cog.listener()
-    async def on_command_error(self, ctx: commands.Context, error: Exception):
-        errEmbed = disnake.Embed(title="Ошибка", color=disnake.Color.red())
-        user_avatar = (
-            ctx.author.display_avatar.url
-            if ctx.author.display_avatar
-            else self.bot.user.display_avatar.url
-        )
-        errEmbed.set_footer(text=f"{ctx.author.name}", icon_url=user_avatar)
+    async def on_command_error(
+        self,
+        ctx: commands.Context,
+        error: Exception
+    ) -> None:
+        """Handles errors in commands."""
+
+        err_embed = self.bot.bot_embed(ctx)
         if isinstance(error, NotOwner):
-            errEmbed.description = "Вы не разработчик бота."
-            return await ctx.reply(embed=errEmbed, delete_after=40)
+
+            err_embed.description = "Вы не разработчик бота."
+            return await ctx.reply(embed=err_embed, delete_after=40)
 
     ### Triggers when an error occurs in a slash command ###
 
     @commands.Cog.listener()
     async def on_slash_command_error(
-        self, inter: disnake.ApplicationCommandInteraction, error: Exception
-    ):
-
-        errEmbed = disnake.Embed(title="Ошибка", color=disnake.Color.red())
-        user_avatar = (
-            inter.author.display_avatar.url
-            if inter.author.display_avatar
-            else self.bot.user.display_avatar.url
-        )
-        errEmbed.set_footer(text=f"{inter.author.name}", icon_url=user_avatar)
+        self: any, inter: disnake.ApplicationCommandInteraction, error: Exception
+    ) -> None:
+        """Handles errors in slash commands."""
+
+        err_embed = self.bot.bot_embed(inter)
 
         if isinstance(error, commands.NoPrivateMessage):
-            errEmbed.description = "Эта команда недоступна в личных сообщениях."
-            return await inter.response.send_message(embed=errEmbed, ephemeral=True)
+            err_embed.description = "Эта команда недоступна в личных сообщениях."
+            return await inter.response.send_message(embed=err_embed, ephemeral=True)
 
         if isinstance(error, disnake.Forbidden):
-            errEmbed.description = "У меня нет прав для выполнения этого действия."
-            return await inter.response.send_message(embed=errEmbed, ephemeral=True)
+            err_embed.description = "У меня нет прав для выполнения этого действия."
+            return await inter.response.send_message(embed=err_embed, ephemeral=True)
 
         if isinstance(error, commands.MissingPermissions):
-            errEmbed.description = "У вас нет прав для использования этой команды."
-            return await inter.response.send_message(embed=errEmbed, ephemeral=True)
+            err_embed.description = "У вас нет прав для использования этой команды."
+            return await inter.response.send_message(embed=err_embed, ephemeral=True)
 
         if isinstance(error, commands.CheckFailure):
-            errEmbed.description = "Вы не можете использовать эту команду здесь."
-            return await inter.response.send_message(embed=errEmbed, ephemeral=True)
+            err_embed.description = "Вы не можете использовать эту команду здесь."
+            return await inter.response.send_message(embed=err_embed, ephemeral=True)
 
         error_id = str(uuid.uuid4())[:8]
         date_str = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
@@ -67,11 +70,14 @@ async def on_slash_command_error(
         os.makedirs("logs", exist_ok=True)
         full_path = os.path.join("logs", filename)
 
+        def ifdm(inter):
+            return inter.guild.name if inter.guild else 'DM'
+
         with open(full_path, "w", encoding="utf-8") as f:
             f.write(f"=== Ошибка {error_id} ({date_str}) ===\n")
             f.write(f"Пользователь: {inter.author} (ID: {inter.author.id})\n")
             f.write(
-                f"Гильдия: {inter.guild.name if inter.guild else 'DM'} (ID: {inter.guild.id if inter.guild else 'DM'})\n"
+                f"Гильдия: {ifdm(inter)} (ID: {ifdm(inter)})\n"
             )
             f.write(f"Команда: {inter.application_command.name}\n\n")
             traceback.print_exception(type(error), error, error.__traceback__, file=f)
@@ -80,12 +86,17 @@ async def on_slash_command_error(
             f"[ERROR] ID={error_id} | {type(error).__name__}: {error} (сохранено в {full_path})"
         )
 
-        errEmbed.description = f"Произошла неизвестная ошибка.\nСообщите UUID разработчику.\n\nUUID: `{error_id}"
+        err_embed.description = (
+            f"Произошла неизвестная ошибка.\n"
+            f"Сообщите UUID разработчику.\n\n"
+            f"UUID: `{error_id}"
+        )
         try:
-            await inter.response.send_message(embed=errEmbed, ephemeral=True)
+            await inter.response.send_message(embed=err_embed, ephemeral=True)
         except disnake.InteractionResponded:
-            await inter.followup.send(embed=errEmbed, ephemeral=True)
+            await inter.followup.send(embed=err_embed, ephemeral=True)
 
 
 def setup(bot):
+    """Setup function to connect ErrorsModule"""
     bot.add_cog(ErrorsModule(bot))