mirror of
https://github.com/myned/modufur.git
synced 2024-11-01 21:02:38 +00:00
Merge branch 'dev'
This commit is contained in:
Myned
commit
d03a7267f1
2 changed files with 177 additions and 188 deletions
|
|
@ -478,7 +478,7 @@ class MsG:
|
||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
async def _get_pool(self, ctx, *, booru='e621', query=[]):
|
async def _get_pool(self, ctx, *, destination, booru='e621', query=[]):
|
||||||
def on_message(msg):
|
def on_message(msg):
|
||||||
if (msg.content.isdigit() and int(msg.content) == 0) or msg.content.lower() == 'cancel' and msg.author is ctx.author and msg.channel is ctx.channel:
|
if (msg.content.isdigit() and int(msg.content) == 0) or msg.content.lower() == 'cancel' and msg.author is ctx.author and msg.channel is ctx.channel:
|
||||||
raise exc.Abort
|
raise exc.Abort
|
||||||
|
|
@ -502,6 +502,8 @@ class MsG:
|
||||||
== pools[int(selection.content) - 1]][0]
|
== pools[int(selection.content) - 1]][0]
|
||||||
await selection.delete()
|
await selection.delete()
|
||||||
pool = {'name': tempool['name'], 'id': tempool['id']}
|
pool = {'name': tempool['name'], 'id': tempool['id']}
|
||||||
|
|
||||||
|
await destination.trigger_typing()
|
||||||
elif pool_request:
|
elif pool_request:
|
||||||
tempool = pool_request[0]
|
tempool = pool_request[0]
|
||||||
pool = {'name': pool_request[0]['name'], 'id': pool_request[0]['id']}
|
pool = {'name': pool_request[0]['name'], 'id': pool_request[0]['id']}
|
||||||
|
|
@ -580,7 +582,10 @@ 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):
|
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
|
||||||
|
|
@ -601,72 +606,52 @@ class MsG:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if not pool:
|
kwargs = u.get_kwargs(ctx, args)
|
||||||
kwargs = u.get_kwargs(ctx, args)
|
dest, query = kwargs['destination'], kwargs['remaining']
|
||||||
dest, tags = kwargs['destination'], kwargs['remaining']
|
hearted = []
|
||||||
limit = self.LIMIT / 5
|
c = 1
|
||||||
hearted = []
|
|
||||||
c = 1
|
|
||||||
|
|
||||||
tags = self._get_favorites(ctx, tags)
|
await dest.trigger_typing()
|
||||||
|
|
||||||
await ctx.trigger_typing()
|
pool, posts = await self._get_pool(ctx, destination=dest, booru='e621', query=query)
|
||||||
|
keys = list(posts.keys())
|
||||||
|
values = list(posts.values())
|
||||||
|
|
||||||
posts = await self._get_posts(ctx, booru='e621', tags=tags, limit=limit)
|
embed = d.Embed(
|
||||||
keys = list(posts.keys())
|
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)
|
||||||
values = list(posts.values())
|
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')
|
||||||
|
|
||||||
embed = d.Embed(
|
paginator = await dest.send(embed=embed)
|
||||||
title=values[c - 1]['author'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else self.color)
|
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
|
||||||
embed.set_author(name=formatter.tostring(tags, random=True),
|
|
||||||
url='https://e621.net/post?tags={}'.format(','.join(tags)), 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)
|
||||||
|
|
||||||
for emoji in ('\N{GROWING HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'):
|
while not self.bot.is_closed():
|
||||||
await paginator.add_reaction(emoji)
|
try:
|
||||||
await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
|
done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=10 * 60),
|
||||||
await asyncio.sleep(1)
|
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=10 * 60)], return_when=asyncio.FIRST_COMPLETED)
|
||||||
|
for future in done:
|
||||||
|
future.result()
|
||||||
|
|
||||||
while not self.bot.is_closed():
|
except exc.Save:
|
||||||
try:
|
if values[c - 1]['url'] not in hearted:
|
||||||
done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=10 * 60),
|
hearted.append(values[c - 1]['url'])
|
||||||
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:
|
await paginator.edit(content='\N{HEAVY BLACK HEART}')
|
||||||
if values[c - 1]['url'] not in hearted:
|
else:
|
||||||
hearted.append(values[c - 1]['url'])
|
hearted.remove(values[c - 1]['url'])
|
||||||
|
|
||||||
await paginator.edit(content='\N{HEAVY BLACK HEART}')
|
await paginator.edit(content='\N{BROKEN HEART}')
|
||||||
else:
|
|
||||||
hearted.remove(values[c - 1]['url'])
|
|
||||||
|
|
||||||
await paginator.edit(content='\N{BROKEN HEART}')
|
except exc.Left:
|
||||||
|
if c > 1:
|
||||||
except exc.Left:
|
c -= 1
|
||||||
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.title = values[c - 1]['author']
|
||||||
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
|
|
@ -674,92 +659,26 @@ class MsG:
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
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)
|
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.Right:
|
except exc.GoTo:
|
||||||
try:
|
await paginator.edit(content='**Enter image number...**')
|
||||||
if c % limit == 0:
|
number = await self.bot.wait_for('message', check=on_message, timeout=10 * 60)
|
||||||
await dest.trigger_typing()
|
|
||||||
posts.update(await self._get_posts(ctx, booru='e621', tags=tags, limit=limit, previous=posts))
|
|
||||||
|
|
||||||
keys = list(posts.keys())
|
c = int(number.content)
|
||||||
values = list(posts.values())
|
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'])
|
||||||
|
|
||||||
c += 1
|
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
||||||
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):
|
||||||
except IndexError:
|
c += 1
|
||||||
await paginator.edit(content='**No more images found**')
|
|
||||||
except exc.NotFound:
|
|
||||||
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.title = values[c - 1]['author']
|
||||||
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
embed.url = 'https://e621.net/post/show/{}'.format(keys[c - 1])
|
||||||
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
embed.set_footer(text='{} / {}'.format(c, len(posts)),
|
||||||
|
|
@ -767,29 +686,8 @@ class MsG:
|
||||||
embed.set_image(url=values[c - 1]['url'])
|
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)
|
await paginator.edit(content='\N{HEAVY BLACK HEART}' if values[c - 1]['url'] in hearted else None, embed=embed)
|
||||||
|
else:
|
||||||
except exc.Right:
|
await paginator.edit(content='**Last image**')
|
||||||
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:
|
except exc.Abort:
|
||||||
try:
|
try:
|
||||||
|
|
@ -829,8 +727,121 @@ class MsG:
|
||||||
@checks.del_ctx()
|
@checks.del_ctx()
|
||||||
@checks.is_nsfw()
|
@checks.is_nsfw()
|
||||||
async def e621_paginator(self, ctx, *args):
|
async def e621_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:
|
try:
|
||||||
hearted = await self.paginate(ctx, args=args)
|
kwargs = u.get_kwargs(ctx, args)
|
||||||
|
dest, tags = kwargs['destination'], kwargs['remaining']
|
||||||
|
limit = self.LIMIT / 5
|
||||||
|
hearted = []
|
||||||
|
c = 1
|
||||||
|
|
||||||
|
tags = self._get_favorites(ctx, tags)
|
||||||
|
|
||||||
|
await ctx.trigger_typing()
|
||||||
|
|
||||||
|
posts = await self._get_posts(ctx, booru='e621', tags=tags, limit=limit)
|
||||||
|
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=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else self.color)
|
||||||
|
embed.set_image(url=values[c - 1]['url'])
|
||||||
|
embed.set_author(name=formatter.tostring(tags, random=True),
|
||||||
|
url='https://e621.net/post?tags={}'.format(','.join(tags)), 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:
|
||||||
|
try:
|
||||||
|
if c % limit == 0:
|
||||||
|
await dest.trigger_typing()
|
||||||
|
posts.update(await self._get_posts(ctx, booru='e621', tags=tags, limit=limit, previous=posts))
|
||||||
|
|
||||||
|
keys = list(posts.keys())
|
||||||
|
values = list(posts.values())
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
except IndexError:
|
||||||
|
await paginator.edit(content='**No more images found**')
|
||||||
|
except exc.NotFound:
|
||||||
|
await paginator.edit(content='**No more images found**')
|
||||||
|
|
||||||
except exc.Abort:
|
except exc.Abort:
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
|
|
@ -59,10 +59,8 @@ async def on_ready():
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_message(message):
|
async def on_message(message):
|
||||||
if message.author is bot.user:
|
if message.author is not bot.user:
|
||||||
return
|
await bot.process_commands(message)
|
||||||
|
|
||||||
await bot.process_commands(message)
|
|
||||||
|
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
|
|
@ -99,26 +97,6 @@ async def on_command_error(ctx, error):
|
||||||
await ctx.message.add_reaction('\N{WARNING SIGN}')
|
await ctx.message.add_reaction('\N{WARNING SIGN}')
|
||||||
# u.notify('C O M M A N D E R R O R')
|
# u.notify('C O M M A N D E R R O R')
|
||||||
|
|
||||||
|
|
||||||
async def on_reaction_add(r, u):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
async def on_reaction_remove(r, u):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
async def reaction_add(r, u):
|
|
||||||
bot.add_listener(on_reaction_add)
|
|
||||||
print('Reacted')
|
|
||||||
bot.remove_listener(on_reaction_remove)
|
|
||||||
|
|
||||||
|
|
||||||
async def reaction_remove(r, u):
|
|
||||||
bot.add_listener(on_reaction_remove)
|
|
||||||
print('Removed')
|
|
||||||
bot.remove_listener(on_reaction_remove)
|
|
||||||
|
|
||||||
# d.opus.load_opus('opus')
|
# d.opus.load_opus('opus')
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue