From 2248fc1946b9fd515c7fd0e4a2fbed928172aa22 Mon Sep 17 00:00:00 2001 From: Soheab <33902984+Soheab@users.noreply.github.com> Date: Tue, 7 May 2024 00:17:37 +0200 Subject: [PATCH] Fix various code around Message.interaction(_metadata) --- discord/message.py | 6 +++--- discord/ui/view.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/discord/message.py b/discord/message.py index a2698abec..aa1609826 100644 --- a/discord/message.py +++ b/discord/message.py @@ -715,7 +715,7 @@ class MessageInteractionMetadata(Hashable): @property def original_response_message(self) -> Optional[Message]: - """:class:`~discord.Message`: The original response message if the message + """Optional[:class:`~discord.Message`]: The original response message if the message is a follow-up and is found in cache. """ if self.original_response_message_id: @@ -724,7 +724,7 @@ class MessageInteractionMetadata(Hashable): @property def interacted_message(self) -> Optional[Message]: - """:class:`~discord.Message`: The message that + """Optional[:class:`~discord.Message`]: The message that containes the interactive components, if applicable and is found in cache. """ if self.interacted_message_id: @@ -2194,7 +2194,7 @@ class Message(PartialMessage, Hashable): return self._thread or self.guild.get_thread(self.id) @property - @deprecated("This attribute is deprecated, please use Message.interaction_metadata instead.") + @deprecated('interaction_metadata') def interaction(self) -> Optional[MessageInteraction]: """Optional[:class:`~discord.MessageInteraction`]: The interaction that this message is a response to. diff --git a/discord/ui/view.py b/discord/ui/view.py index dbe985cd5..2341a720f 100644 --- a/discord/ui/view.py +++ b/discord/ui/view.py @@ -667,8 +667,8 @@ class ViewStore: msg = interaction.message if msg is not None: message_id = msg.id - if msg.interaction: - interaction_id = msg.interaction.id + if msg.interaction_metadata: + interaction_id = msg.interaction_metadata.id key = (component_type, custom_id)