turn is_on_cooldown_async

Author: Lumabots

discord/commands/core.py

@@ -365,7 +365,7 @@ async def prepare(self, ctx: ApplicationContext) -> None:
                 await self._max_concurrency.release(ctx)  # type: ignore # ctx instead of non-existent message
             raise
 
-    def is_on_cooldown(self, ctx: ApplicationContext) -> bool:
+    async def is_on_cooldown(self, ctx: ApplicationContext) -> bool:
         """Checks whether the command is currently on cooldown.
 
         .. note::
@@ -385,7 +385,7 @@ def is_on_cooldown(self, ctx: ApplicationContext) -> bool:
         if not self._buckets.valid:
             return False
 
-        bucket = self._buckets.get_bucket(ctx)  # type: ignore
+        bucket = await self._buckets.get_bucket(ctx)  # type: ignore
         current = utcnow().timestamp()
         return bucket.get_tokens(current) == 0
 
@@ -920,9 +920,7 @@ def _match_option_param_names(self, params, options):
     def _is_typing_union(self, annotation):
         return getattr(annotation, "__origin__", None) is Union or type(
             annotation
-        ) is getattr(
-            types, "UnionType", Union
-        )  # type: ignore
+        ) is getattr(types, "UnionType", Union)  # type: ignore
 
     def _is_typing_optional(self, annotation):
         return self._is_typing_union(annotation) and type(None) in annotation.__args__  # type: ignore

discord/ext/commands/cooldowns.py

@@ -33,6 +33,7 @@
 
 import discord.abc
 from discord.enums import Enum
+from discord import utils
 
 from ...abc import PrivateChannel
 from .errors import MaxConcurrencyReached
@@ -307,15 +308,7 @@ def valid(self) -> bool:
     async def create_bucket(
         self, ctx: Context | ApplicationContext | Message
     ) -> Cooldown:
-        from ...ext.commands import Context
-
-        if isinstance(ctx, Context):
-            result = self._factory(ctx.message)
-        else:
-            result = self._factory(ctx)
-        if inspect.isawaitable(result):
-            return await result
-        return result
+        return await utils.maybe_coroutine(self._factory, ctx)
 
 
 class _Semaphore:

discord/ext/commands/core.py

@@ -893,7 +893,7 @@ async def prepare(self, ctx: Context) -> None:
     def cooldown(self) -> Cooldown | None:
         return self._buckets._cooldown
 
-    def is_on_cooldown(self, ctx: Context) -> bool:
+    async def is_on_cooldown(self, ctx: Context) -> bool:
         """Checks whether the command is currently on cooldown.
 
         Parameters
@@ -909,7 +909,7 @@ def is_on_cooldown(self, ctx: Context) -> bool:
         if not self._buckets.valid:
             return False
 
-        bucket = self._buckets.get_bucket(ctx.message)
+        bucket = await self._buckets.get_bucket(ctx.message)
         dt = ctx.message.edited_at or ctx.message.created_at
         current = dt.replace(tzinfo=datetime.timezone.utc).timestamp()
         return bucket.get_tokens(current) == 0
@@ -1086,9 +1086,7 @@ def _is_typing_optional(self, annotation: T | T | None) -> TypeGuard[T | None]:
         return (
             getattr(annotation, "__origin__", None) is Union
             or type(annotation) is getattr(types, "UnionType", Union)
-        ) and type(
-            None
-        ) in annotation.__args__  # type: ignore
+        ) and type(None) in annotation.__args__  # type: ignore
 
     @property
     def signature(self) -> str: