dpy-ecb2cf & Fix plugins not loading, resolve #3141

Author: fourjr

Pipfile

@@ -11,7 +11,7 @@ pylint = "~=2.9.3"
 [packages]
 aiohttp = "==3.7.4.post0"
 colorama = "~=0.4.4"  # Doesn't officially support Python 3.9 yet, v0.4.5 will support 3.9
-"discord.py" = {ref = "97fe07edb2f3d0f5a980917fb6ee479bf396fd94", git = "https://github.com/Rapptz/discord.py.git"}
+"discord.py" = {ref = "987235d5649e7c2b1a927637bab6547244ecb2cf", git = "https://github.com/Rapptz/discord.py.git"}
 emoji = "~=1.2.0"
 isodate = "~=0.6.0"
 motor = "~=2.4.0"

bot.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.0-dev7"
+__version__ = "4.0.0-dev8"
 
 
 import asyncio
@@ -189,6 +189,7 @@ async def get_prefix(self, message=None):
     def run(self):
         async def runner():
             async with self:
+                self.session = ClientSession(loop=self.loop)
                 try:
                     retry_intents = False
                     try:
@@ -496,7 +497,6 @@ async def on_connect(self):
         await self.config.refresh()
         await self.api.setup_indexes()
         await self.load_extensions()
-        self.session = ClientSession(loop=self.loop)
         self._connected.set()
 
     async def on_ready(self):

cogs/plugins.py

@@ -123,7 +123,7 @@ def __init__(self, bot):
         self.loaded_plugins = set()
         self._ready_event = asyncio.Event()
 
-    async def async_init(self):
+    async def cog_load(self):
         await self.populate_registry()
         if self.bot.config.get("enable_plugins"):
             await self.initial_load_plugins()
@@ -136,8 +136,6 @@ async def populate_registry(self):
             self.registry = json.loads(await resp.text())
 
     async def initial_load_plugins(self):
-        await self.bot.wait_for_connected()
-
         for plugin_name in list(self.bot.config["plugins"]):
             try:
                 plugin = Plugin.from_string(plugin_name, strict=True)

cogs/utility.py

@@ -260,7 +260,7 @@ def __init__(self, bot):
             self.eval_.enabled = False
             logger.info("Eval disabled. enable_eval=False")
 
-    async def async_init(self):
+    async def cog_load(self):
         self.loop_presence.start()  # pylint: disable=no-member
 
     def cog_unload(self):

pyproject.toml

@@ -21,7 +21,7 @@ extend-exclude = '''
 
 [tool.poetry]
 name = 'Modmail'
-version = '4.0.0-dev7'
+version = '4.0.0-dev8'
 description = "Modmail is similar to Reddit's Modmail, both in functionality and purpose. It serves as a shared inbox for server staff to communicate with their users in a seamless way."
 license = 'AGPL-3.0-only'
 authors = [