myned/modufur
1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-12-24 22:27:28 +00:00
Code Issues Activity

Fixed hearted embeds not being referenced and added index to footnote

Browse source
This commit is contained in:
Myned 2017-11-20 08:48:44 -05:00
parent 881b29a22d
commit 577b7e9e58
1 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/main/cogs/booru.py
View file

@ -662,7 +662,7 @@ class MsG:
try: try:
kwargs = u.get_kwargs(ctx, args) kwargs = u.get_kwargs(ctx, args)
dest, query = kwargs['destination'], kwargs['remaining'] dest, query = kwargs['destination'], kwargs['remaining']
hearted = [] hearted = {}
c = 1 c = 1
await dest.trigger_typing() await dest.trigger_typing()
@ -711,7 +711,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
else: else:
await paginator.edit(content='**First image**') await paginator.edit(content='**First image**')
@ -728,7 +728,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
except exc.Right: except exc.Right:
if c < len(keys): if c < len(keys):
@ -740,7 +740,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
else: else:
await paginator.edit(content='**Last image**') await paginator.edit(content='**Last image**')
@ -767,10 +767,14 @@ class MsG:
if hearted: if hearted:
await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}') await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
for embed in hearted: n = 1
for embed in hearted.values():
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.author.send('`{} / {}`'.format(hearted.index(embed) + 1, len(hearted)), embed=embed) embed.footer.text = f'{n} / {len(hearted)}'
await ctx.author.send(embed=embed)
n += 1
@cmds.command(name='e621page', aliases=['e621p', 'e6p', '6p']) @cmds.command(name='e621page', aliases=['e621p', 'e6p', '6p'])
@checks.is_nsfw() @checks.is_nsfw()
@ -795,7 +799,7 @@ class MsG:
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
hearted = [] hearted = {}
c = 1 c = 1
tags = self._get_favorites(ctx, tags) tags = self._get_favorites(ctx, tags)
@ -827,12 +831,12 @@ class MsG:
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=7 * 60)]) self.bot.wait_for('reaction_remove', check=on_reaction, timeout=7 * 60)])
except exc.Save: except exc.Save:
if embed not in hearted: if keys[c - 1] not in hearted:
hearted.append(embed) hearted[keys[c - 1]] = embed
await paginator.edit(content='\N{HEAVY BLACK HEART}') await paginator.edit(content='\N{HEAVY BLACK HEART}')
else: else:
hearted.remove(embed) del hearted[keys[c - 1]]
await paginator.edit(content='\N{BROKEN HEART}') await paginator.edit(content='\N{BROKEN HEART}')
@ -846,7 +850,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
else: else:
await paginator.edit(content='**First image**') await paginator.edit(content='**First image**')
@ -863,7 +867,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
except exc.Right: except exc.Right:
try: try:
@ -884,7 +888,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
else: else:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
@ -921,10 +925,14 @@ class MsG:
if hearted: if hearted:
await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}') await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
for embed in hearted: n = 1
for embed in hearted.values():
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.author.send('`{} / {}`'.format(hearted.index(embed) + 1, len(hearted)), embed=embed) embed.footer.text = f'{n} / {len(hearted)}'
await ctx.author.send(embed=embed)
n += 1
# @e621_paginator.error # @e621_paginator.error
# async def e621_paginator_error(self, ctx, error): # async def e621_paginator_error(self, ctx, error):
@ -954,7 +962,7 @@ class MsG:
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
hearted = [] hearted = {}
c = 1 c = 1
tags = self._get_favorites(ctx, tags) tags = self._get_favorites(ctx, tags)
@ -1005,7 +1013,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
else: else:
await paginator.edit(content='**First image**') await paginator.edit(content='**First image**')
@ -1022,7 +1030,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
except exc.Right: except exc.Right:
try: try:
@ -1043,7 +1051,7 @@ class MsG:
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
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 keys[c - 1] in hearted.keys() else None, embed=embed)
else: else:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
@ -1080,10 +1088,14 @@ class MsG:
if hearted: if hearted:
await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}') await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
for embed in hearted: n = 1
for embed in hearted.values():
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.author.send('`{} / {}`'.format(hearted.index(embed) + 1, len(hearted)), embed=embed) embed.footer.text = f'{n} / {len(hearted)}'
await ctx.author.send(embed=embed)
n += 1
# Searches for and returns images from e621.net given tags when not blacklisted # Searches for and returns images from e621.net given tags when not blacklisted
@cmds.group(aliases=['e6', '6'], brief='e621 | NSFW', description='e621 | NSFW\nTag-based search for e621.net\n\nYou can only search 5 tags and 6 images at once for now.\ne6 [tags...] ([# of images])') @cmds.group(aliases=['e6', '6'], brief='e621 | NSFW', description='e621 | NSFW\nTag-based search for e621.net\n\nYou can only search 5 tags and 6 images at once for now.\ne6 [tags...] ([# of images])')