Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various Paginator fixes for disable(), cancel(), and respond methods. #1088

Merged
merged 9 commits into from
Mar 3, 2022
Merged

Various Paginator fixes for disable(), cancel(), and respond methods. #1088

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1003783
potential fix for #1083 by converting WebhookMessage to Message
krittick Feb 27, 2022
29ddfbc
fix for #1082
krittick Feb 27, 2022
f6b749a
fix for #1082
krittick Feb 27, 2022
f199689
proper fix for #1083 by converting WebhookMessage and InteractionMess…
krittick Feb 27, 2022
0bf1156
Merge remote-tracking branch 'origin/paginator-fixes' into paginator-…
krittick Feb 27, 2022
a2d3d24
apply fix for #1082 to `cancel()` method as well
krittick Feb 27, 2022
0773974
apply fix for #1082 to `cancel()` method as well
krittick Feb 27, 2022
dd90f4d
Merge branch 'Pycord-Development:master' into paginator-fixes
krittick Feb 27, 2022
3d7cb7f
fix logic for cancel/disable
krittick Feb 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions discord/ext/pages/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ async def disable(
"""
page = self.get_page_content(page)
for item in self.children:
if item not in self.custom_view.children or include_custom:
if include_custom or not self.custom_view or item not in self.custom_view.children:
item.disabled = True
if page:
await self.message.edit(
Expand Down Expand Up @@ -402,7 +402,7 @@ async def cancel(
items = self.children.copy()
page = self.get_page_content(page)
for item in items:
if item not in self.custom_view.children or include_custom:
if include_custom or not self.custom_view or item not in self.custom_view.children:
self.remove_item(item)
if page:
await self.message.edit(
Expand Down Expand Up @@ -701,18 +701,22 @@ async def respond(
view=self,
ephemeral=ephemeral,
)

# convert from WebhookMessage to Message reference to bypass 15min webhook token timeout
msg = msg.channel.get_partial_message(msg.id) or await msg.channel.fetch_message(msg.id)
else:
msg = await interaction.response.send_message(
content=page if isinstance(page, str) else None,
embeds=[] if isinstance(page, str) else page,
view=self,
ephemeral=ephemeral,
)
if isinstance(msg, (discord.WebhookMessage, discord.Message)):
if isinstance(msg, discord.WebhookMessage):
self.message = await msg.channel.fetch_message(msg.id)
elif isinstance(msg, discord.Message):
self.message = msg
elif isinstance(msg, discord.Interaction):
self.message = await msg.original_message()
msg = await msg.original_message()
self.message = await msg.channel.fetch_message(msg.id)

return self.message

Expand Down