Some code cleanup

Author: kkrypt0nn

README.md

@@ -113,8 +113,9 @@ python3 bot.py
 or eventually
 
 ```
-python3.8 bot.py
+python3.x bot.py
 ```
+Replace `x` with the version of Python you have installed.
 
 <br>
 
@@ -140,7 +141,7 @@ the [tags on this repository](https://github.com/kkrypt0nn/Python-Discord-Bot-Te
 
 ## Built With
 
-* [Python 3.9.9](https://www.python.org/)
+* [Python 3.9.12](https://www.python.org/)
 
 ## License
 

TODO.md

@@ -2,7 +2,7 @@
 
 ## Version 4.2
 
-* [ ] Add a timeout command.
+* [ ] Add a timeout command
 
 ## Version 4.3
 

bot.py

@@ -35,30 +35,42 @@
 
 Default Intents:
 intents.bans = True
-intents.dm_messages = False
-intents.dm_reactions = False
-intents.dm_typing = False
+intents.dm_messages = True
+intents.dm_reactions = True
+intents.dm_typing = True
 intents.emojis = True
+intents.emojis_and_stickers = True
 intents.guild_messages = True
 intents.guild_reactions = True
-intents.guild_typing = False
+intents.guild_scheduled_events = True
+intents.guild_typing = True
 intents.guilds = True
 intents.integrations = True
 intents.invites = True
+intents.messages = True # `message_content` is required to get the content of the messages
 intents.reactions = True
-intents.typing = False
-intents.voice_states = False
-intents.webhooks = False
+intents.typing = True
+intents.voice_states = True
+intents.webhooks = True
 
-Privileged Intents (Needs to be enabled on dev page), please use them only if you need them:
+Privileged Intents (Needs to be enabled on developer portal of Discord), please use them only if you need them:
 intents.members = True
-intents.messages = True
+intents.message_content = True
 intents.presences = True
 """
 
 intents = disnake.Intents.default()
 
-bot = Bot(command_prefix=config["prefix"], intents=intents)
+bot = Bot(command_prefix=config["prefix"], intents=intents, help_command=None)
+
+"""
+Create a bot variable to access the config file in cogs so that you don't need to import it every time.
+
+The config is available using the following code:
+- bot.config # In this file
+- self.bot.config # In cogs
+"""
+bot.config = config
 
 
 @bot.event
@@ -83,10 +95,6 @@ async def status_task() -> None:
     await bot.change_presence(activity=disnake.Game(random.choice(statuses)))
 
 
-# Removes the default help command of discord.py to be able to create our custom help command.
-bot.remove_command("help")
-
-
 def load_commands(command_type: str) -> None:
     for file in os.listdir(f"./cogs/{command_type}"):
         if file.endswith(".py"):
@@ -204,8 +212,8 @@ async def on_command_error(context: Context, error) -> None:
     elif isinstance(error, commands.MissingRequiredArgument):
         embed = disnake.Embed(
             title="Error!",
-            description=str(error).capitalize(),
             # We need to capitalize because the command arguments have no capital letter in the code.
+            description=str(error).capitalize(),
             color=0xE02B2B
         )
         await context.send(embed=embed)

cogs/normal/fun-normal.py

@@ -6,10 +6,7 @@
 Version: 4.1
 """
 
-import json
-import os
 import random
-import sys
 
 import aiohttp
 import disnake
@@ -18,12 +15,6 @@
 
 from helpers import checks
 
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 class Choice(disnake.ui.View):
     def __init__(self):

cogs/normal/general-normal.py

@@ -6,11 +6,8 @@
 Version: 4.1
 """
 
-import json
-import os
 import platform
 import random
-import sys
 
 import aiohttp
 import disnake
@@ -19,12 +16,6 @@
 
 from helpers import checks
 
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 class General(commands.Cog, name="general-normal"):
     def __init__(self, bot):
@@ -59,7 +50,7 @@ async def botinfo(self, context: Context) -> None:
         )
         embed.add_field(
             name="Prefix:",
-            value=f"/ (Slash Commands) or {config['prefix']} for normal commands",
+            value=f"/ (Slash Commands) or {self.bot.config['prefix']} for normal commands",
             inline=False
         )
         embed.set_footer(
@@ -140,7 +131,7 @@ async def invite(self, context: Context) -> None:
         :param context: The context in which the command has been executed.
         """
         embed = disnake.Embed(
-            description=f"Invite me by clicking [here](https://discordapp.com/oauth2/authorize?&client_id={config['application_id']}&scope=bot+applications.commands&permissions={config['permissions']}).",
+            description=f"Invite me by clicking [here](https://discordapp.com/oauth2/authorize?&client_id={self.bot.config['application_id']}&scope=bot+applications.commands&permissions={self.bot.config['permissions']}).",
             color=0xD75BF4
         )
         try:

cogs/normal/moderation-normal.py

@@ -6,22 +6,12 @@
 Version: 4.1
 """
 
-import json
-import os
-import sys
-
 import disnake
 from disnake.ext import commands
 from disnake.ext.commands import Context
 
 from helpers import checks
 
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 class Moderation(commands.Cog, name="moderation-normal"):
     def __init__(self, bot):

cogs/normal/owner-normal.py

@@ -7,21 +7,13 @@
 """
 
 import json
-import os
-import sys
 
 import disnake
 from disnake.ext import commands
 from disnake.ext.commands import Context
 
 from helpers import json_manager, checks
 
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 class Owner(commands.Cog, name="owner-normal"):
     def __init__(self, bot):

cogs/normal/template-normal.py

@@ -6,22 +6,11 @@
 Version: 4.1
 """
 
-import json
-import os
-import sys
-
 from disnake.ext import commands
 from disnake.ext.commands import Context
 
 from helpers import checks
 
-# Only if you want to use variables that are in the config.json file.
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 # Here we name the cog and create a new class for the cog.
 class Template(commands.Cog, name="template-normal"):

cogs/slash/fun-slash.py

@@ -6,10 +6,7 @@
 Version: 4.1
 """
 
-import json
-import os
 import random
-import sys
 
 import aiohttp
 import disnake
@@ -18,12 +15,6 @@
 
 from helpers import checks
 
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 class Choice(disnake.ui.View):
     def __init__(self):

cogs/slash/general-slash.py

@@ -6,11 +6,8 @@
 Version: 4.1
 """
 
-import json
-import os
 import platform
 import random
-import sys
 
 import aiohttp
 import disnake
@@ -19,12 +16,6 @@
 
 from helpers import checks
 
-if not os.path.isfile("config.json"):
-    sys.exit("'config.json' not found! Please add it and try again.")
-else:
-    with open("config.json") as file:
-        config = json.load(file)
-
 
 class General(commands.Cog, name="general-slash"):
     def __init__(self, bot):
@@ -59,7 +50,7 @@ async def botinfo(self, interaction: ApplicationCommandInteraction) -> None:
         )
         embed.add_field(
             name="Prefix:",
-            value=f"/ (Slash Commands) or {config['prefix']} for normal commands",
+            value=f"/ (Slash Commands) or {self.bot.config['prefix']} for normal commands",
             inline=False
         )
         embed.set_footer(
@@ -140,7 +131,7 @@ async def invite(self, interaction: ApplicationCommandInteraction) -> None:
         :param interaction: The application command interaction.
         """
         embed = disnake.Embed(
-            description=f"Invite me by clicking [here](https://discordapp.com/oauth2/authorize?&client_id={config['application_id']}&scope=bot+applications.commands&permissions={config['permissions']}).",
+            description=f"Invite me by clicking [here](https://discordapp.com/oauth2/authorize?&client_id={self.bot.config['application_id']}&scope=bot+applications.commands&permissions={self.bot.config['permissions']}).",
             color=0xD75BF4
         )
         try: