Skip to content

fix: category cooldown commands works in dms like other guild cooldowns #2603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 10, 2024
Merged

fix: category cooldown commands works in dms like other guild cooldowns #2603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
faeb369
fix: category cooldown works in dms like other guild cooldowns
Revnoplex Oct 9, 2024
7d493df
Merge branch 'Pycord-Development:master' into master
Revnoplex Oct 9, 2024
5a5511a
style(pre-commit): auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 9, 2024
6f5a949
Add changelog entry
Revnoplex Oct 9, 2024
93ee503
Merge remote-tracking branch 'refs/remotes/origin/master'
Revnoplex Oct 9, 2024
e78de73
style(pre-commit): auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 9, 2024
8d78a73
Update discord/ext/commands/cooldowns.py
Revnoplex Oct 9, 2024
15c1357
Update discord/ext/commands/cooldowns.py
Revnoplex Oct 9, 2024
4c1620f
fix mistyped suggestion cooldowns.py
Revnoplex Oct 9, 2024
b25d9a7
Update discord/ext/commands/cooldowns.py
Revnoplex Oct 9, 2024
67a8939
undo broken merge caused by b25d9a7
Revnoplex Oct 9, 2024
140cdc1
Update CHANGELOG.md
Dorukyum Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 7 additions & 1 deletion discord/ext/commands/cooldowns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down