Use black formatter && Add pylint

Author: keydevelops

.github/workflows/pylint.yml

@@ -0,0 +1,23 @@
+name: Pylint
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pylint
+    - name: Analysing the code with pylint
+      run: |
+        pylint $(git ls-files '*.py')

main.py

@@ -16,6 +16,7 @@
 
 start_time = time.time()
 
+
 def load_data():
     if not os.path.exists(DATA_FILE):
         return {}
@@ -140,6 +141,7 @@ async def check_inactivity_thread(thread_id: int):
             save_data(data)
             return
 
+
 # Setup functions and vars
 client.load_data = load_data
 client.save_data = save_data

modules/errors.py

@@ -5,9 +5,11 @@
 
 from disnake.ext import commands
 
+
 class NotOwner(commands.CheckFailure):
     pass
 
+
 class ErrorsModule(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -26,11 +28,13 @@ async def on_command_error(self, ctx: commands.Context, error: Exception):
         if isinstance(error, NotOwner):
             errEmbed.description = "Вы не разработчик бота."
             return await ctx.reply(embed=errEmbed, 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):
+    async def on_slash_command_error(
+        self, inter: disnake.ApplicationCommandInteraction, error: Exception
+    ):
 
         errEmbed = disnake.Embed(title="Ошибка", color=disnake.Color.red())
         user_avatar = (
@@ -82,5 +86,6 @@ async def on_slash_command_error(self, inter: disnake.ApplicationCommandInteract
         except disnake.InteractionResponded:
             await inter.followup.send(embed=errEmbed, ephemeral=True)
 
+
 def setup(bot):
-    bot.add_cog(ErrorsModule(bot))
+    bot.add_cog(ErrorsModule(bot))

modules/forums.py

@@ -4,6 +4,7 @@
 
 from disnake.ext import commands
 
+
 class ForumsModule(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -55,14 +56,22 @@ async def close_thread(self, ctx: commands.Context):
 
     ## Slash commands ##
 
-    @commands.slash_command(name="forum", description="Управление форумами", default_member_permissions=disnake.Permissions(manage_channels=True))
+    @commands.slash_command(
+        name="forum",
+        description="Управление форумами",
+        default_member_permissions=disnake.Permissions(manage_channels=True),
+    )
     async def forum(self, interaction: disnake.CommandInteraction):
         pass
 
     ### Add new forum command ###
 
     @forum.sub_command(name="add", description="Создать новый форум")
-    async def forum_add(self, interaction: disnake.CommandInteraction, name: str = commands.Param(description="Название форума")):
+    async def forum_add(
+        self,
+        interaction: disnake.CommandInteraction,
+        name: str = commands.Param(description="Название форума"),
+    ):
         if isinstance(interaction.channel, disnake.DMChannel):
             errEmbed = disnake.Embed(
                 title="Ошибка",
@@ -75,8 +84,10 @@ async def forum_add(self, interaction: disnake.CommandInteraction, name: str = c
                 else self.bot.user.display_avatar.url
             )
             errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=user_avatar)
-            return await interaction.response.send_message(embed=errEmbed, ephemeral=True)
-        
+            return await interaction.response.send_message(
+                embed=errEmbed, ephemeral=True
+            )
+
         await interaction.response.defer(ephemeral=True)
         forum = await interaction.guild.create_forum_channel(name)
         data = self.bot.load_data()
@@ -103,9 +114,13 @@ async def forum_add(self, interaction: disnake.CommandInteraction, name: str = c
         await interaction.edit_original_message(embed=respEmbed)
 
     ### Remove forum command ###
-    
+
     @forum.sub_command(name="rem", description="Удалить форум")
-    async def forum_rem(self, interaction: disnake.CommandInteraction, forum: str = commands.Param(description="Удаляемый форум", autocomplete=True)):
+    async def forum_rem(
+        self,
+        interaction: disnake.CommandInteraction,
+        forum: str = commands.Param(description="Удаляемый форум", autocomplete=True),
+    ):
         if isinstance(interaction.channel, disnake.DMChannel):
             errEmbed = disnake.Embed(
                 title="Ошибка",
@@ -118,8 +133,10 @@ async def forum_rem(self, interaction: disnake.CommandInteraction, forum: str =
                 else self.bot.user.display_avatar.url
             )
             errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=user_avatar)
-            return await interaction.response.send_message(embed=errEmbed, ephemeral=True)
-        
+            return await interaction.response.send_message(
+                embed=errEmbed, ephemeral=True
+            )
+
         errEmbed = disnake.Embed(
             title="Упс!",
             color=disnake.Color.red(),
@@ -170,8 +187,15 @@ async def forum_rem(self, interaction: disnake.CommandInteraction, forum: str =
 
     ### Toggle welcome message ###
 
-    @forum.sub_command(name="toggle_message", description="Включить или выключить приветственное сообщение")
-    async def forum_welcome_toggle(self, interaction: disnake.CommandInteraction, value: bool = commands.Param(description="True - включить, False - выключить")):
+    @forum.sub_command(
+        name="toggle_message",
+        description="Включить или выключить приветственное сообщение",
+    )
+    async def forum_welcome_toggle(
+        self,
+        interaction: disnake.CommandInteraction,
+        value: bool = commands.Param(description="True - включить, False - выключить"),
+    ):
         if isinstance(interaction.channel, disnake.DMChannel):
             errEmbed = disnake.Embed(
                 title="Ошибка",
@@ -184,8 +208,10 @@ async def forum_welcome_toggle(self, interaction: disnake.CommandInteraction, va
                 else self.bot.user.display_avatar.url
             )
             errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=user_avatar)
-            return await interaction.response.send_message(embed=errEmbed, ephemeral=True)
-        
+            return await interaction.response.send_message(
+                embed=errEmbed, ephemeral=True
+            )
+
         await interaction.response.defer(ephemeral=True)
         data = self.bot.load_data()
         sid = str(interaction.guild.id)
@@ -219,8 +245,14 @@ async def forum_welcome_toggle(self, interaction: disnake.CommandInteraction, va
 
     ### Close after setting ###
 
-    @forum.sub_command(name="close_after", description="Установить время закрытия до ветки")
-    async def close_after(self, interaction: disnake.CommandInteraction, hours: int = commands.Param(description="Время в часах.")):
+    @forum.sub_command(
+        name="close_after", description="Установить время закрытия до ветки"
+    )
+    async def close_after(
+        self,
+        interaction: disnake.CommandInteraction,
+        hours: int = commands.Param(description="Время в часах."),
+    ):
         if isinstance(interaction.channel, disnake.DMChannel):
             errEmbed = disnake.Embed(
                 title="Ошибка",
@@ -233,8 +265,10 @@ async def close_after(self, interaction: disnake.CommandInteraction, hours: int
                 else self.bot.user.display_avatar.url
             )
             errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=user_avatar)
-            return await interaction.response.send_message(embed=errEmbed, ephemeral=True)
-        
+            return await interaction.response.send_message(
+                embed=errEmbed, ephemeral=True
+            )
+
         await interaction.response.defer(ephemeral=True)
         data = self.bot.load_data()
         sid = str(interaction.guild.id)
@@ -262,7 +296,9 @@ async def close_after(self, interaction: disnake.CommandInteraction, hours: int
 
     ### Welcome message setting ###
 
-    @forum.sub_command(name="message", description="Установить приветственное сообщение")
+    @forum.sub_command(
+        name="message", description="Установить приветственное сообщение"
+    )
     async def forum_welcome_message(self, interaction: disnake.CommandInteraction):
         if isinstance(interaction.channel, disnake.DMChannel):
             errEmbed = disnake.Embed(
@@ -276,8 +312,10 @@ async def forum_welcome_message(self, interaction: disnake.CommandInteraction):
                 else self.bot.user.display_avatar.url
             )
             errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=user_avatar)
-            return await interaction.response.send_message(embed=errEmbed, ephemeral=True)
-        
+            return await interaction.response.send_message(
+                embed=errEmbed, ephemeral=True
+            )
+
         class WelcomeModal(disnake.ui.Modal):
             def __init__(self):
                 components = [
@@ -314,15 +352,24 @@ async def callback(self, modal_inter: disnake.ModalInteraction):
                     if interaction.author.display_avatar
                     else self.bot.user.display_avatar.url
                 )
-                errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=author_avatar)
+                errEmbed.set_footer(
+                    text=f"{interaction.author.name}", icon_url=author_avatar
+                )
                 await modal_inter.response.send_message(embed=respEmbed, ephemeral=True)
 
         await interaction.response.send_modal(modal=WelcomeModal())
 
     ### Delete closed threads setting ###
 
-    @forum.sub_command(name="deleteclosed", description="Включить/выключить кнопку удаления закрытых веток")
-    async def forum_delete_closed(self, interaction: disnake.CommandInteraction, value: bool = commands.Param(description="True или False")):
+    @forum.sub_command(
+        name="deleteclosed",
+        description="Включить/выключить кнопку удаления закрытых веток",
+    )
+    async def forum_delete_closed(
+        self,
+        interaction: disnake.CommandInteraction,
+        value: bool = commands.Param(description="True или False"),
+    ):
         if isinstance(interaction.channel, disnake.DMChannel):
             errEmbed = disnake.Embed(
                 title="Ошибка",
@@ -335,8 +382,10 @@ async def forum_delete_closed(self, interaction: disnake.CommandInteraction, val
                 else self.bot.user.display_avatar.url
             )
             errEmbed.set_footer(text=f"{interaction.author.name}", icon_url=user_avatar)
-            return await interaction.response.send_message(embed=errEmbed, ephemeral=True)
-        
+            return await interaction.response.send_message(
+                embed=errEmbed, ephemeral=True
+            )
+
         await interaction.response.defer(ephemeral=True)
         data = self.bot.load_data()
         sid = str(interaction.guild.id)
@@ -373,10 +422,12 @@ async def forum_delete_closed(self, interaction: disnake.CommandInteraction, val
     ### Autocomplete for forum deletion ###
 
     @forum_rem.autocomplete("forum")
-    async def removeforum_autocomplete(self, inter: disnake.ApplicationCommandInteraction, user_input: str):
+    async def removeforum_autocomplete(
+        self, inter: disnake.ApplicationCommandInteraction, user_input: str
+    ):
         if isinstance(inter.channel, disnake.DMChannel):
             return
-                    
+
         data = self.bot.load_data()
         sid = str(inter.guild.id)
         results = []
@@ -390,6 +441,5 @@ async def removeforum_autocomplete(self, inter: disnake.ApplicationCommandIntera
         return results[:25]
 
 
-
 def setup(bot):
-    bot.add_cog(ForumsModule(bot))
+    bot.add_cog(ForumsModule(bot))

modules/info.py

@@ -4,6 +4,7 @@
 from disnake.ext import commands
 from config import VERSION
 
+
 class InfoModule(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -18,7 +19,8 @@ async def about(self, interaction: disnake.CommandInteraction):
             color=disnake.Color.purple(),
         )
         embed.set_footer(
-            text=f"Made with ❤️ by PrivateKey2", icon_url=self.bot.user.display_avatar.url
+            text=f"Made with ❤️ by PrivateKey2",
+            icon_url=self.bot.user.display_avatar.url,
         )
         await interaction.response.send_message(embed=embed, ephemeral=True)
 
@@ -32,25 +34,29 @@ async def info(self, interaction: disnake.CommandInteraction):
 
         ping = round(self.bot.latency * 1000)
         guild_count = len(self.bot.guilds)
-        user_count = len(set(member.id for guild in self.bot.guilds for member in guild.members))
+        user_count = len(
+            set(member.id for guild in self.bot.guilds for member in guild.members)
+        )
         disnake_version = disnake.__version__
         python_version = platform.python_version()
         os_info = f"{platform.system()} {platform.release()} ({platform.machine()})"
 
         embed_color = (
-            disnake.Color.green() if ping < 100 else
-            disnake.Color.yellow() if ping < 250 else
-            disnake.Color.red()
+            disnake.Color.green()
+            if ping < 100
+            else disnake.Color.yellow() if ping < 250 else disnake.Color.red()
         )
 
         embed = disnake.Embed(
             title="Информация о боте",
             color=embed_color,
-            timestamp=disnake.utils.utcnow()
+            timestamp=disnake.utils.utcnow(),
         )
 
         embed.add_field(name="📡 Пинг", value=f"`{ping} ms`", inline=True)
-        embed.add_field(name="⏳ Аптайм", value=f"`{hours}h {minutes}m {seconds}s`", inline=True)
+        embed.add_field(
+            name="⏳ Аптайм", value=f"`{hours}h {minutes}m {seconds}s`", inline=True
+        )
         embed.add_field(name="", value="", inline=False)
         embed.add_field(name="🛠️ Серверов", value=f"`{guild_count}`", inline=True)
         embed.add_field(name="👥 Пользователей", value=f"`{user_count}`", inline=True)
@@ -60,9 +66,9 @@ async def info(self, interaction: disnake.CommandInteraction):
         embed.add_field(name="", value="", inline=False)
         embed.add_field(name="💻 ОС", value=f"`{os_info}`", inline=False)
 
-
         embed.set_footer(
-            text=f"Made with ❤️ by PrivateKey2", icon_url=self.bot.user.display_avatar.url
+            text=f"Made with ❤️ by PrivateKey2",
+            icon_url=self.bot.user.display_avatar.url,
         )
 
         await interaction.response.send_message(embed=embed, ephemeral=True)
@@ -78,9 +84,11 @@ async def about(self, interaction: disnake.CommandInteraction):
         )
         embed.add_field(name="Версия", value=VERSION, inline=True)
         embed.set_footer(
-            text=f"Made with ❤️ by PrivateKey2", icon_url=self.bot.user.display_avatar.url
+            text=f"Made with ❤️ by PrivateKey2",
+            icon_url=self.bot.user.display_avatar.url,
         )
         await interaction.response.send_message(embed=embed, ephemeral=True)
 
+
 def setup(bot):
     bot.add_cog(InfoModule(bot))