Merge pull request #99 from RedCokeDevelopment/rt-rewrite

Rewrite Teapot.py to support latest version of discord.py

Author: RedTeaDev

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: RedCokeDevelopment # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+#polar: # Replace with a single Polar username
+buy_me_a_coffee: Colaian # Replace with a single Buy Me a Coffee username 
+#thanks_dev: # Replace with a single thanks.dev username
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/Teapot.py.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9.16
+    - name: Set up Python 3.10.18
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9.16
+        python-version: 3.10.18
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

README.md

@@ -51,8 +51,9 @@ There are two owners for this project. They all contribute massively to the runn
 ## 📜 Requirements
 These are the requirements for the bot.
 
-- [Python 3.9](https://www.python.org/downloads) (Required packages listed in requirements.txt)
+- [Python 3.10](https://www.python.org/downloads) (Required packages listed in requirements.txt)
 - [LavaLink Server](https://github.com/freyacodes/lavalink) (Java 11 required)
+- Database is optional but preferred
 
 ## 💖 Credits
 The projects listed in below have provided inspiration, and we thought we'd mention them:

Teapot.py

@@ -7,8 +7,10 @@
 import discord
 from discord.ext import commands as dcmd
 from dotenv import load_dotenv
+import lavalink
 
 import teapot
+from teapot.event_handler.loader import EventHandlerLoader
 
 print(f"""
   _____                      _   
@@ -70,7 +72,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 +85,57 @@
     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)
 
+event_handler_loader = EventHandlerLoader(bot) # Event Handler
+
+
 @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)
+    # Initialize lavalink client once here so cogs do not need to recreate it
+    if not hasattr(bot, 'lavalink'):
+        print("Initializing Lavalink client...")
+        bot.lavalink = lavalink.Client(bot.user.id)
+        bot.lavalink.add_node(teapot.config.lavalink_host(), teapot.config.lavalink_port(), teapot.config.lavalink_password(), 'zz', 'default')
+        bot.add_listener(bot.lavalink.voice_update_handler, 'on_socket_response')
+    extensions = [
+        'teapot.cogs.cmds',
+        'teapot.cogs.osu', 
+        'teapot.cogs.github',
+        'teapot.cogs.cat',
+        'teapot.cogs.neko',
+        'teapot.cogs.nqn',
+        'teapot.cogs.music' # TODO: WIP
+    ]
+    
+    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
 

requirements.txt

@@ -1,24 +1,24 @@
-aiohttp>=3.6.2
-async-timeout>=3.0.1
-attrs>=19.3.0
-beautifulsoup4>=4.10.0
-bs4>=0.0.1
-certifi>=2021.5.30
-chardet>=3.0.4
-discord.py>=1.7.3
-idna>=2.10
-lavalink>=3.1.2
-multidict>=4.7.6
+aiohttp>=3.12.15
+async-timeout>=5.0.1
+attrs>=25.3.0
+beautifulsoup4>=4.14.0
+bs4>=0.0.2
+certifi>=2025.8.3
+chardet>=5.2.0
+discord.py>=2.6.3
+idna>=3.10
+lavalink>=5.9.0
+multidict>=6.6.4
 mysql-connector>=2.2.9
-psutil>=5.7.2
-python-dotenv>=0.14.0
-requests>=2.24.0
-soupsieve>=2.0.1
-typing-extensions>=3.7.4.2
-urllib3>=1.25.10
-websockets>=8.1
-yarl>=1.5.1
-mysql-connector-python>=8.0.21
-alt-profanity-check==1.1.3
-protobuf>=3.20.2 # not directly required, pinned by Snyk to avoid a vulnerability
-
+psutil>=7.1.0
+python-dotenv>=1.1.1
+requests>=2.32.5
+soupsieve>=2.8
+typing-extensions>=4.15.0
+urllib3>=2.5.0
+websockets>=15.0.1
+yarl>=1.20.1
+mysql-connector-python>=9.4.0
+alt-profanity-check==1.7.2
+PyNaCl>=1.6.1
+protobuf>=6.32.1 # not directly required, pinned by Snyk to avoid a vulnerability

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))