Skip to content

Commit e90f150

Browse files
authored
Fix for application-based bots without the bot scope
Quick patch to how guild is received from a purely HTTP interaction
1 parent 369e44d commit e90f150

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
@@ -178,15 +178,18 @@ def _from_data(self, data: InteractionPayload):
178178

179179
# TODO: there's a potential data loss here
180180
if self.guild_id:
181-
guild = self.guild or Object(id=self.guild_id)
181+
guild = self.guild or self._state._get_guild(self.guild_id)
182182
try:
183183
member = data["member"] # type: ignore
184184
except KeyError:
185185
pass
186186
else:
187-
cache_flag = self._state.member_cache_flags.interaction
188-
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
189187
self._permissions = int(member.get("permissions", 0))
188+
if guild:
189+
cache_flag = self._state.member_cache_flags.interaction
190+
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
191+
else:
192+
self.user = Member(state=self._state, data=member, guild=guild)
190193
else:
191194
try:
192195
self.user = User(state=self._state, data=data["user"])

0 commit comments

Comments
 (0)