mirror of
https://github.com/myned/modufur.git
synced 2024-11-01 21:02:38 +00:00
Reverted paginator method e6/pool combo to fix abort not catching
This commit is contained in:
Myned
parent
23954252a2
commit
d4707c7682
1 changed files with 172 additions and 163 deletions
|
|
@ -582,7 +582,151 @@ class MsG:
|
||||||
else:
|
else:
|
||||||
raise exc.NotFound
|
raise exc.NotFound
|
||||||
|
|
||||||
async def paginate(self, ctx, *, args, pool=False):
|
# Creates reaction-based paginator for linked pools
|
||||||
|
@commands.command(name='poolpage', aliases=['poolp', 'pp', 'e621pp', 'e6pp', '6pp'], brief='e621 pool paginator', description='e621 | NSFW\nShow pools in a page format', hidden=True)
|
||||||
|
@checks.del_ctx()
|
||||||
|
async def pool_paginator(self, ctx, *args):
|
||||||
|
def on_reaction(reaction, user):
|
||||||
|
if reaction.emoji == '\N{OCTAGONAL SIGN}' and reaction.message.id == ctx.message.id and user is ctx.author:
|
||||||
|
raise exc.Abort
|
||||||
|
elif reaction.emoji == '\N{GROWING HEART}' and reaction.message.id == paginator.id and user is ctx.author:
|
||||||
|
raise exc.Save
|
||||||
|
elif reaction.emoji == '\N{LEFTWARDS BLACK ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
|
||||||
|
raise exc.Left
|
||||||
|
elif reaction.emoji == '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}' and reaction.message.id == paginator.id and user is ctx.author:
|
||||||
|
raise exc.GoTo
|
||||||
|
elif reaction.emoji == '\N{BLACK RIGHTWARDS ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
|
||||||
|
raise exc.Right
|
||||||
|
return False
|
||||||
|
|
||||||
|
def on_message(msg):
|
||||||
|
if msg.content.isdigit():
|
||||||
|
if 1 <= int(msg.content) <= len(posts) and msg.author is ctx.author and msg.channel is ctx.channel:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
kwargs = u.get_kwargs(ctx, args)
|
||||||
|
dest, query = kwargs['destination'], kwargs['remaining']
|
||||||
|
hearted = []
|
||||||
|
c = 1
|
||||||
|
|
||||||
|
await dest.trigger_typing()
|
||||||
|
|
||||||
|
pool, posts = await self._get_pool(ctx, destination=dest, booru='e621', query=query)
|
||||||
|
keys = list(posts.keys())
|
||||||
|
values = list(posts.values())
|
||||||
|
|
||||||
|
embed = d.Embed(
|
||||||
|
title=values[c - 1]['author'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=dest.me.color if isinstance(dest.channel, d.TextChannel) else self.color)
|
||||||
|
embed.set_image(url=values[c - 1]['url'])
|
||||||
|
embed.set_author(name=pool['name'],
|
||||||
|
url='https://e621.net/pool/show?id={}'.format(pool['id']), icon_url=ctx.author.avatar_url)
|
||||||
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
|
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
||||||
|
|
||||||
|
paginator = await dest.send(embed=embed)
|
||||||
|
|
||||||
|
for emoji in ('\N{GROWING HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'):
|
||||||
|
await paginator.add_reaction(emoji)
|
||||||
|
await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
|
while not self.bot.is_closed():
|
||||||
|
try:
|
||||||
|
done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=10 * 60),
|
||||||
|
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=10 * 60)], return_when=asyncio.FIRST_COMPLETED)
|
||||||
|
for future in done:
|
||||||
|
future.result()
|
||||||
|
|
||||||
|
except exc.Save:
|
||||||
|
if values[c - 1]['url'] not in hearted:
|
||||||
|
hearted.append(values[c - 1]['url'])
|
||||||
|
|
||||||
|
await paginator.edit(content='\N{HEAVY BLACK HEART}')
|
||||||
|
else:
|
||||||
|
hearted.remove(values[c - 1]['url'])
|
||||||
|
|
||||||
|
await paginator.edit(content='\N{BROKEN HEART}')
|
||||||
|
|
||||||
|
except exc.Left:
|
||||||
|
if c > 1:
|
||||||
|
c -= 1
|
||||||
|
embed.title = values[c - 1]['author']
|
||||||
|
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
||||||
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
|
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
||||||
|
embed.set_image(url=values[c - 1]['url'])
|
||||||
|
|
||||||
|
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
||||||
|
else:
|
||||||
|
await paginator.edit(content='**First image**')
|
||||||
|
|
||||||
|
except exc.GoTo:
|
||||||
|
await paginator.edit(content='**Enter image number...**')
|
||||||
|
number = await self.bot.wait_for('message', check=on_message, timeout=10 * 60)
|
||||||
|
|
||||||
|
c = int(number.content)
|
||||||
|
await number.delete()
|
||||||
|
embed.title = values[c - 1]['author']
|
||||||
|
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
||||||
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
|
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
||||||
|
embed.set_image(url=values[c - 1]['url'])
|
||||||
|
|
||||||
|
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
||||||
|
|
||||||
|
except exc.Right:
|
||||||
|
if c < len(keys):
|
||||||
|
c += 1
|
||||||
|
embed.title = values[c - 1]['author']
|
||||||
|
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
||||||
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
|
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
||||||
|
embed.set_image(url=values[c - 1]['url'])
|
||||||
|
|
||||||
|
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
||||||
|
else:
|
||||||
|
await paginator.edit(content='**Last image**')
|
||||||
|
|
||||||
|
except exc.Abort:
|
||||||
|
try:
|
||||||
|
await paginator.edit(content='**Exited paginator**')
|
||||||
|
|
||||||
|
except UnboundLocalError:
|
||||||
|
await dest.send('**Exited paginator**')
|
||||||
|
if not hearted:
|
||||||
|
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
||||||
|
except asyncio.TimeoutError:
|
||||||
|
try:
|
||||||
|
await paginator.edit(content='**Paginator timed out**')
|
||||||
|
|
||||||
|
except UnboundLocalError:
|
||||||
|
await dest.send('**Paginator timed out**')
|
||||||
|
if not hearted:
|
||||||
|
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
||||||
|
except exc.NotFound:
|
||||||
|
await ctx.send('**Pool not found**', delete_after=10)
|
||||||
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
except exc.Timeout:
|
||||||
|
await ctx.send('**Request timed out**')
|
||||||
|
await ctx.message.add_reaction('\N{CROSS MARK}')
|
||||||
|
|
||||||
|
finally:
|
||||||
|
if hearted:
|
||||||
|
await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
|
||||||
|
|
||||||
|
for url in hearted:
|
||||||
|
await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url))
|
||||||
|
|
||||||
|
await asyncio.sleep(self.RATE_LIMIT)
|
||||||
|
|
||||||
|
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
||||||
|
|
||||||
|
@commands.command(name='e621page', aliases=['e621p', 'e6p', '6p'])
|
||||||
|
@checks.del_ctx()
|
||||||
|
@checks.is_nsfw()
|
||||||
|
async def e621_paginator(self, ctx, *args):
|
||||||
def on_reaction(reaction, user):
|
def on_reaction(reaction, user):
|
||||||
if reaction.emoji == '\N{OCTAGONAL SIGN}' and reaction.message.id == ctx.message.id and user is ctx.author:
|
if reaction.emoji == '\N{OCTAGONAL SIGN}' and reaction.message.id == ctx.message.id and user is ctx.author:
|
||||||
raise exc.Abort
|
raise exc.Abort
|
||||||
|
|
@ -603,7 +747,6 @@ class MsG:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if not pool:
|
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
kwargs = u.get_kwargs(ctx, args)
|
||||||
dest, tags = kwargs['destination'], kwargs['remaining']
|
dest, tags = kwargs['destination'], kwargs['remaining']
|
||||||
limit = self.LIMIT / 5
|
limit = self.LIMIT / 5
|
||||||
|
|
@ -699,140 +842,6 @@ class MsG:
|
||||||
await paginator.edit(content='**No more images found**')
|
await paginator.edit(content='**No more images found**')
|
||||||
except exc.NotFound:
|
except exc.NotFound:
|
||||||
await paginator.edit(content='**No more images found**')
|
await paginator.edit(content='**No more images found**')
|
||||||
else:
|
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
|
||||||
dest, query = kwargs['destination'], kwargs['remaining']
|
|
||||||
hearted = []
|
|
||||||
c = 1
|
|
||||||
|
|
||||||
await dest.trigger_typing()
|
|
||||||
|
|
||||||
pool, posts = await self._get_pool(ctx, booru='e621', query=query)
|
|
||||||
keys = list(posts.keys())
|
|
||||||
values = list(posts.values())
|
|
||||||
|
|
||||||
embed = d.Embed(
|
|
||||||
title=values[c - 1]['author'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=dest.me.color if isinstance(dest.channel, d.TextChannel) else self.color)
|
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
|
||||||
embed.set_author(name=pool['name'],
|
|
||||||
url='https://e621.net/pool/show?id={}'.format(pool['id']), icon_url=ctx.author.avatar_url)
|
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
|
||||||
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
|
||||||
|
|
||||||
paginator = await dest.send(embed=embed)
|
|
||||||
|
|
||||||
for emoji in ('\N{GROWING HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'):
|
|
||||||
await paginator.add_reaction(emoji)
|
|
||||||
await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
|
|
||||||
await asyncio.sleep(1)
|
|
||||||
|
|
||||||
while not self.bot.is_closed():
|
|
||||||
try:
|
|
||||||
done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=10 * 60),
|
|
||||||
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=10 * 60)], return_when=asyncio.FIRST_COMPLETED)
|
|
||||||
for future in done:
|
|
||||||
future.result()
|
|
||||||
|
|
||||||
except exc.Save:
|
|
||||||
if values[c - 1]['url'] not in hearted:
|
|
||||||
hearted.append(values[c - 1]['url'])
|
|
||||||
|
|
||||||
await paginator.edit(content='\N{HEAVY BLACK HEART}')
|
|
||||||
else:
|
|
||||||
hearted.remove(values[c - 1]['url'])
|
|
||||||
|
|
||||||
await paginator.edit(content='\N{BROKEN HEART}')
|
|
||||||
|
|
||||||
except exc.Left:
|
|
||||||
if c > 1:
|
|
||||||
c -= 1
|
|
||||||
embed.title = values[c - 1]['author']
|
|
||||||
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
|
||||||
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
|
||||||
|
|
||||||
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
|
||||||
else:
|
|
||||||
await paginator.edit(content='**First image**')
|
|
||||||
|
|
||||||
except exc.GoTo:
|
|
||||||
await paginator.edit(content='**Enter image number...**')
|
|
||||||
number = await self.bot.wait_for('message', check=on_message, timeout=10 * 60)
|
|
||||||
|
|
||||||
c = int(number.content)
|
|
||||||
await number.delete()
|
|
||||||
embed.title = values[c - 1]['author']
|
|
||||||
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
|
||||||
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
|
||||||
|
|
||||||
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
|
||||||
|
|
||||||
except exc.Right:
|
|
||||||
if c < len(keys):
|
|
||||||
c += 1
|
|
||||||
embed.title = values[c - 1]['author']
|
|
||||||
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
|
||||||
icon_url='http://lh6.ggpht.com/d3pNZNFCcJM8snBsRSdKUhR9AVBnJMcYYrR92RRDBOzCrxZMhuTeoGOQSmSEn7DAPQ=w300')
|
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
|
||||||
|
|
||||||
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
|
||||||
else:
|
|
||||||
await paginator.edit(content='**Last image**')
|
|
||||||
|
|
||||||
finally:
|
|
||||||
return hearted
|
|
||||||
|
|
||||||
# Creates reaction-based paginator for linked pools
|
|
||||||
@commands.command(name='poolpage', aliases=['poolp', 'pp', 'e621pp', 'e6pp', '6pp'], brief='e621 pool paginator', description='e621 | NSFW\nShow pools in a page format', hidden=True)
|
|
||||||
@checks.del_ctx()
|
|
||||||
async def pool_paginator(self, ctx, *args):
|
|
||||||
try:
|
|
||||||
hearted = await self.paginate(pool=True)
|
|
||||||
|
|
||||||
except exc.Abort:
|
|
||||||
try:
|
|
||||||
await paginator.edit(content='**Exited paginator**')
|
|
||||||
|
|
||||||
except UnboundLocalError:
|
|
||||||
await dest.send('**Exited paginator**')
|
|
||||||
if not hearted:
|
|
||||||
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
|
||||||
except asyncio.TimeoutError:
|
|
||||||
try:
|
|
||||||
await paginator.edit(content='**Paginator timed out**')
|
|
||||||
|
|
||||||
except UnboundLocalError:
|
|
||||||
await dest.send('**Paginator timed out**')
|
|
||||||
if not hearted:
|
|
||||||
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
|
||||||
except exc.NotFound:
|
|
||||||
await ctx.send('**Pool not found**', delete_after=10)
|
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
|
||||||
except exc.Timeout:
|
|
||||||
await ctx.send('**Request timed out**')
|
|
||||||
await ctx.message.add_reaction('\N{CROSS MARK}')
|
|
||||||
|
|
||||||
finally:
|
|
||||||
if hearted:
|
|
||||||
await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
|
|
||||||
|
|
||||||
for url in hearted:
|
|
||||||
await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url))
|
|
||||||
|
|
||||||
await asyncio.sleep(self.RATE_LIMIT)
|
|
||||||
|
|
||||||
await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
|
|
||||||
|
|
||||||
@commands.command(name='e621page', aliases=['e621p', 'e6p', '6p'])
|
|
||||||
@checks.del_ctx()
|
|
||||||
@checks.is_nsfw()
|
|
||||||
async def e621_paginator(self, ctx, *args):
|
|
||||||
try:
|
|
||||||
hearted = await self.paginate(ctx, args=args)
|
|
||||||
|
|
||||||
except exc.Abort:
|
except exc.Abort:
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue