feat: rewrite bot to support latest discord.py

see #68 for more information

Author: RedTeaDev

Teapot.py

@@ -70,7 +70,7 @@
     db.execute(
         'CREATE TABLE IF NOT EXISTS `channels` (`channel_id` BIGINT, `channel_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
     db.execute(
-        "CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, `user_discriminator` INT) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
+        "CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, `user_display_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
     db.execute(
         "CREATE TABLE IF NOT EXISTS `bot_logs` (`timestamp` TEXT, `type` TINYTEXT, `class` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
     teapot.managers.database.create_table(
@@ -83,30 +83,47 @@
     print(
         f"Connected to database ({teapot.config.db_host()}:{teapot.config.db_port()}) in {round(time.perf_counter() - time_start, 2)}s")
 
-intents = discord.Intents.default()
+intents = discord.Intents.all()
 intents.members = True
+intents.message_content = True
 intents.typing = False
 bot = dcmd.Bot(intents=intents, command_prefix=teapot.config.bot_prefix(), help_command=None)
 
+
 @bot.event
 async def on_ready():
     print(f"Connected to Discord API in {round(time.perf_counter() - discord_time_start, 2)}s")
     time_start = time.perf_counter()
+
     # load cogs
     teapot.events.__init__(bot)
-    teapot.cogs.cmds.__init__(bot)
-    teapot.cogs.music.setup(bot)
-    teapot.cogs.osu.setup(bot)
-    teapot.cogs.github.setup(bot)
-    teapot.cogs.cat.setup(bot)
-    teapot.cogs.neko.setup(bot)
-    teapot.cogs.nqn.setup(bot)
+    extensions = [
+        'teapot.cogs.cmds',
+        'teapot.cogs.osu', 
+        'teapot.cogs.github',
+        'teapot.cogs.cat',
+        'teapot.cogs.neko',
+        #'teapot.cogs.nqn'
+    ]
+    
+    for extension in extensions:
+        try:
+            await bot.load_extension(extension)
+            print(f"✓ Successfully loaded module: {extension}")
+        except Exception as e:
+            print(f"✗ Failed to load {extension}: {e}")
+            import traceback
+            traceback.print_exc()
     if teapot.config.storage_type() == "mysql":
         for guild in bot.guilds:
             teapot.managers.database.create_guild_table(guild)
     elif teapot.config.storage_type() == "sqlite":
         print("[!] Warning: SQLite storage has not been implemented yet. MySQL is recommended")  # WIP
+    
     print(f"Registered commands and events in {round(time.perf_counter() - time_start, 2)}s")
+    print(f"total of commands loaded: {len(bot.commands)}")
+    print(f"Modules loaded: {list(bot.cogs.keys())}")
+    
     await bot.change_presence(status=discord.Status.online,
                               activity=discord.Game(teapot.config.bot_status()))  # Update Bot status
 

teapot/__init__.py

@@ -13,7 +13,7 @@
 
 
 def version():
-    return "v0.0.1.7"
+    return "v0.0.2-REWRITE"
 
 
 def config_version():
@@ -29,13 +29,10 @@ def year():
 
 
 def copyright():
-    if year() == "2020":
-        return "© 2020 RedCoke Development"
-    else:
         return f"© 2020-{year()} RedCoke Development"
 
 
-def platform():
+def get_platform():
     return platform.system() + " " + platform.release()
 
 

teapot/cogs/cat.py

@@ -47,6 +47,6 @@ async def dog(self, ctx):
         await ctx.message.add_reaction(emoji='✅')
 
 
-def setup(bot):
+async def setup(bot):
     """ Setup Cat Module"""
-    bot.add_cog(Cat(bot))
+    await bot.add_cog(Cat(bot))

teapot/cogs/cmds.py

@@ -1,92 +1,72 @@
+import asyncio
 import discord
 import time
 import psutil
-from discord.ext import commands as cmd
-
+from discord.ext import commands
 import teapot
 
+class BasicCommands(commands.Cog):
+    """Basic bot commands and utilities"""
 
-def __init__(bot):
-    """ Initialize commands """
-    helpcmd(bot)
-    info(bot)
-    ping(bot)
-    prune(bot)
-    kick(bot)
-    ban(bot)
-    admin(bot)
-    owner(bot)
-    debug(bot)
-
+    def __init__(self, bot):
+        self.bot = bot
 
-def helpcmd(bot):
-    bot.remove_command('help')
-
-    @bot.command(aliases=['?'])
-    async def help(ctx, *cog):
+    @commands.command(aliases=['?'])
+    async def help(self, ctx, *cog):
+        """Show help information"""
         if not cog:
-            embed = discord.Embed(description="📖 Help", color=0x7400FF,
-                                  icon_url="https://cdn.discordapp.com/avatars/612634758744113182"
-                                           "/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
+            embed = discord.Embed(description="📖 Help", color=0x7400FF)
             embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
             cogs_desc = ""
-            for x in bot.cogs:
-                cogs_desc += f'**{x}** - {bot.cogs[x].__doc__}\n'
-            embed.add_field(name='Modules', value=cogs_desc[0:len(cogs_desc) - 1])
+            for x in self.bot.cogs:
+                cogs_desc += f'**{x}** - {self.bot.cogs[x].__doc__ or "No description"}\n'
+            embed.add_field(name='Modules', value=cogs_desc[0:len(cogs_desc) - 1] if cogs_desc else "No modules loaded")
             embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
             await ctx.send(embed=embed)
-            await ctx.message.add_reaction(emoji='✅')
         else:
             if len(cog) > 1:
                 await ctx.send(embed=teapot.messages.toomanyarguments())
-                await ctx.message.add_reaction(emoji='🛑')
             else:
                 found = False
-                for x in bot.cogs:
+                for x in self.bot.cogs:
                     for y in cog:
                         if x == y:
                             embed = discord.Embed(color=0x7400FF)
                             cog_info = ''
-                            for c in bot.get_cog(y).get_commands():
+                            for c in self.bot.get_cog(y).get_commands():
                                 if not c.hidden:
-                                    cog_info += f"**{c.name}** - {c.help}\n"
-                            embed.add_field(name=f"{cog[0]} Module", value=cog_info)
+                                    cog_info += f"**{c.name}** - {c.help or 'No description'}\n"
+                            embed.add_field(name=f"{cog[0]} Module", value=cog_info if cog_info else "No commands found")
                             await ctx.send(embed=embed)
-                            await ctx.message.add_reaction(emoji='✅')
                             found = True
                 if not found:
-                    for x in bot.cogs:
-                        for c in bot.get_cog(x).get_commands():
+                    for x in self.bot.cogs:
+                        for c in self.bot.get_cog(x).get_commands():
                             if c.name.lower() == cog[0].lower():
                                 embed = discord.Embed(title=f"Command: {c.name.lower().capitalize()}",
-                                                      description=f"**Description:** {c.help}\n**Syntax:** {c.qualified_name} {c.signature}",
+                                                      description=f"**Description:** {c.help or 'No description'}\n**Syntax:** {c.qualified_name} {c.signature}",
                                                       color=0x7400FF)
                                 embed.set_author(name=f"Teapot.py {teapot.version()}",
-                                                 icon_url="https://cdn.discordapp.com/avatars/612634758744113182"
-                                                          "/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
-                                await ctx.message.add_reaction(emoji='✅')
+                                                 icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
                                 found = True
+                                await ctx.send(embed=embed)
+                                break
                     if not found:
                         embed = teapot.messages.notfound("Module")
-                        await ctx.message.add_reaction(emoji='🛑')
-                    await ctx.send(embed=embed)
-                else:
-                    await ctx.message.add_reaction(emoji='✅')
-
+                        await ctx.send(embed=embed)
 
-def info(bot):
-    @bot.command(aliases=['about'])
-    async def info(ctx):
+    @commands.command(aliases=['about'])
+    async def info(self, ctx):
+        """Show bot information"""
         embed = discord.Embed(title="Developers: RedTeaDev, ColaIan", description="Multi-purpose Discord Bot",
                               color=0x7400FF)
         embed.set_author(name=f"Teapot.py {teapot.version()}",
-                         icon_url="https://cdn.discordapp.com/avatars/612634758744113182"
-                                  "/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
+                         icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
         embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
-        embed.add_field(name="Bot User:", value=bot.user)
-        embed.add_field(name="Guilds:", value=len(bot.guilds))
-        embed.add_field(name="Members:", value=len(set(bot.get_all_members())))
-        embed.add_field(name="O.S.:", value=str(teapot.platform()))
+        embed.add_field(name="Bot User:", value=self.bot.user)
+        embed.add_field(name="Guilds:", value=len(self.bot.guilds))
+        embed.add_field(name="Members:", value=len(set(self.bot.get_all_members())))
+        embed.add_field(name="O.S.:", value=str(teapot.get_platform()))
         embed.add_field(name="Storage Type:", value=teapot.config.storage_type())
         embed.add_field(name="Prefix:", value=", ".join(teapot.config.bot_prefix()))
         embed.add_field(name="Github Repo:", value="[Teapot.py](https://github.com/RedCokeDevelopment/Teapot.py)")
@@ -101,66 +81,54 @@ async def info(ctx):
         embed.set_image(
             url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
         await ctx.send(embed=embed)
-        await ctx.message.add_reaction(emoji='✅')
-
 
-def ping(bot):
-    @bot.command()
-    async def ping(ctx):
-        await ctx.send(f'Pong! {round(bot.latency * 1000)} ms')
-        await ctx.message.add_reaction(emoji='✅')
+    @commands.command()
+    async def ping(self, ctx):
+        """Show bot latency"""
+        await ctx.send(f'Pong! {round(self.bot.latency * 1000)} ms')
 
-
-def prune(bot):
-    @bot.command(aliases=['purge', 'clear', 'cls'])
-    @cmd.has_permissions(manage_messages=True)
-    async def prune(ctx, amount=0):
+    @commands.command(aliases=['purge', 'clear', 'cls'])
+    @commands.has_permissions(manage_messages=True)
+    async def prune(self, ctx, amount: int = 0):
+        """Delete multiple messages"""
         if amount == 0:
             await ctx.send("Please specify the number of messages you want to delete!")
-            await ctx.message.add_reaction(emoji='❌')
         elif amount <= 0:  # lower then 0
             await ctx.send("The number must be bigger than 0!")
-            await ctx.message.add_reaction(emoji='❌')
         else:
-            await ctx.message.add_reaction(emoji='✅')
             await ctx.channel.purge(limit=amount + 1)
-
-
-def kick(bot):
-    @bot.command()
-    @cmd.has_permissions(kick_members=True)  # check user permission
-    async def kick(ctx, member: discord.Member, *, reason=None):
+            message = await ctx.send(f'Purged {amount} messages!')
+            await asyncio.sleep(3)
+            await message.delete()
+
+    @commands.command()
+    @commands.has_permissions(kick_members=True)
+    async def kick(self, ctx, member: discord.Member, *, reason=None):
+        """Kick a member from the server"""
         try:
             await member.kick(reason=reason)
             await ctx.send(f'{member} has been kicked!')
-            await ctx.message.add_reaction(emoji='✅')
         except Exception as failkick:
             await ctx.send("Failed to kick: " + str(failkick))
-            await ctx.message.add_reaction(emoji='❌')
-
 
-def ban(bot):
-    @bot.command()
-    @cmd.has_permissions(ban_members=True)  # check user permission
-    async def ban(ctx, member: discord.Member, *, reason=None):
+    @commands.command()
+    @commands.has_permissions(ban_members=True)
+    async def ban(self, ctx, member: discord.Member, *, reason=None):
+        """Ban a member from the server"""
         try:
             await member.ban(reason=reason)
             await ctx.send(f'{member} has been banned!')
-            await ctx.message.add_reaction(emoji='✅')
         except Exception as e:
             await ctx.send("Failed to ban: " + str(e))
-            await ctx.message.add_reaction(emoji='❌')
 
-
-def admin(bot):  # WIP...
-    @bot.command()
-    async def admin(ctx):
+    @commands.command()
+    async def admin(self, ctx):
+        """Admin panel (WIP)"""
         await ctx.send(embed=teapot.messages.WIP())
 
-
-def owner(bot):
-    @bot.command()
-    async def owner(ctx):
+    @commands.command()
+    async def owner(self, ctx):
+        """Grant owner role to bot owner"""
         if ctx.message.author.id == teapot.config.bot_owner():
             found = False
             for role in ctx.guild.roles:
@@ -176,22 +144,21 @@ async def owner(ctx):
                         await ctx.guild.get_member(teapot.config.bot_owner()).add_roles(role)
                         break
 
-
-def debug(bot):
-    @bot.command()
-    @cmd.has_permissions(administrator=True)
-    async def debug(ctx):
+    @commands.command()
+    @commands.has_permissions(administrator=True)
+    async def debug(self, ctx):
+        """Show debug information"""
         embed = discord.Embed(title="Developers: RedTea, ColaIan", description="Debug info:",
                               color=0x7400FF)
         embed.set_author(name=f"Teapot.py {teapot.version()}",
                          icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
         embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
-        embed.add_field(name="Bot User:", value=bot.user, inline=True)
+        embed.add_field(name="Bot User:", value=self.bot.user, inline=True)
         embed.add_field(name="System Time:", value=time.strftime("%a %b %d %H:%M:%S %Y", time.localtime()), inline=True)
         embed.add_field(name="Memory",
                         value=str(round(psutil.virtual_memory()[1] / 1024 / 1024 / 1024)) + "GB / " + str(round(
                             psutil.virtual_memory()[0] / 1024 / 1024 / 1024)) + "GB", inline=True)
-        embed.add_field(name="O.S.:", value=str(teapot.platform()), inline=True)
+        embed.add_field(name="O.S.:", value=str(teapot.get_platform()), inline=True)
         embed.add_field(name="Storage Type:", value=teapot.config.storage_type(), inline=True)
         embed.add_field(name="Prefix:", value=", ".join(teapot.config.bot_prefix()), inline=True)
         embed.add_field(name="Github Repo:", value="[Teapot.py](https://github.com/RedCokeDevelopment/Teapot.py)",
@@ -205,6 +172,9 @@ async def debug(ctx):
                               "[Repository](https://github.com/RedCokeDevelopment/Teapot.py)",
                         inline=False)
         embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
-        # embed.set_image(url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
         await ctx.message.author.send(embed=embed)
-        await ctx.message.add_reaction(emoji='✅')
+
+
+async def setup(bot):
+    bot.remove_command('help')
+    await bot.add_cog(BasicCommands(bot))

teapot/cogs/github.py

@@ -62,6 +62,6 @@ async def github(self, ctx, arg):
             await ctx.send(embed=teapot.messages.error("Fetch repository info"))
 
 
-def setup(bot):
+async def setup(bot):
     """ Setup GitHub Module"""
-    bot.add_cog(GitHub(bot))
+    await bot.add_cog(GitHub(bot))

teapot/cogs/music.py

@@ -268,7 +268,7 @@ async def disconnect(self, ctx):
 
     async def ensure_voice(self, ctx):
         """ This check ensures that the bot and command author are in the same voice channel. """
-        player = self.bot.lavalink.player_manager.create(ctx.guild.id, endpoint=str(ctx.guild.region))
+        player = self.bot.lavalink.player_manager.create(ctx.guild.id)
         should_connect = ctx.command.name in ('play')  # Add commands that require joining voice to work.
 
         if not ctx.author.voice or not ctx.author.voice.channel:
@@ -290,6 +290,6 @@ async def ensure_voice(self, ctx):
                 raise commands.CommandInvokeError('You need to be in my voice channel.')
 
 
-def setup(bot):
+async def setup(bot):
     """ Initialize music module """
-    bot.add_cog(Music(bot))
+    await bot.add_cog(Music(bot))

teapot/cogs/neko.py

@@ -124,6 +124,6 @@ async def hentai(self, ctx, api_type=""):
             await ctx.send("This command only works in NSFW channels!")
 
 
-def setup(bot):
+async def setup(bot):
     """ Setup Neko Module"""
-    bot.add_cog(Neko(bot))
+    await bot.add_cog(Neko(bot))