Merge branch 'master' into feat/audioop

Author: davidhozic

CHANGELOG.md

@@ -40,6 +40,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Fixed `Guild.create_test_entitlement()` and `User.create_test_entitlement()` using the
   guild/user ID instead of the application ID.
   ([#2595](https://github.com/Pycord-Development/pycord/pull/2595))
+- Fixed commands with `BucketType.cagegory` cooldown causing issues in private channels.
+  ([#2603](https://github.com/Pycord-Development/pycord/pull/2603))
 
 ### Changed
 

discord/ext/commands/cooldowns.py

@@ -30,6 +30,7 @@
 from collections import deque
 from typing import TYPE_CHECKING, Any, Callable, Deque, TypeVar
 
+import discord.abc
 from discord.enums import Enum
 
 from ...abc import PrivateChannel
@@ -69,7 +70,12 @@ def get_key(self, msg: Message) -> Any:
         elif self is BucketType.member:
             return (msg.guild and msg.guild.id), msg.author.id
         elif self is BucketType.category:
-            return (msg.channel.category or msg.channel).id  # type: ignore
+            return (
+                msg.channel.category.id
+                if isinstance(msg.channel, discord.abc.GuildChannel)
+                and msg.channel.category
+                else msg.channel.id
+            )
         elif self is BucketType.role:
             # we return the channel id of a private-channel as there are only roles in guilds
             # and that yields the same result as for a guild with only the @everyone role

discord/message.py

@@ -1548,6 +1548,8 @@ async def edit(
 
         Raises
         ------
+        NotFound
+            The message was not found.
         HTTPException
             Editing the message failed.
         Forbidden

docs/old_changelog.rst

@@ -625,7 +625,7 @@ Bug Fixes
 - Fix out of order files being sent in webhooks when there are 10 files.
 - |commands| Extensions that fail internally due to ImportError will no longer raise :exc:`~.ext.commands.ExtensionNotFound`. (:dpy-issue:`2244`, :dpy-issue:`2275`, :dpy-issue:`2291`)
 - |commands| Updating the :attr:`Paginator.suffix <.ext.commands.Paginator.suffix>` will not cause out of date calculations. (:dpy-issue:`2251`)
-- |commands| Allow converters from custom extension packages. (:dpy-issue:`2369`, :dpy-issue:`2374`)
+- |commands| Allow converters from custom extension packages. (:dpy-issue:`2369`, 2374)
 - |commands| Fix issue with paginator prefix being ``None`` causing empty pages. (:dpy-issue:`2471`)
 - |commands| :class:`~.commands.Greedy` now ignores parsing errors rather than propagating them.
 - |commands| :meth:`Command.can_run <.ext.commands.Command.can_run>` now checks whether a command is disabled.

requirements/dev.txt

@@ -5,7 +5,7 @@ pytest-asyncio~=0.23.8
 # pytest-order~=1.0.1
 mypy~=1.11.2
 coverage~=7.6
-pre-commit==4.0.0
+pre-commit==4.0.1
 codespell==2.3.0
 bandit==1.7.10
 flake8==7.1.1