From 3de29900fb4ef17bf505772879fe0945d52a9793 Mon Sep 17 00:00:00 2001 From: Revnoplex <62947003+Revnoplex@users.noreply.github.com> Date: Mon, 30 Sep 2024 23:07:18 +1000 Subject: [PATCH 1/6] fix: don't try to do an interaction_check if there isn't a user available to check --- discord/ext/pages/pagination.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/discord/ext/pages/pagination.py b/discord/ext/pages/pagination.py index d3f2d32800..7f1d661158 100644 --- a/discord/ext/pages/pagination.py +++ b/discord/ext/pages/pagination.py @@ -1090,8 +1090,10 @@ async def edit( if page_content.custom_view: self.update_custom_view(page_content.custom_view) - - self.user = user or self.user + if user or self.user: + self.user = user or self.user + else: + self.usercheck = False try: self.message = await message.edit( From 686f2d4d70968f32130f40801f41954247a16f79 Mon Sep 17 00:00:00 2001 From: Revnoplex <62947003+Revnoplex@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:10:21 +1000 Subject: [PATCH 2/6] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c5ed63053..b7561db6ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ These changes are available on the `master` branch, but have not yet been releas documentation. ([#2581](https://github.com/Pycord-Development/pycord/pull/2581)) - Fixed a possible bug where audio would play too fast at the beginning of audio files. ([#2584](https://github.com/Pycord-Development/pycord/pull/2584)) +- Fixed paginator buttons not responding when using `Paginator.edit()` with its default parameters ([#2594](https://github.com/Pycord-Development/pycord/pull/2594)) ### Changed From 2cbdd51e4222df6e456af35b74ab52960c01f3a7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 04:14:09 +0000 Subject: [PATCH 3/6] style(pre-commit): auto fixes from pre-commit.com hooks --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 755585ae5d..87ee324344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,8 @@ These changes are available on the `master` branch, but have not yet been releas documentation. ([#2581](https://github.com/Pycord-Development/pycord/pull/2581)) - Fixed a possible bug where audio would play too fast at the beginning of audio files. ([#2584](https://github.com/Pycord-Development/pycord/pull/2584)) -- Fixed paginator buttons not responding when using `Paginator.edit()` with its default parameters ([#2594](https://github.com/Pycord-Development/pycord/pull/2594)) +- Fixed paginator buttons not responding when using `Paginator.edit()` with its default + parameters ([#2594](https://github.com/Pycord-Development/pycord/pull/2594)) - Fixed the `is_owner()` `user` type hint: `User` -> `User | Member`. ([#2593](https://github.com/Pycord-Development/pycord/pull/2593)) From 252799ca26ddbb3381e1ab785fc5b2cd312a1459 Mon Sep 17 00:00:00 2001 From: Revnoplex <62947003+Revnoplex@users.noreply.github.com> Date: Tue, 1 Oct 2024 22:20:10 +1000 Subject: [PATCH 4/6] Update CHANGELOG.md Co-authored-by: Dorukyum <53639936+Dorukyum@users.noreply.github.com> Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ee324344..f03a92e2b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,8 +33,8 @@ These changes are available on the `master` branch, but have not yet been releas documentation. ([#2581](https://github.com/Pycord-Development/pycord/pull/2581)) - Fixed a possible bug where audio would play too fast at the beginning of audio files. ([#2584](https://github.com/Pycord-Development/pycord/pull/2584)) -- Fixed paginator buttons not responding when using `Paginator.edit()` with its default - parameters ([#2594](https://github.com/Pycord-Development/pycord/pull/2594)) +- Fixed paginator not responding when using `Paginator.edit()` with default parameters. + ([#2594](https://github.com/Pycord-Development/pycord/pull/2594)) - Fixed the `is_owner()` `user` type hint: `User` -> `User | Member`. ([#2593](https://github.com/Pycord-Development/pycord/pull/2593)) From 47607d219405d4c52b1af1b9ef8b65d7bec18d07 Mon Sep 17 00:00:00 2001 From: Revnoplex <62947003+Revnoplex@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:55:34 +1000 Subject: [PATCH 5/6] Simplify usercheck disable condition Signed-off-by: Revnoplex <62947003+Revnoplex@users.noreply.github.com> --- discord/ext/pages/pagination.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/discord/ext/pages/pagination.py b/discord/ext/pages/pagination.py index 7f1d661158..546f0ba6fb 100644 --- a/discord/ext/pages/pagination.py +++ b/discord/ext/pages/pagination.py @@ -1090,9 +1090,10 @@ async def edit( if page_content.custom_view: self.update_custom_view(page_content.custom_view) - if user or self.user: - self.user = user or self.user - else: + + self.user = user or self.user + + if not self.user: self.usercheck = False try: From 69385090cad34ac0fddefc75af2566c01bfdb37f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 07:56:19 +0000 Subject: [PATCH 6/6] style(pre-commit): auto fixes from pre-commit.com hooks --- discord/ext/pages/pagination.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discord/ext/pages/pagination.py b/discord/ext/pages/pagination.py index 546f0ba6fb..884a157a92 100644 --- a/discord/ext/pages/pagination.py +++ b/discord/ext/pages/pagination.py @@ -1090,9 +1090,9 @@ async def edit( if page_content.custom_view: self.update_custom_view(page_content.custom_view) - + self.user = user or self.user - + if not self.user: self.usercheck = False