update to dpy 2.0

Author: OmLanke

environment.template

@@ -0,0 +1,27 @@
+aiocache==0.12.2
+aiohttp==3.9.1   
+aiosignal==1.3.1 
+attrs==23.1.0    
+contourpy==1.2.0 
+cycler==0.12.1   
+discord.py==2.3.2
+fonttools==4.46.0
+frozenlist==1.4.0
+idna==3.6        
+kiwisolver==1.4.5
+lxml==4.9.3      
+matplotlib==3.8.2
+multidict==6.0.4 
+numpy==1.26.2    
+packaging==23.2  
+pandas==2.1.3
+Pillow==10.1.0
+pycairo==1.25.1
+pyparsing==3.1.1
+python-dateutil==2.8.2
+python-dotenv==1.0.0
+pytz==2023.3.post1
+seaborn==0.13.0
+six==1.16.0
+tzdata==2023.3
+yarl==1.9.3

requirements.txt

@@ -3,11 +3,14 @@
 import distutils.util
 import logging
 import os
-import discord
 from logging.handlers import TimedRotatingFileHandler
-from os import environ
+from os import getenv
 from pathlib import Path
 
+from dotenv import load_dotenv
+load_dotenv()
+
+import discord
 import seaborn as sns
 from discord.ext import commands
 from matplotlib import pyplot as plt
@@ -17,7 +20,7 @@
 from tle.util import discord_common, font_downloader
 
 
-def setup():
+async def setup():
     # Make required directories.
     for path in constants.ALL_DIRS:
         os.makedirs(path, exist_ok=True)
@@ -40,33 +43,41 @@ def setup():
     sns.set_style('darkgrid', options)
 
     # Download fonts if necessary
-    font_downloader.maybe_download()
+    await font_downloader.maybe_download()
+
 
+class Bot(commands.Bot):
+
+    def __init__(self, *args, **kwargs):
+        intents = discord.Intents.default()
+        intents.members = True
+        intents.message_content = True
+        super().__init__(command_prefix=commands.when_mentioned_or(';'), intents=intents)
+
+    async def setup_hook(self) -> None:
+        await setup()
+        cogs = [file.stem for file in Path('tle', 'cogs').glob('*.py')]
+        for extension in cogs:
+            await self.load_extension(f'tle.cogs.{extension}')
+        logging.info(f'Cogs loaded: {", ".join(self.cogs)}')
+        
 
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--nodb', action='store_true')
     args = parser.parse_args()
 
-    token = environ.get('BOT_TOKEN')
+    token = getenv('BOT_TOKEN')
     if not token:
         logging.error('Token required')
         return
 
-    allow_self_register = environ.get('ALLOW_DUEL_SELF_REGISTER')
+    allow_self_register = getenv('ALLOW_DUEL_SELF_REGISTER')
     if allow_self_register:
-        constants.ALLOW_DUEL_SELF_REGISTER = bool(distutils.util.strtobool(allow_self_register))
-
-    setup()
-    
-    intents = discord.Intents.default()
-    intents.members = True
-
-    bot = commands.Bot(command_prefix=commands.when_mentioned_or(';'), intents=intents)
-    cogs = [file.stem for file in Path('tle', 'cogs').glob('*.py')]
-    for extension in cogs:
-        bot.load_extension(f'tle.cogs.{extension}')
-    logging.info(f'Cogs loaded: {", ".join(bot.cogs)}')
+        # constants.ALLOW_DUEL_SELF_REGISTER = bool(distutils.util.strtobool(allow_self_register))
+        constants.ALLOW_DUEL_SELF_REGISTER = allow_self_register in ["true", "True", "TRUE"]
+
+    bot = Bot()
 
     def no_dm_check(ctx):
         if ctx.guild is None:

tle/__main__.py

@@ -85,5 +85,5 @@ async def problemsets(self, ctx, contest_id):
         await ctx.send(f'Done, fetched {count} problems')
 
 
-def setup(bot):
-    bot.add_cog(CacheControl(bot))
+async def setup(bot):
+    await bot.add_cog(CacheControl(bot))

tle/cogs/cache_control.py

@@ -514,5 +514,5 @@ async def cog_command_error(self, ctx, error):
         pass
 
 
-def setup(bot):
-    bot.add_cog(Codeforces(bot))
+async def setup(bot):
+    await bot.add_cog(Codeforces(bot))

tle/cogs/codeforces.py

@@ -759,5 +759,5 @@ async def cog_command_error(self, ctx, error):
         pass
 
 
-def setup(bot):
-    bot.add_cog(Contests(bot))
+async def setup(bot):
+    await bot.add_cog(Contests(bot))

tle/cogs/contests.py

@@ -125,5 +125,5 @@ async def _updatecses(self, ctx):
             await ctx.send('CSES leaderboards updated!')
 
 
-def setup(bot):
-    bot.add_cog(CSES(bot))
+async def setup(bot):
+    await bot.add_cog(CSES(bot))

tle/cogs/deactivated/cses.py

@@ -642,5 +642,5 @@ async def cog_command_error(self, ctx, error):
         pass
 
 
-def setup(bot):
-    bot.add_cog(Dueling(bot))
+async def setup(bot):
+    await bot.add_cog(Dueling(bot))

tle/cogs/duel.py

@@ -1057,5 +1057,5 @@ async def cog_command_error(self, ctx, error):
         pass
 
 
-def setup(bot):
-    bot.add_cog(Graphs(bot))
+async def setup(bot):
+    await bot.add_cog(Graphs(bot))

tle/cogs/graphs.py

@@ -812,5 +812,5 @@ async def cog_command_error(self, ctx, error):
         pass
 
 
-def setup(bot):
-    bot.add_cog(Handles(bot))
+async def setup(bot):
+    await bot.add_cog(Handles(bot))