aboutsummaryrefslogtreecommitdiff
path: root/discord/interactions.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2021-04-26 21:40:37 -0400
committerRapptz <[email protected]>2021-05-27 00:53:14 -0400
commitcc800796a2d13c3b95bb54590309efe716086785 (patch)
treed8b600e6ba0406eff2d40842a57eb08629855975 /discord/interactions.py
parentMake Item and Button generic over the underlying view (diff)
downloaddiscord.py-cc800796a2d13c3b95bb54590309efe716086785.tar.xz
discord.py-cc800796a2d13c3b95bb54590309efe716086785.zip
Properly guard for DMs in interaction creation
Fix #6794
Diffstat (limited to 'discord/interactions.py')
-rw-r--r--discord/interactions.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/discord/interactions.py b/discord/interactions.py
index b38d9a49..19c5463a 100644
--- a/discord/interactions.py
+++ b/discord/interactions.py
@@ -117,11 +117,12 @@ class Interaction:
self.user = None
# TODO: there's a potential data loss here
- guild = self.guild or Object(id=self.guild_id)
- try:
- self.user = Member(state=self._state, guild=guild, data=data['member'])
- except KeyError:
- pass
+ if self.guild_id:
+ guild = self.guild or Object(id=self.guild_id)
+ try:
+ self.user = Member(state=self._state, guild=guild, data=data['member'])
+ except KeyError:
+ pass
@property
def guild(self) -> Optional[Guild]: