Merge pull request #63 from kkrypt0nn/v2-migration

Migration to discord.py 2.0

Author: kkrypt0nn

.gitignore

@@ -137,4 +137,8 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
-.idea/*
+# PyCharm IDEA
+.idea/*
+
+# SQLITE database
+*.db

README.md

@@ -17,8 +17,7 @@ I would've been happy if there were any template existing. However, there wasn't
 decided to create my own template to let <b>you</b> guys create your discord bot easily.
 
 Please note that this template is not supposed to be the best template, but a good template to start learning how
-discord.py works and to make your own bot easily. After the version 4.0 the template is using disnake, as discord.py has
-stoppped development.
+discord.py works and to make your own bot easily.
 
 If you plan to use this template to make your own template or bot, you **have to**:
 
@@ -40,22 +39,21 @@ All the updates of the template are available [here](UPDATES.md).
 
 ## Disclaimer
 
-Slash commands can take **some hours** to get registered on guilds, so if you want to test a command you should use
-the `guild_ids` parameter in the command decorator so that it gets registered instantly. Example:
+Slash commands can take some time to get registered globally, so if you want to test a command you should use
+the `@app_commands.guilds()` decorator so that it gets registered instantly. Example:
 
 ```py
-@commands.slash_command(
-    name="command",
-    description="Command description",
-    guild_ids=[GUILD_ID1, GUILD_ID2]  # These should be testing guild(s) ID, as always: an integer.
+@commands.hybrid_command(
+  name="command",
+  description="Command description",
 )
+@app_commands.guilds(GUILD_ID) # Place your guild ID here
 ```
 
 When using the template you confirm that you have read the [license](LICENSE.md) and comprehend that I can take down
 your repository if you do not meet these requirements.
 
-Please do not open issues or pull requests about things that are written in the [TODO file](TODO.md), they are **
-already** under work for a future version of the template.
+Please do not open issues or pull requests about things that are written in the [TODO file](TODO.md), they are **already** under work for a future version of the template.
 
 ## How to download it
 
@@ -90,7 +88,6 @@ Here is an explanation of what everything is:
 | YOUR_APPLICATION_ID_HERE  | The application ID of your bot                                        |
 | OWNERS                    | The user ID of all the bot owners                                     |
 
-In the [blacklist](blacklist.json) file you now can add IDs (as integers) in the `ids` list.
 
 ## How to start
 

UPDATES.md

@@ -2,9 +2,18 @@
 
 Here is the list of all the updates that I made on this template.
 
+### Version 5.0 (20 August 2022)
+
+> ⚠️ **Moved to discord.py 2.0 as it is now officially released**
+
+* Added `warnings` command that will show you all the warnings a user has
+* Moved the blacklist to `sqlite3` database
+* Now using **Hybrid Commands**, both prefix and slash commands will get created
+* When using the `warn` command, the warning will also be added in a new `sqlite3` database
+
 ### Version 4.1.1 (18 July 2022)
 
-* Fixed the custom checks not being sent in the channels correctly.
+* Fixed the custom checks not being sent in the channels correctly
 
 ### Version 4.1 (09 January 2022)
 

blacklist.json

@@ -3,20 +3,24 @@
 Description:
 This is a template to create your own discord bot in python.
 
-Version: 4.1.1
+Version: 5.0
 """
 
+import asyncio
 import json
 import os
 import platform
 import random
+import sqlite3
 import sys
 
-import disnake
-from disnake import ApplicationCommandInteraction
-from disnake.ext import tasks, commands
-from disnake.ext.commands import Bot
-from disnake.ext.commands import Context
+from contextlib import closing
+
+import discord
+from discord import Interaction
+from discord.ext import tasks, commands
+from discord.ext.commands import Bot
+from discord.ext.commands import Context
 
 import exceptions
 
@@ -29,8 +33,8 @@
 """	
 Setup bot intents (events restrictions)
 For more information about intents, please go to the following websites:
-https://docs.disnake.dev/en/latest/intents.html
-https://docs.disnake.dev/en/latest/intents.html#privileged-intents
+https://discordpy.readthedocs.io/en/latest/intents.html
+https://discordpy.readthedocs.io/en/latest/intents.html#privileged-intents
 
 
 Default Intents:
@@ -59,7 +63,7 @@
 intents.presences = True
 """
 
-intents = disnake.Intents.default()
+intents = discord.Intents.default()
 
 """
 Uncomment this if you don't want to use prefix (normal) commands.
@@ -71,6 +75,18 @@
 
 bot = Bot(command_prefix=commands.when_mentioned_or(config["prefix"]), intents=intents, help_command=None)
 
+
+def init_db():
+    with closing(connect_db()) as db:
+        with open("database/schema.sql", "r") as f:
+            db.cursor().executescript(f.read())
+        db.commit()
+
+
+def connect_db():
+    return sqlite3.connect("database/database.db")
+
+
 """
 Create a bot variable to access the config file in cogs so that you don't need to import it every time.
 
@@ -79,19 +95,20 @@
 - self.bot.config # In cogs
 """
 bot.config = config
-
+bot.db = connect_db()
 
 @bot.event
 async def on_ready() -> None:
     """
     The code in this even is executed when the bot is ready
     """
     print(f"Logged in as {bot.user.name}")
-    print(f"disnake API version: {disnake.__version__}")
+    print(f"discord.py API version: {discord.__version__}")
     print(f"Python version: {platform.python_version()}")
     print(f"Running on: {platform.system()} {platform.release()} ({os.name})")
     print("-------------------")
     status_task.start()
+    await bot.tree.sync()
 
 
 @tasks.loop(minutes=1.0)
@@ -100,35 +117,14 @@ async def status_task() -> None:
     Setup the game status task of the bot
     """
     statuses = ["with you!", "with Krypton!", "with humans!"]
-    await bot.change_presence(activity=disnake.Game(random.choice(statuses)))
-
-
-def load_commands(command_type: str) -> None:
-    for file in os.listdir(f"./cogs/{command_type}"):
-        if file.endswith(".py"):
-            extension = file[:-3]
-            try:
-                bot.load_extension(f"cogs.{command_type}.{extension}")
-                print(f"Loaded extension '{extension}'")
-            except Exception as e:
-                exception = f"{type(e).__name__}: {e}"
-                print(f"Failed to load extension {extension}\n{exception}")
-
-
-if __name__ == "__main__":
-    """
-    This will automatically load slash commands and normal commands located in their respective folder.
-    
-    If you want to remove slash commands, which is not recommended due to the Message Intent being a privileged intent, you can remove the loading of slash commands below.
-    """
-    load_commands("slash")
-    load_commands("normal")
+    await bot.change_presence(activity=discord.Game(random.choice(statuses)))
 
 
 @bot.event
-async def on_message(message: disnake.Message) -> None:
+async def on_message(message: discord.Message) -> None:
     """
     The code in this event is executed every time someone sends a message, with or without the prefix
+
     :param message: The message that was sent.
     """
     if message.author == bot.user or message.author.bot:
@@ -137,77 +133,18 @@ async def on_message(message: disnake.Message) -> None:
 
 
 @bot.event
-async def on_slash_command(interaction: ApplicationCommandInteraction) -> None:
+async def on_app_command_completion(interaction: Interaction) -> None:
     """
-    The code in this event is executed every time a slash command has been *successfully* executed
-    :param interaction: The slash command that has been executed.
+    The code in this event is executed every time an app command has been **successfully** executed
+
+    :param interaction: The app command that has been executed.
     """
 
     if interaction.guild is not None:
         print(
-        f"Executed {interaction.data.name} slash command in {interaction.guild.name} (ID: {interaction.guild.id}) by {interaction.author} (ID: {interaction.author.id})")
+        f"Executed {interaction.data.name} app command in {interaction.guild.name} (ID: {interaction.guild.id}) by {interaction.author} (ID: {interaction.author.id})")
     else:
-        print(f"Executed {interaction.data.name} slash command by {interaction.author} (ID: {interaction.author.id}) in DMs")
-
-
-@bot.event
-async def on_slash_command_error(interaction: ApplicationCommandInteraction, error: Exception) -> None:
-    """
-    The code in this event is executed every time a valid slash command catches an error
-
-    'ephemeral=True' will make so that only the user who execute the command can see the message
-
-    :param interaction: The slash command that failed executing.
-    :param error: The error that has been faced.
-    """
-    if isinstance(error, commands.CommandOnCooldown):
-        minutes, seconds = divmod(error.retry_after, 60)
-        hours, minutes = divmod(minutes, 60)
-        hours = hours % 24
-        embed = disnake.Embed(
-            title="Hey, please slow down!",
-            description=f"You can use this command again in {f'{round(hours)} hours' if round(hours) > 0 else ''} {f'{round(minutes)} minutes' if round(minutes) > 0 else ''} {f'{round(seconds)} seconds' if round(seconds) > 0 else ''}.",
-            color=0xE02B2B
-        )
-        return await interaction.send(embed=embed, ephemeral=True)
-    elif isinstance(error, exceptions.UserBlacklisted):
-        """
-        The code here will only execute if the error is an instance of 'UserBlacklisted', which can occur when using
-        the @checks.not_blacklisted() check in your command, or you can raise the error by yourself.
-        """
-        embed = disnake.Embed(
-            title="Error!",
-            description="You are blacklisted from using the bot.",
-            color=0xE02B2B
-        )
-        return await interaction.send(embed=embed, ephemeral=True)
-    elif isinstance(error, exceptions.UserNotOwner):
-        """
-        Same as above, just for the @checks.is_owner() check.
-        """
-        embed = disnake.Embed(
-            title="Error!",
-            description="You are not the owner of the bot!",
-            color=0xE02B2B
-        )
-        return await interaction.send(embed=embed, ephemeral=True)
-    elif isinstance(error, commands.MissingPermissions):
-        embed = disnake.Embed(
-            title="Error!",
-            description="You are missing the permission(s) `" + ", ".join(
-                error.missing_permissions) + "` to execute this command!",
-            color=0xE02B2B
-        )
-        return await interaction.send(embed=embed, ephemeral=True)
-    elif isinstance(error, commands.MissingRequiredArgument):
-        embed = disnake.Embed(
-            title="Error!",
-            # We need to capitalize because the command arguments have no capital letter in the code.
-            description=str(error).capitalize(),
-            color=0xE02B2B
-        )
-        await interaction.send(embed=embed, ephemeral=True)
-    raise error
+        print(f"Executed {interaction.data.name} app command by {interaction.author} (ID: {interaction.author.id}) in DMs")
 
 
 @bot.event
@@ -237,7 +174,7 @@ async def on_command_error(context: Context, error) -> None:
         minutes, seconds = divmod(error.retry_after, 60)
         hours, minutes = divmod(minutes, 60)
         hours = hours % 24
-        embed = disnake.Embed(
+        embed = discord.Embed(
             title="Hey, please slow down!",
             description=f"You can use this command again in {f'{round(hours)} hours' if round(hours) > 0 else ''} {f'{round(minutes)} minutes' if round(minutes) > 0 else ''} {f'{round(seconds)} seconds' if round(seconds) > 0 else ''}.",
             color=0xE02B2B
@@ -248,7 +185,7 @@ async def on_command_error(context: Context, error) -> None:
         The code here will only execute if the error is an instance of 'UserBlacklisted', which can occur when using
         the @checks.not_blacklisted() check in your command, or you can raise the error by yourself.
         """
-        embed = disnake.Embed(
+        embed = discord.Embed(
             title="Error!",
             description="You are blacklisted from using the bot.",
             color=0xE02B2B
@@ -258,22 +195,22 @@ async def on_command_error(context: Context, error) -> None:
         """
         Same as above, just for the @checks.is_owner() check.
         """
-        embed = disnake.Embed(
+        embed = discord.Embed(
             title="Error!",
             description="You are not the owner of the bot!",
             color=0xE02B2B
         )
         await context.send(embed=embed)
     elif isinstance(error, commands.MissingPermissions):
-        embed = disnake.Embed(
+        embed = discord.Embed(
             title="Error!",
             description="You are missing the permission(s) `" + ", ".join(
                 error.missing_permissions) + "` to execute this command!",
             color=0xE02B2B
         )
         await context.send(embed=embed)
     elif isinstance(error, commands.MissingRequiredArgument):
-        embed = disnake.Embed(
+        embed = discord.Embed(
             title="Error!",
             # We need to capitalize because the command arguments have no capital letter in the code.
             description=str(error).capitalize(),
@@ -283,5 +220,22 @@ async def on_command_error(context: Context, error) -> None:
     raise error
 
 
-# Run the bot with the token
-bot.run(config["token"])
+async def main() -> None:
+    """
+    The code in this function is executed whenever the bot will start.
+    """
+    for file in os.listdir(f"./cogs"):
+        if file.endswith(".py"):
+            extension = file[:-3]
+            try:
+                await bot.load_extension(f"cogs.{extension}")
+                print(f"Loaded extension '{extension}'")
+            except Exception as e:
+                exception = f"{type(e).__name__}: {e}"
+                print(f"Failed to load extension {extension}\n{exception}")
+    await bot.start(config["token"])
+
+
+if __name__ == "__main__":
+    init_db()
+    asyncio.run(main())