mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-09-06 09:56:09 +00:00
Code Issues Projects Releases Wiki Activity

Fallback to an unavailable guild instead of an Object in interactions

Browse Source
This commit is contained in:
Rapptz
2022-05-14 06:50:15 -04:00
parent 781b297ac9
commit 573bb32a1e
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
discord/interactions.py
View File

@ -38,7 +38,6 @@ from .channel import PartialMessageable, ChannelType
from .user import User
from .member import Member
from .message import Message, Attachment
from .object import Object
from .permissions import Permissions
from .http import handle_message_parameters
from .webhook.async_ import async_context, Webhook, interaction_response_params, interaction_message_response_params
@ -184,16 +183,14 @@ class Interaction:
self.user: Union[User, Member] = MISSING
self._permissions: int = 0
# TODO: there's a potential data loss here
if self.guild_id:
guild = self.guild or Object(id=self.guild_id)
guild = self._state._get_or_create_unavailable_guild(self.guild_id)
try:
member = data['member'] # type: ignore # The key is optional and handled
except KeyError:
pass
else:
# The fallback to Object for guild causes a type check error but is explicitly allowed here
self.user = Member(state=self._state, guild=guild, data=member) # type: ignore
self.user = Member(state=self._state, guild=guild, data=member)
self._permissions = self.user._permissions or 0
else:
try: