Skip to content

Commit cbf6a2a

Browse files
committed
Patch fix
1 parent 37be456 commit cbf6a2a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

discord/interactions.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,18 @@ def _from_data(self, data: InteractionPayload):
180180

181181
# TODO: there's a potential data loss here
182182
if self.guild_id:
183-
guild = self.guild or Object(id=self.guild_id)
183+
guild = self.guild or self._state._get_guild(self.guild_id) or Object(id=self.guild_id)
184184
try:
185185
member = data["member"] # type: ignore
186186
except KeyError:
187187
pass
188188
else:
189-
cache_flag = self._state.member_cache_flags.interaction
190-
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
191189
self._permissions = int(member.get("permissions", 0))
190+
if not isinstance(guild, Object):
191+
cache_flag = self._state.member_cache_flags.interaction
192+
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
193+
else:
194+
self.user = Member(state=self._state, data=member, guild=guild)
192195
else:
193196
try:
194197
self.user = User(state=self._state, data=data["user"])

0 commit comments

Comments
 (0)