aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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]: