Skip to content

fix: edge case error occurring when adding guild IDs to the resolved data in the option dispatching. #1172

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
Damego merged 2 commits into from
Nov 19, 2022
Merged

fix: edge case error occurring when adding guild IDs to the resolved data in the option dispatching. #1172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
becd018
fix: edge case
EepyElvyra Nov 18, 2022
fbb0b7b
refactor: move import
EepyElvyra Nov 18, 2022
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
21 changes: 13 additions & 8 deletions interactions/api/gateway/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
wait,
wait_for,
)
from contextlib import suppress
from enum import IntEnum
from sys import platform, version_info
from time import perf_counter
Expand Down Expand Up @@ -858,8 +859,9 @@ def __option_type_context(self, context: "_Context", type: int) -> dict:
context.data.resolved.members if context.guild_id else context.data.resolved.users
)
if context.guild_id:
for key in _resolved.keys():
_resolved[key]._extras["guild_id"] = context.guild_id
with suppress(AttributeError): # edge-case
for key in _resolved.keys():
_resolved[key]._extras["guild_id"] = context.guild_id
elif type == OptionType.CHANNEL.value:
_resolved = context.data.resolved.channels
elif type == OptionType.ROLE.value:
Expand All @@ -872,8 +874,9 @@ def __option_type_context(self, context: "_Context", type: int) -> dict:
context.data.resolved.members if context.guild_id else context.data.resolved.users
)
if context.guild_id:
for key in _members.keys():
_members[key]._extras["guild_id"] = context.guild_id
with suppress(AttributeError): # edge-case
for key in _members.keys():
_members[key]._extras["guild_id"] = context.guild_id

_resolved = {
**(_members if _members is not None else {}),
Expand Down Expand Up @@ -901,8 +904,9 @@ def __select_option_type_context(self, context: "_Context", type: int) -> dict:
context.data.resolved.members if context.guild_id else context.data.resolved.users
)
if context.guild_id:
for key in _resolved.keys():
_resolved[key]._extras["guild_id"] = context.guild_id
with suppress(AttributeError): # edge-case
for key in _resolved.keys():
_resolved[key]._extras["guild_id"] = context.guild_id
elif type == ComponentType.CHANNEL_SELECT.value:
_resolved = context.data.resolved.channels
elif type == ComponentType.ROLE_SELECT.value:
Expand All @@ -914,8 +918,9 @@ def __select_option_type_context(self, context: "_Context", type: int) -> dict:
else context.data.resolved.users
):
if context.guild_id:
for key in users.keys():
users[key]._extras["guild_id"] = context.guild_id
with suppress(AttributeError): # edge-case
for key in users.keys():
users[key]._extras["guild_id"] = context.guild_id
_resolved.update(**users)
if roles := context.data.resolved.roles:
_resolved.update(**roles)
Expand Down