Merge pull request #277 from Lunarmagpie/on_ready_bug

🐛 fix on_ready middleware

pincer/client.py

@@ -432,7 +432,7 @@ def execute_event(calls: List[Coro], *args, **kwargs):
             if should_pass_cls(call):
                 call_args = (
                     ChatCommandHandler.managers[call.__module__],
-                    *args
+                    *(arg for arg in args if arg is not None)
                 )
 
             ensure_future(call(*call_args, **kwargs))
@@ -495,12 +495,11 @@ async def handle_middleware(
         if next_call is None:
             raise RuntimeError(f"Middleware `{key}` has not been registered.")
 
-        return (
-            (next_call, ret_object)
-            if next_call.startswith("on_")
-            else await self.handle_middleware(
-                payload, next_call, *arguments, **params
-            )
+        if next_call.startswith("on_"):
+            return (next_call, ret_object)
+
+        return await self.handle_middleware(
+            payload, next_call, *arguments, **params
         )
 
     async def execute_error(
@@ -547,12 +546,11 @@ async def process_event(self, name: str, payload: GatewayDispatch):
             what specifically happened.
         """
         try:
-            key, ret_object = await self.handle_middleware(payload, name)
-
-            self.event_mgr.process_events(key, ret_object)
+            key, args = await self.handle_middleware(payload, name)
+            self.event_mgr.process_events(key, args)
 
             if calls := self.get_event_coro(key):
-                self.execute_event(calls, ret_object)
+                self.execute_event(calls, args)
 
         except Exception as e:
             await self.execute_error(e)
@@ -665,7 +663,7 @@ async def get_guild_template(self, code: str) -> GuildTemplate:
         """
         return GuildTemplate.from_dict(
             construct_client_dict(
-                self, 
+                self,
                 await self.http.get(f"guilds/templates/{code}")
             )
         )

pincer/objects/guild/guild.py

@@ -7,6 +7,7 @@
 from enum import IntEnum
 from typing import AsyncGenerator, overload, TYPE_CHECKING
 
+from .channel import Channel
 from ...exceptions import UnavailableGuildError
 from ...utils.api_object import APIObject
 from ...utils.conversion import construct_client_dict, remove_none
@@ -17,7 +18,6 @@
 
     from .audit_log import AuditLog
     from .ban import Ban
-    from .channel import Channel
     from .invite import Invite
     from .member import GuildMember
     from .features import GuildFeature

pincer/utils/event_mgr.py

@@ -48,7 +48,11 @@ def matches_event(self, event_name: str, event_value: Any):
             return False
 
         if self.check:
-            return self.check(event_value)
+            if event_value is not None:
+                return self.check(event_value)
+            else:
+                # Certain middleware do not have an event_value
+                return self.check()
 
         return True