-
Notifications
You must be signed in to change notification settings - Fork 137
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.
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
fix: Another blind spot of command sync algorithm #1108 #1129
Open
koshakkkq
wants to merge
3
commits into
DisnakeDev:master
Choose a base branch
from
koshakkkq:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Make message_command check both local and synchronized guild_ids | ||
This file contains 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
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -830,9 +830,13 @@ async def _sync_application_commands(self) -> None: | |||||||||
# Same process but for each specified guild individually. | ||||||||||
# Notice that we're not doing this for every single guild for optimisation purposes. | ||||||||||
# See the note in :meth:`_cache_application_commands` about guild app commands. | ||||||||||
guild_ids_to_check = set(guild_cmds.keys()) | ||||||||||
for guild_id in self._connection._guild_application_commands.keys(): | ||||||||||
guild_ids_to_check.add(guild_id) | ||||||||||
Comment on lines
+833
to
+835
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This can be simplified a bit:
Suggested change
|
||||||||||
if self._command_sync_flags.sync_guild_commands: | ||||||||||
for guild_id, cmds in guild_cmds.items(): | ||||||||||
for guild_id in guild_ids_to_check: | ||||||||||
current_guild_cmds = self._connection._guild_application_commands.get(guild_id, {}) | ||||||||||
cmds = guild_cmds.get(guild_id, {}) | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
diff = _app_commands_diff(cmds, current_guild_cmds.values()) | ||||||||||
if not self._command_sync_flags.allow_command_deletion: | ||||||||||
# because allow_command_deletion is disabled, we want to never automatically delete a command | ||||||||||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR fixes multiple things, not only the
message_command
decorator. I think it'd be better to say which bug has been fixed.