From 2348d72a72cb33988314160395cb39e4521ef6b3 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Fri, 11 Aug 2023 16:22:26 -0400 Subject: [PATCH] Use the interaction user's guild as a fallback for Interaction.guild This ensures that the unavailable guild that is created within __init__ is used instead of constantly recreating it. --- discord/interactions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/discord/interactions.py b/discord/interactions.py index 595414b2f..92332091c 100644 --- a/discord/interactions.py +++ b/discord/interactions.py @@ -254,7 +254,10 @@ class Interaction(Generic[ClientT]): @property def guild(self) -> Optional[Guild]: """Optional[:class:`Guild`]: The guild the interaction was sent from.""" - return self._state and self._state._get_guild(self.guild_id) + # The user.guild attribute is set in __init__ to the fallback guild if available + # Therefore, we can use that instead of recreating it every time this property is + # accessed + return (self._state and self._state._get_guild(self.guild_id)) or getattr(self.user, 'guild', None) @property def channel_id(self) -> Optional[int]: