fix: remove unnecessary type ignores for context in cooldown handling + correct typehint of max_concurrency since only ctx is passed and never message

Author: Lumabots

discord/commands/core.py

@@ -336,7 +336,7 @@ def guild_only(self, value: bool) -> None:
     async def _prepare_cooldowns(self, ctx: ApplicationContext):
         if self._buckets.valid:
             current = datetime.datetime.now().timestamp()
-            bucket = await self._buckets.get_bucket(ctx, current)  # type: ignore # ctx instead of non-existent message
+            bucket = await self._buckets.get_bucket(ctx, current)
 
             if bucket is not None:
                 retry_after = bucket.update_rate_limit(current)
@@ -356,9 +356,7 @@ async def prepare(self, ctx: ApplicationContext) -> None:
             )
 
         if self._max_concurrency is not None:
-            # For this application, context can be duck-typed as a Message
-            await self._max_concurrency.acquire(ctx)  # type: ignore # ctx instead of non-existent message
-
+            await self._max_concurrency.acquire(ctx)
         try:
             await self._prepare_cooldowns(ctx)
             await self.call_before_hooks(ctx)
@@ -400,7 +398,7 @@ def reset_cooldown(self, ctx: ApplicationContext) -> None:
             The invocation context to reset the cooldown under.
         """
         if self._buckets.valid:
-            bucket = self._buckets.get_bucket(ctx)  # type: ignore # ctx instead of non-existent message
+            bucket = self._buckets.get_bucket(ctx)
             bucket.reset()
 
     def get_cooldown_retry_after(self, ctx: ApplicationContext) -> float:

discord/ext/commands/cooldowns.py

@@ -399,11 +399,11 @@ def __repr__(self) -> str:
             f"<MaxConcurrency per={self.per!r} number={self.number} wait={self.wait}>"
         )
 
-    def get_key(self, message: Message) -> Any:
-        return self.per.get_key(message)
+    def get_key(self, ctx: Context | ApplicationContext) -> Any:
+        return self.per.get_key(ctx)
 
-    async def acquire(self, message: Message) -> None:
-        key = self.get_key(message)
+    async def acquire(self, ctx: Context | ApplicationContext) -> None:
+        key = self.get_key(ctx)
 
         try:
             sem = self._mapping[key]
@@ -414,10 +414,10 @@ async def acquire(self, message: Message) -> None:
         if not acquired:
             raise MaxConcurrencyReached(self.number, self.per)
 
-    async def release(self, message: Message) -> None:
+    async def release(self, ctx: Context | ApplicationContext) -> None:
         # Technically there's no reason for this function to be async
         # But it might be more useful in the future
-        key = self.get_key(message)
+        key = self.get_key(ctx)
 
         try:
             sem = self._mapping[key]

discord/ext/commands/core.py

@@ -873,8 +873,7 @@ async def prepare(self, ctx: Context) -> None:
             )
 
         if self._max_concurrency is not None:
-            # For this application, context can be duck-typed as a Message
-            await self._max_concurrency.acquire(ctx)  # type: ignore
+            await self._max_concurrency.acquire(ctx)
 
         try:
             if self.cooldown_after_parsing: