o/EmoteManager
1
0
Fork 0
mirror of https://github.com/uhIgnacio/EmoteManager.git synced 2024-08-15 02:23:13 +00:00
Code Issues Projects Releases Wiki Activity

paginator: actually fix reactions

Browse source
This commit is contained in:
bmintz 2018-08-11 13:43:50 -05:00
parent 95048a590c
commit a830769987
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
utils/paginator.py
View file

@ -11,15 +11,12 @@ from discord.ext.commands import Context
class Paginator: class Paginator:
def __init__(self, ctx: Context, pages: typing.Iterable, *, timeout=300, delete_message=False, predicate=None, def __init__(self, ctx: Context, pages: typing.Iterable, *, timeout=300, delete_message=False,
delete_message_on_timeout=False, text_message=None): delete_message_on_timeout=False, text_message=None):
if predicate is None:
def predicate(reaction, user):
return user == ctx.message.author and reaction.message == self._message
self.pages = list(pages) self.pages = list(pages)
self.predicate = predicate
self.timeout = timeout self.timeout = timeout
self.author = ctx.author
self.target = ctx.channel self.target = ctx.channel
self.delete_msg = delete_message self.delete_msg = delete_message
self.delete_msg_timeout = delete_message_on_timeout self.delete_msg_timeout = delete_message_on_timeout
@ -41,6 +38,15 @@ class Paginator:
self._page = None self._page = None
def react_check(self, reaction, user):
if user is None or user != self.author:
return False
if reaction.message.id != self._message.id:
return False
return bool(discord.utils.find(lambda emoji: reaction.emoji == emoji, self.navigation))
async def begin(self): async def begin(self):
"""Starts pagination""" """Starts pagination"""
self._stopped = False self._stopped = False
@ -50,7 +56,10 @@ class Paginator:
await self._message.add_reaction(button) await self._message.add_reaction(button)
while not self._stopped: while not self._stopped:
try: try:
reaction, user = await self._client.wait_for('reaction_add', check=self.predicate, timeout=self.timeout) reaction, user = await self._client.wait_for(
'reaction_add',
check=self.react_check,
timeout=self.timeout)
except asyncio.TimeoutError: except asyncio.TimeoutError:
await self.stop(delete=self.delete_msg_timeout) await self.stop(delete=self.delete_msg_timeout)
continue continue