Merge branch 'master' into dependabot/pip/mypy-approx-eq-1.8.0

Pycord-Development · Dec 26, 2023 · 27091da · 27091da
2 parents c0745f4 + 16c696c
commit 27091da
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/discord/ui/view.py b/discord/ui/view.py
@@ -368,7 +368,12 @@ async def on_timeout(self) -> None:
         """
         if self.disable_on_timeout:
             self.disable_all_items()
-            message = self._message or self.parent
+
+            if not self._message or self._message.flags.ephemeral:
+                message = self.parent
+            else:
+                message = self.message
+
             if message:
                 m = await message.edit(view=self)
                 if m: