Skip to content
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

fix: Another blind spot of command sync algorithm #1108 #1129

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: Another blind spot of command sync algorithm #1108 #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d09997
fix
koshakkkq Oct 29, 2023
536a2cd
rst added
koshakkkq Oct 29, 2023
db23175
rst eol fix
koshakkkq Oct 29, 2023
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
1 change: 1 addition & 0 deletions changelog/1108.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make message_command check both local and synchronized guild_ids
Copy link
Member

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.

6 changes: 5 additions & 1 deletion disnake/ext/commands/interaction_bot_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be simplified a bit:

Suggested change
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)
guild_ids_to_check = guild_cmds.keys() | self._connection._guild_application_commands.keys()

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, {})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cmds = guild_cmds.get(guild_id, {})
cmds = guild_cmds.get(guild_id, [])

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
Expand Down