aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAXVin <[email protected]>2021-04-29 11:25:21 +0530
committerRapptz <[email protected]>2021-05-27 00:53:14 -0400
commit2ad2cab50c2d621733e9eb3230b6d872338631a7 (patch)
treea0d56a14e083f69a2ff687710c4622e4dea2f526
parentForce button style to link if a URL is passed (diff)
downloaddiscord.py-2ad2cab50c2d621733e9eb3230b6d872338631a7.tar.xz
discord.py-2ad2cab50c2d621733e9eb3230b6d872338631a7.zip
[Interactions] Create User only when in DMs
-rw-r--r--discord/interactions.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/discord/interactions.py b/discord/interactions.py
index 19c5463a..e8d8f799 100644
--- a/discord/interactions.py
+++ b/discord/interactions.py
@@ -111,11 +111,7 @@ class Interaction:
except KeyError:
self.message = None
- try:
- self.user = User(state=self._state, data=data['user'])
- except KeyError:
- self.user = None
-
+ self.user: Optional[Union[User, Member]] = None
# TODO: there's a potential data loss here
if self.guild_id:
guild = self.guild or Object(id=self.guild_id)
@@ -123,6 +119,12 @@ class Interaction:
self.user = Member(state=self._state, guild=guild, data=data['member'])
except KeyError:
pass
+ else:
+ try:
+ self.user = User(state=self._state, data=data['user'])
+ except KeyError:
+ pass
+
@property
def guild(self) -> Optional[Guild]: