fix: category cooldown commands works in dms like other guild cooldowns#2603
Merged
Lulalaby merged 12 commits intoPycord-Development:masterfrom Oct 10, 2024
Revnoplex:master
Merged
fix: category cooldown commands works in dms like other guild cooldowns#2603Lulalaby merged 12 commits intoPycord-Development:masterfrom Revnoplex:master
Lulalaby merged 12 commits intoPycord-Development:masterfrom
Revnoplex:master
Conversation
Dorukyum
reviewed
Oct 9, 2024
Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>
Dorukyum
requested changes
Oct 9, 2024
Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>
Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>
Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>
Contributor
Author
|
no, wait it undid it, actually it merged it weirdly |
Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com>
Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com>
Dorukyum
approved these changes
Oct 10, 2024
Lulalaby
approved these changes
Oct 10, 2024
baribarton
pushed a commit
to baribarton/pycord-no-potential-reconnect
that referenced
this pull request
Oct 24, 2024
…ns (Pycord-Development#2603) * fix: category cooldown works in dms like other guild cooldowns * style(pre-commit): auto fixes from pre-commit.com hooks * Add changelog entry * style(pre-commit): auto fixes from pre-commit.com hooks * Update discord/ext/commands/cooldowns.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * Update discord/ext/commands/cooldowns.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * fix mistyped suggestion cooldowns.py Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * Update discord/ext/commands/cooldowns.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * undo broken merge caused by b25d9a7 Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> --------- Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com>
OmLanke
pushed a commit
to OmLanke/pycord
that referenced
this pull request
Dec 16, 2024
…ns (Pycord-Development#2603) * fix: category cooldown works in dms like other guild cooldowns * style(pre-commit): auto fixes from pre-commit.com hooks * Add changelog entry * style(pre-commit): auto fixes from pre-commit.com hooks * Update discord/ext/commands/cooldowns.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * Update discord/ext/commands/cooldowns.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * fix mistyped suggestion cooldowns.py Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * Update discord/ext/commands/cooldowns.py Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * undo broken merge caused by b25d9a7 Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> * Update CHANGELOG.md Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> --------- Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> Signed-off-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
While testing certain cooldown types for my cooldown handler. I stumbled upon an error when using a command that had a category cooldown in DMs. Note that the other guild-like cooldown types such as
BucketType.guild,BucketType.memberandBucketType.rolework fine in DMs. So it is reasonable to consider this an unintended error rather than intentional and should be fixed. The error was caused by returning the bucket id using(msg.channel.category or msg.channel).idwhich can result in an error when it tries to access thecategoryattribute when the channel is not aGuildChannelsuch as aPrivateChannelwhich doesn't have acategoryattribute so it results in aAttributeError. By using(msg.channel.category if isinstance(msg.channel, discord.abc.GuildChannel) else msg.channel).id(aGuildChannelalways has a category attribute), it won't try to access the attribute when it can't.Information
examples, ...).
Checklist
type: ignorecomments were used, a comment is also left explaining why.