Skip to content

Commit

Permalink
Merge pull request #1568 from NeloBlivion/patch-11
Browse files Browse the repository at this point in the history
Fix for application-based bots without the bot scope
  • Loading branch information
BobDotCom authored Aug 16, 2022
2 parents 369e44d + 2d15753 commit 2c3f794
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions discord/interactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,18 @@ def _from_data(self, data: InteractionPayload):

# TODO: there's a potential data loss here
if self.guild_id:
guild = self.guild or Object(id=self.guild_id)
guild = self.guild or self._state._get_guild(self.guild_id) or Object(id=self.guild_id)
try:
member = data["member"] # type: ignore
except KeyError:
pass
else:
cache_flag = self._state.member_cache_flags.interaction
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
self._permissions = int(member.get("permissions", 0))
if not isinstance(guild, Object):
cache_flag = self._state.member_cache_flags.interaction
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
else:
self.user = Member(state=self._state, data=member, guild=guild)
else:
try:
self.user = User(state=self._state, data=data["user"])
Expand Down

0 comments on commit 2c3f794

Please sign in to comment.