Merge branch 'master' into interaction_attachment_metadata

Signed-off-by: Ice Wolfy <[email protected]>

Author: Icebluewolf

CHANGELOG.md

@@ -64,8 +64,11 @@ These changes are available on the `master` branch, but have not yet been releas
   apps. ([#2650](https://github.com/Pycord-Development/pycord/pull/2650))
 - Fixed type annotations of cached properties.
   ([#2635](https://github.com/Pycord-Development/pycord/issues/2635))
-- Fixed attachment metadata being set incorrectly in interaction responses causing it to
-  be ignored. ([#2679](https://github.com/Pycord-Development/pycord/pull/2679))
+- Fixed an error when responding non-ephemerally with a `Paginator` to an ephemerally
+  deferred interaction.
+  ([#2661](https://github.com/Pycord-Development/pycord/pull/2661))
+- Fixed attachment metadata being set incorrectly in interaction responses causing the metadata to
+  be ignored by Discord. ([#2679](https://github.com/Pycord-Development/pycord/pull/2679))
 
 ### Changed
 

discord/ext/pages/pagination.py

@@ -1202,7 +1202,7 @@ async def respond(
                 )
                 # convert from WebhookMessage to Message reference to bypass
                 # 15min webhook token timeout (non-ephemeral messages only)
-                if not ephemeral:
+                if not ephemeral and not msg.flags.ephemeral:
                     msg = await msg.channel.fetch_message(msg.id)
             else:
                 msg = await interaction.response.send_message(