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

Reverted direct emojis for \N syntax (again) for cross-compatibility

Browse source 
(Hopefully)
This commit is contained in:
Myned 2017-11-06 02:00:58 -05:00
parent 3f41ce2d7c
commit 7462e073e8
6 changed files with 209 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,13 +56,13 @@ class MsG:
# #
# print('AUTO-POSTING : #{}'.format(ctx.channel.name)) # print('AUTO-POSTING : #{}'.format(ctx.channel.name))
# await ctx.send('**Auto-posting all images in {}**'.format(ctx.channel.mention), delete_after=5) # await ctx.send('**Auto-posting all images in {}**'.format(ctx.channel.mention), delete_after=5)
# await ctx.message.add_reaction('✅') # await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
# else: # else:
# raise exc.Exists # raise exc.Exists
# #
# except exc.Exists: # except exc.Exists:
# await ctx.send('**Already auto-posting in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10) # await ctx.send('**Already auto-posting in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10)
# await ctx.message.add_reaction('❌') # await ctx.message.add_reaction('\N{CROSS MARK}')
# Tag search # Tag search
@commands.command(aliases=['rel'], brief='e621 Search for related tags', description='e621 | NSFW\nReturn related tags for a number of given tags', usage='[related|rel]') @commands.command(aliases=['rel'], brief='e621 Search for related tags', description='e621 | NSFW\nReturn related tags for a number of given tags', usage='[related|rel]')
@ -85,7 +85,7 @@ class MsG:
related.clear() related.clear()
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
# Tag aliases # Tag aliases
@commands.command(name='aliases', aliases=['alias'], brief='e621 Tag aliases', description='e621 | NSFW\nSearch aliases for given tag') @commands.command(name='aliases', aliases=['alias'], brief='e621 Tag aliases', description='e621 | NSFW\nSearch aliases for given tag')
@ -108,13 +108,13 @@ class MsG:
aliases.clear() aliases.clear()
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.command(name='pool', aliases=['getpool', 'getp', 'gp'], brief='e621 Search for pools', description='e621 | NSFW\nReturn pool for query', usage='[related|rel]') @commands.command(name='getpool', aliases=['pool', 'getp', 'gp'], brief='e621 Search for pools', description='e621 | NSFW\nReturn pool for query', usage='[related|rel]')
@checks.del_ctx() @checks.del_ctx()
async def get_pool(self, ctx, *args): async def get_pool(self, ctx, *args):
def on_reaction(reaction, user): def on_reaction(reaction, user):
if reaction.emoji == '🛑' 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(match) raise exc.Abort(match)
return False return False
@ -135,7 +135,7 @@ class MsG:
pools.append(pool['name']) pools.append(pool['name'])
match = await ctx.send('**Multiple pools found for `{}`.** Type the number of the correct match\n```\n{}```'.format(' '.join(query), '\n'.join(['{} {}'.format(c, elem) for c, elem in enumerate(pools, 1)]))) match = await ctx.send('**Multiple pools found for `{}`.** Type the number of the correct match\n```\n{}```'.format(' '.join(query), '\n'.join(['{} {}'.format(c, elem) for c, elem in enumerate(pools, 1)])))
await ctx.message.add_reaction('🛑') await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=60), done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=60),
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=60), self.bot.wait_for('message', check=on_message, timeout=60)], return_when=asyncio.FIRST_COMPLETED) self.bot.wait_for('reaction_remove', check=on_reaction, timeout=60), self.bot.wait_for('message', check=on_message, timeout=60)], return_when=asyncio.FIRST_COMPLETED)
for future in done: for future in done:
@ -150,7 +150,7 @@ class MsG:
raise exc.NotFound raise exc.NotFound
await ctx.send(f'**{tempool["name"]}**\nhttps://e621.net/pool/show/{tempool["id"]}') await ctx.send(f'**{tempool["name"]}**\nhttps://e621.net/pool/show/{tempool["id"]}')
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.Abort as e: except exc.Abort as e:
await e.message.edit(content='**Search aborted**', delete_after=10) await e.message.edit(content='**Search aborted**', delete_after=10)
@ -174,11 +174,11 @@ class MsG:
finally: finally:
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.MissingArgument: except exc.MissingArgument:
await ctx.send('**Invalid url or file**', delete_after=10) await ctx.send('**Invalid url or file**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
# Reverse image searches a linked image using the public iqdb # Reverse image searches a linked image using the public iqdb
@commands.command(name='reverse', aliases=['rev', 'ris'], brief='e621 Reverse image search', description='e621 | NSFW\nReverse-search an image with given URL') @commands.command(name='reverse', aliases=['rev', 'ris'], brief='e621 Reverse image search', description='e621 | NSFW\nReverse-search an image with given URL')
@ -217,13 +217,13 @@ class MsG:
await ctx.send('**No probable match for:** `{}`'.format(e), delete_after=10) await ctx.send('**No probable match for:** `{}`'.format(e), delete_after=10)
if c: if c:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
else: else:
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.MissingArgument: except exc.MissingArgument:
await ctx.send('**Invalid url or file** Be sure the link directs to an image file', delete_after=10) await ctx.send('**Invalid url or file** Be sure the link directs to an image file', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@commands.command(name='quality', aliases=['qual', 'qrev', 'qis']) @commands.command(name='quality', aliases=['qual', 'qrev', 'qis'])
@checks.del_ctx() @checks.del_ctx()
@ -265,13 +265,13 @@ class MsG:
await ctx.send('**No probable match for:** `{}`'.format(e), delete_after=10) await ctx.send('**No probable match for:** `{}`'.format(e), delete_after=10)
if c: if c:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
else: else:
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.MissingArgument: except exc.MissingArgument:
await ctx.send('**Invalid url or file** Be sure the link directs to an image file', delete_after=10) await ctx.send('**Invalid url or file** Be sure the link directs to an image file', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@commands.command(name='reversify', aliases=['revify', 'risify', 'rify']) @commands.command(name='reversify', aliases=['revify', 'risify', 'rify'])
@checks.del_ctx() @checks.del_ctx()
@ -298,7 +298,7 @@ class MsG:
for attachment in message.attachments: for attachment in message.attachments:
links[message].append(attachment.url) links[message].append(attachment.url)
await message.add_reaction('⏳') await message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
c += 1 c += 1
if not links: if not links:
@ -311,7 +311,7 @@ class MsG:
await dest.trigger_typing() await dest.trigger_typing()
await dest.send('`{} / {}` **Probable match from** {}\n{}'.format(n, len(links), message.author.display_name, await scraper.get_post(url))) await dest.send('`{} / {}` **Probable match from** {}\n{}'.format(n, len(links), message.author.display_name, await scraper.get_post(url)))
await message.add_reaction('✅') await message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
@ -321,23 +321,23 @@ class MsG:
except exc.MatchError as e: except exc.MatchError as e:
await ctx.send('`{} / {}` **No probable match for:** `{}`'.format(n, len(links), e), delete_after=10) await ctx.send('`{} / {}` **No probable match for:** `{}`'.format(n, len(links), e), delete_after=10)
await message.add_reaction('❌') await message.add_reaction('\N{CROSS MARK}')
c -= 1 c -= 1
finally: finally:
n += 1 n += 1
if c > 0: if c > 0:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
else: else:
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.NotFound: except exc.NotFound:
await ctx.send('**No matches found**', delete_after=10) await ctx.send('**No matches found**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.BoundsError as e: except exc.BoundsError as e:
await ctx.send('`{}` **invalid limit.** Query limited to 30'.format(e), delete_after=10) await ctx.send('`{}` **invalid limit.** Query limited to 30'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@commands.command(name='qualitify', aliases=['qualify', 'qrevify', 'qrisify', 'qify']) @commands.command(name='qualitify', aliases=['qualify', 'qrevify', 'qrisify', 'qify'])
@checks.del_ctx() @checks.del_ctx()
@ -364,7 +364,7 @@ class MsG:
for attachment in message.attachments: for attachment in message.attachments:
links[message].append(attachment.url) links[message].append(attachment.url)
await message.add_reaction('⏳') await message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
c += 1 c += 1
if not links: if not links:
@ -379,7 +379,7 @@ class MsG:
post = await scraper.get_post(url) post = await scraper.get_post(url)
await dest.send('`{} / {}` **Probable match from** {}\n{}'.format(n, len(links), message.author.display_name, await scraper.get_image(post))) await dest.send('`{} / {}` **Probable match from** {}\n{}'.format(n, len(links), message.author.display_name, await scraper.get_image(post)))
await message.add_reaction('✅') await message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
@ -389,23 +389,23 @@ class MsG:
except exc.MatchError as e: except exc.MatchError as e:
await ctx.send('`{} / {}` **No probable match for:** `{}`'.format(n, len(links), e), delete_after=10) await ctx.send('`{} / {}` **No probable match for:** `{}`'.format(n, len(links), e), delete_after=10)
await message.add_reaction('❌') await message.add_reaction('\N{CROSS MARK}')
c -= 1 c -= 1
finally: finally:
n += 1 n += 1
if c > 0: if c > 0:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
else: else:
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.NotFound: except exc.NotFound:
await ctx.send('**No matches found**', delete_after=10) await ctx.send('**No matches found**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.BoundsError as e: except exc.BoundsError as e:
await ctx.send('`{}` **invalid limit.** Query limited to 30'.format(e), delete_after=10) await ctx.send('`{}` **invalid limit.** Query limited to 30'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
async def _qualitify(self): async def _qualitify(self):
while self.qualitifying: while self.qualitifying:
@ -428,7 +428,7 @@ class MsG:
await message.channel.send('**Probable match from** {}\n{}'.format(message.author.display_name, await scraper.get_image(post))) await message.channel.send('**Probable match from** {}\n{}'.format(message.author.display_name, await scraper.get_image(post)))
with suppress(err.NotFound): with suppress(err.NotFound):
await message.add_reaction('✅') await message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
@ -437,7 +437,7 @@ class MsG:
except exc.MatchError as e: except exc.MatchError as e:
await message.channel.send('**No probable match for:** `{}`'.format(e), delete_after=10) await message.channel.send('**No probable match for:** `{}`'.format(e), delete_after=10)
await message.add_reaction('❌') await message.add_reaction('\N{CROSS MARK}')
print('STOPPED : qualitifying') print('STOPPED : qualitifying')
@ -453,7 +453,7 @@ class MsG:
while not self.bot.is_closed(): while not self.bot.is_closed():
message = await self.bot.wait_for('message', check=check) message = await self.bot.wait_for('message', check=check)
await self.qualiqueue.put(message) await self.qualiqueue.put(message)
await message.add_reaction('⏳') await message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
except exc.Abort: except exc.Abort:
u.tasks['auto_qual'].remove(channel.id) u.tasks['auto_qual'].remove(channel.id)
@ -477,13 +477,13 @@ class MsG:
print('AUTO-QUALITIFYING : #{}'.format(ctx.channel.name)) print('AUTO-QUALITIFYING : #{}'.format(ctx.channel.name))
await ctx.send('**Auto-qualitifying all images in** {}'.format(ctx.channel.mention), delete_after=5) await ctx.send('**Auto-qualitifying all images in** {}'.format(ctx.channel.mention), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
else: else:
raise exc.Exists raise exc.Exists
except exc.Exists: except exc.Exists:
await ctx.send('**Already auto-qualitifying in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10) await ctx.send('**Already auto-qualitifying in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
def _get_favorites(self, ctx, args): def _get_favorites(self, ctx, args):
if '-f' in args or '-favs' in args or '-faves' in args or '-favorites' in args: if '-f' in args or '-favs' in args or '-faves' in args or '-favorites' in args:
@ -509,7 +509,7 @@ class MsG:
async def _get_pool(self, ctx, *, destination, booru='e621', query=[]): async def _get_pool(self, ctx, *, destination, booru='e621', query=[]):
def on_reaction(reaction, user): def on_reaction(reaction, user):
if reaction.emoji == '🛑' 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(match) raise exc.Abort(match)
return False return False
@ -527,7 +527,7 @@ class MsG:
pools.append(pool['name']) pools.append(pool['name'])
match = await ctx.send('**Multiple pools found for `{}`.** Type the number of the correct match.\n```\n{}```'.format(' '.join(query), '\n'.join(['{} {}'.format(c, elem) for c, elem in enumerate(pools, 1)]))) match = await ctx.send('**Multiple pools found for `{}`.** Type the number of the correct match.\n```\n{}```'.format(' '.join(query), '\n'.join(['{} {}'.format(c, elem) for c, elem in enumerate(pools, 1)])))
await ctx.message.add_reaction('🛑') await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=60), done, pending = await asyncio.wait([self.bot.wait_for('reaction_add', check=on_reaction, timeout=60),
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=60), self.bot.wait_for('message', check=on_message, timeout=60)], return_when=asyncio.FIRST_COMPLETED) self.bot.wait_for('reaction_remove', check=on_reaction, timeout=60), self.bot.wait_for('message', check=on_message, timeout=60)], return_when=asyncio.FIRST_COMPLETED)
for future in done: for future in done:
@ -631,19 +631,19 @@ class MsG:
raise exc.NotFound raise exc.NotFound
# Creates reaction-based paginator for linked pools # 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) @commands.command(name='poolpage', aliases=['poolp', 'pp', 'e621pp', 'e6pp', '6pp'], brief='e621 pool paginator', description='e621 | NSFW\nShow pools in a page format')
@checks.del_ctx() @checks.del_ctx()
async def pool_paginator(self, ctx, *args): async def pool_paginator(self, ctx, *args):
def on_reaction(reaction, user): def on_reaction(reaction, user):
if reaction.emoji == '🛑' 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
elif reaction.emoji == '❤' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{HEAVY BLACK HEART}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Save raise exc.Save
elif reaction.emoji == '⬅' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{LEFTWARDS BLACK ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Left raise exc.Left
elif reaction.emoji == '#⃣' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.GoTo raise exc.GoTo
elif reaction.emoji == '➡' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{BLACK RIGHTWARDS ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Right raise exc.Right
return False return False
@ -663,7 +663,7 @@ class MsG:
values = list(posts.values()) values = list(posts.values())
embed = d.Embed( embed = d.Embed(
title=values[c - 1]['artist'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=dest.me.color if isinstance(dest.channel, d.TextChannel) else self.color) title=values[c - 1]['artist'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=dest.me.color if isinstance(dest.channel, d.TextChannel) else u.color)
embed.set_image(url=values[c - 1]['url']) embed.set_image(url=values[c - 1]['url'])
embed.set_author(name=pool['name'], embed.set_author(name=pool['name'],
url='https://e621.net/pool/show?id={}'.format(pool['id']), icon_url=ctx.author.avatar_url) url='https://e621.net/pool/show?id={}'.format(pool['id']), icon_url=ctx.author.avatar_url)
@ -672,9 +672,9 @@ class MsG:
paginator = await dest.send(embed=embed) paginator = await dest.send(embed=embed)
for emoji in ('❤', '⬅', '#⃣', '➡'): for emoji in ('\N{HEAVY BLACK HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'):
await paginator.add_reaction(emoji) await paginator.add_reaction(emoji)
await ctx.message.add_reaction('🛑') await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
await asyncio.sleep(1) await asyncio.sleep(1)
while not self.bot.is_closed(): while not self.bot.is_closed():
@ -688,11 +688,11 @@ class MsG:
if values[c - 1]['url'] not in hearted: if values[c - 1]['url'] not in hearted:
hearted.append(values[c - 1]['url']) hearted.append(values[c - 1]['url'])
await paginator.edit(content='❤') await paginator.edit(content='\N{HEAVY BLACK HEART}')
else: else:
hearted.remove(values[c - 1]['url']) hearted.remove(values[c - 1]['url'])
await paginator.edit(content='💔') await paginator.edit(content='\N{BROKEN HEART}')
except exc.Left: except exc.Left:
if c > 1: if c > 1:
@ -703,7 +703,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='❤' 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: else:
await paginator.edit(content='**First image**') await paginator.edit(content='**First image**')
@ -719,7 +719,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='❤' 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)
except exc.Right: except exc.Right:
if c < len(keys): if c < len(keys):
@ -730,7 +730,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='❤' 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: else:
await paginator.edit(content='**Last image**') await paginator.edit(content='**Last image**')
@ -741,7 +741,7 @@ class MsG:
await dest.send('**Exited paginator**') await dest.send('**Exited paginator**')
if not hearted: if not hearted:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except asyncio.TimeoutError: except asyncio.TimeoutError:
try: try:
await paginator.edit(content='**Paginator timed out**') await paginator.edit(content='**Paginator timed out**')
@ -749,41 +749,41 @@ class MsG:
await dest.send('**Paginator timed out**') await dest.send('**Paginator timed out**')
if not hearted: if not hearted:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.NotFound: except exc.NotFound:
await ctx.send('**Pool not found**', delete_after=10) await ctx.send('**Pool not found**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.Timeout: except exc.Timeout:
await ctx.send('**Request timed out**') await ctx.send('**Request timed out**')
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.Continue: except exc.Continue:
pass pass
finally: finally:
if hearted: if hearted:
await ctx.message.add_reaction('⏳') await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
for url in hearted: for url in hearted:
await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url)) await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.command(name='e621page', aliases=['e621p', 'e6p', '6p']) @commands.command(name='e621page', aliases=['e621p', 'e6p', '6p'])
@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): def on_reaction(reaction, user):
if reaction.emoji == '🛑' 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
elif reaction.emoji == '❤' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{HEAVY BLACK HEART}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Save raise exc.Save
elif reaction.emoji == '⬅' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{LEFTWARDS BLACK ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Left raise exc.Left
elif reaction.emoji == '#⃣' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.GoTo raise exc.GoTo
elif reaction.emoji == '➡' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{BLACK RIGHTWARDS ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Right raise exc.Right
return False return False
@ -806,7 +806,7 @@ class MsG:
values = list(posts.values()) values = list(posts.values())
embed = d.Embed( embed = d.Embed(
title=values[c - 1]['artist'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else self.color) title=values[c - 1]['artist'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else u.color)
embed.set_image(url=values[c - 1]['url']) embed.set_image(url=values[c - 1]['url'])
embed.set_author(name=formatter.tostring(tags, order=order), embed.set_author(name=formatter.tostring(tags, order=order),
url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url) url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url)
@ -815,9 +815,9 @@ class MsG:
paginator = await dest.send(embed=embed) paginator = await dest.send(embed=embed)
for emoji in ('❤', '⬅', '#⃣', '➡'): for emoji in ('\N{HEAVY BLACK HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'):
await paginator.add_reaction(emoji) await paginator.add_reaction(emoji)
await ctx.message.add_reaction('🛑') await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
await asyncio.sleep(1) await asyncio.sleep(1)
while not self.bot.is_closed(): while not self.bot.is_closed():
@ -831,11 +831,11 @@ class MsG:
if values[c - 1]['url'] not in hearted: if values[c - 1]['url'] not in hearted:
hearted.append(values[c - 1]['url']) hearted.append(values[c - 1]['url'])
await paginator.edit(content='❤') await paginator.edit(content='\N{HEAVY BLACK HEART}')
else: else:
hearted.remove(values[c - 1]['url']) hearted.remove(values[c - 1]['url'])
await paginator.edit(content='💔') await paginator.edit(content='\N{BROKEN HEART}')
except exc.Left: except exc.Left:
if c > 1: if c > 1:
@ -846,7 +846,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='❤' 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: else:
await paginator.edit(content='**First image**') await paginator.edit(content='**First image**')
@ -862,7 +862,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='❤' 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)
except exc.Right: except exc.Right:
try: try:
@ -880,7 +880,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='❤' 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)
except IndexError: except IndexError:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
@ -894,7 +894,7 @@ class MsG:
await dest.send('**Exited paginator**') await dest.send('**Exited paginator**')
if not hearted: if not hearted:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except asyncio.TimeoutError: except asyncio.TimeoutError:
try: try:
await paginator.edit(content='**Paginator timed out**') await paginator.edit(content='**Paginator timed out**')
@ -902,53 +902,53 @@ class MsG:
await dest.send('**Paginator timed out**') await dest.send('**Paginator timed out**')
if not hearted: if not hearted:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.NotFound as e: except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e), delete_after=10) await ctx.send('`{}` **not found**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.TagBlacklisted as e: except exc.TagBlacklisted as e:
await ctx.send('🚫 `{}` **blacklisted**'.format(e), delete_after=10) await ctx.send('\N{NO ENTRY SIGN} `{}` **blacklisted**'.format(e), delete_after=10)
await ctx.message.add_reaction('🚫') await ctx.message.add_reaction('\N{NO ENTRY SIGN}')
except exc.TagBoundsError as e: except exc.TagBoundsError as e:
await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10) await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.FavoritesNotFound: except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**', delete_after=10) await ctx.send('**You have no favorite tags**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.Timeout: except exc.Timeout:
await ctx.send('**Request timed out**') await ctx.send('**Request timed out**')
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
finally: finally:
if hearted: if hearted:
await ctx.message.add_reaction('⏳') await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
for url in hearted: for url in hearted:
await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url)) await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@e621_paginator.error @e621_paginator.error
async def e621_paginator_error(self, ctx, error): async def e621_paginator_error(self, ctx, error):
if isinstance(error, errext.CheckFailure): if isinstance(error, errext.CheckFailure):
await ctx.send('⛔️ {} **is not an NSFW channel**'.format(ctx.channel.mention), delete_after=10) await ctx.send('\N{NO ENTRY} {} **is not an NSFW channel**'.format(ctx.channel.mention), delete_after=10)
return await ctx.message.add_reaction('⛔️') return await ctx.message.add_reaction('\N{NO ENTRY}')
@commands.command(name='e926page', aliases=['e926p', 'e9p', '9p']) @commands.command(name='e926page', aliases=['e926p', 'e9p', '9p'])
@checks.del_ctx() @checks.del_ctx()
async def e926_paginator(self, ctx, *args): async def e926_paginator(self, ctx, *args):
def on_reaction(reaction, user): def on_reaction(reaction, user):
if reaction.emoji == '🛑' 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
elif reaction.emoji == '❤' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{HEAVY BLACK HEART}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Save raise exc.Save
elif reaction.emoji == '⬅' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{LEFTWARDS BLACK ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Left raise exc.Left
elif reaction.emoji == '#⃣' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.GoTo raise exc.GoTo
elif reaction.emoji == '➡' and reaction.message.id == paginator.id and user is ctx.author: elif reaction.emoji == '\N{BLACK RIGHTWARDS ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Right raise exc.Right
return False return False
@ -971,7 +971,7 @@ class MsG:
values = list(posts.values()) values = list(posts.values())
embed = d.Embed( embed = d.Embed(
title=values[c - 1]['artist'], url='https://e926.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else self.color) title=values[c - 1]['artist'], url='https://e926.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else u.color)
embed.set_image(url=values[c - 1]['url']) embed.set_image(url=values[c - 1]['url'])
embed.set_author(name=formatter.tostring(tags, order=order), embed.set_author(name=formatter.tostring(tags, order=order),
url='https://e926.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url) url='https://e926.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url)
@ -980,9 +980,9 @@ class MsG:
paginator = await dest.send(embed=embed) paginator = await dest.send(embed=embed)
for emoji in ('❤', '⬅', '#⃣', '➡'): for emoji in ('\N{HEAVY BLACK HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'):
await paginator.add_reaction(emoji) await paginator.add_reaction(emoji)
await ctx.message.add_reaction('🛑') await ctx.message.add_reaction('\N{OCTAGONAL SIGN}')
await asyncio.sleep(1) await asyncio.sleep(1)
while not self.bot.is_closed(): while not self.bot.is_closed():
@ -996,11 +996,11 @@ class MsG:
if values[c - 1]['url'] not in hearted: if values[c - 1]['url'] not in hearted:
hearted.append(values[c - 1]['url']) hearted.append(values[c - 1]['url'])
await paginator.edit(content='❤') await paginator.edit(content='\N{HEAVY BLACK HEART}')
else: else:
hearted.remove(values[c - 1]['url']) hearted.remove(values[c - 1]['url'])
await paginator.edit(content='💔') await paginator.edit(content='\N{BROKEN HEART}')
except exc.Left: except exc.Left:
if c > 1: if c > 1:
@ -1011,7 +1011,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='❤' 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: else:
await paginator.edit(content='**First image**') await paginator.edit(content='**First image**')
@ -1027,7 +1027,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='❤' 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)
except exc.Right: except exc.Right:
try: try:
@ -1045,7 +1045,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='❤' 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)
except IndexError: except IndexError:
await paginator.edit(content='**No more images found**') await paginator.edit(content='**No more images found**')
@ -1059,7 +1059,7 @@ class MsG:
await dest.send('**Exited paginator**') await dest.send('**Exited paginator**')
if not hearted: if not hearted:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except asyncio.TimeoutError: except asyncio.TimeoutError:
try: try:
await paginator.edit(content='**Paginator timed out**') await paginator.edit(content='**Paginator timed out**')
@ -1067,33 +1067,33 @@ class MsG:
await dest.send('**Paginator timed out**') await dest.send('**Paginator timed out**')
if not hearted: if not hearted:
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.NotFound as e: except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e), delete_after=10) await ctx.send('`{}` **not found**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.TagBlacklisted as e: except exc.TagBlacklisted as e:
await ctx.send('🚫 `{}` **blacklisted**'.format(e), delete_after=10) await ctx.send('\N{NO ENTRY SIGN} `{}` **blacklisted**'.format(e), delete_after=10)
await ctx.message.add_reaction('🚫') await ctx.message.add_reaction('\N{NO ENTRY SIGN}')
except exc.TagBoundsError as e: except exc.TagBoundsError as e:
await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10) await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.FavoritesNotFound: except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**', delete_after=10) await ctx.send('**You have no favorite tags**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.Timeout: except exc.Timeout:
await ctx.send('**Request timed out**') await ctx.send('**Request timed out**')
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
finally: finally:
if hearted: if hearted:
await ctx.message.add_reaction('⏳') await ctx.message.add_reaction('\N{HOURGLASS WITH FLOWING SAND}')
for url in hearted: for url in hearted:
await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url)) await ctx.author.send('`{} / {}`\n{}'.format(hearted.index(url) + 1, len(hearted), url))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
# 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
@commands.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])') @commands.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])')
@ -1112,7 +1112,7 @@ class MsG:
for ident, post in posts.items(): for ident, post in posts.items():
embed = d.Embed(title=post['artist'], url='https://e621.net/post/show/{}'.format(ident), embed = d.Embed(title=post['artist'], url='https://e621.net/post/show/{}'.format(ident),
color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else self.color).set_image(url=post['url']) color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else u.color).set_image(url=post['url'])
embed.set_author(name=formatter.tostring(tags, order=order), embed.set_author(name=formatter.tostring(tags, order=order),
url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url) url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url)
embed.set_footer( embed.set_footer(
@ -1120,26 +1120,26 @@ class MsG:
await dest.send(embed=embed) await dest.send(embed=embed)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.TagBlacklisted as e: except exc.TagBlacklisted as e:
await ctx.send('`{}` **blacklisted**'.format(e), delete_after=10) await ctx.send('`{}` **blacklisted**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.BoundsError as e: except exc.BoundsError as e:
await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e), delete_after=10) await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.TagBoundsError as e: except exc.TagBoundsError as e:
await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10) await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.NotFound as e: except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e), delete_after=10) await ctx.send('`{}` **not found**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.FavoritesNotFound: except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**', delete_after=10) await ctx.send('**You have no favorite tags**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.Timeout: except exc.Timeout:
await ctx.send('**Request timed out**') await ctx.send('**Request timed out**')
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
# tools.command_dict.setdefault(str(ctx.author.id), {}).update( # tools.command_dict.setdefault(str(ctx.author.id), {}).update(
# {'command': ctx.command, 'args': ctx.args}) # {'command': ctx.command, 'args': ctx.args})
@ -1147,8 +1147,8 @@ class MsG:
@e621.error @e621.error
async def e621_error(self, ctx, error): async def e621_error(self, ctx, error):
if isinstance(error, errext.CheckFailure): if isinstance(error, errext.CheckFailure):
await ctx.send('⛔️ {} **is not an NSFW channel**'.format(ctx.channel.mention), delete_after=10) await ctx.send('\N{NO ENTRY} {} **is not an NSFW channel**'.format(ctx.channel.mention), delete_after=10)
return await ctx.message.add_reaction('⛔️') return await ctx.message.add_reaction('\N{NO ENTRY}')
# Searches for and returns images from e926.net given tags when not blacklisted # Searches for and returns images from e926.net given tags when not blacklisted
@commands.command(aliases=['e9', '9'], brief='e926 | SFW', description='e926 | SFW\nTag-based search for e926.net\n\nYou can only search 5 tags and 6 images at once for now.\ne9 [tags...] ([# of images])') @commands.command(aliases=['e9', '9'], brief='e926 | SFW', description='e926 | SFW\nTag-based search for e926.net\n\nYou can only search 5 tags and 6 images at once for now.\ne9 [tags...] ([# of images])')
@ -1166,7 +1166,7 @@ class MsG:
for ident, post in posts.items(): for ident, post in posts.items():
embed = d.Embed(title=post['artist'], url='https://e926.net/post/show/{}'.format(ident), embed = d.Embed(title=post['artist'], url='https://e926.net/post/show/{}'.format(ident),
color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else self.color).set_image(url=post['url']) color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else u.color).set_image(url=post['url'])
embed.set_author(name=formatter.tostring(tags, order=order), embed.set_author(name=formatter.tostring(tags, order=order),
url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url) url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url)
embed.set_footer( embed.set_footer(
@ -1174,33 +1174,33 @@ class MsG:
await dest.send(embed=embed) await dest.send(embed=embed)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.TagBlacklisted as e: except exc.TagBlacklisted as e:
await ctx.send('`{}` **blacklisted**'.format(e), delete_after=10) await ctx.send('`{}` **blacklisted**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.BoundsError as e: except exc.BoundsError as e:
await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e), delete_after=10) await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.TagBoundsError as e: except exc.TagBoundsError as e:
await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10) await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.NotFound as e: except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e), delete_after=10) await ctx.send('`{}` **not found**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.FavoritesNotFound: except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**', delete_after=10) await ctx.send('**You have no favorite tags**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.Timeout: except exc.Timeout:
await ctx.send('**Request timed out**') await ctx.send('**Request timed out**')
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@commands.group(aliases=['fave', 'fav', 'f']) @commands.group(aliases=['fave', 'fav', 'f'])
@checks.del_ctx() @checks.del_ctx()
async def favorite(self, ctx): async def favorite(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Use a flag to manage favorites.**\n*Type* `{}help fav` *for more info.*'.format(ctx.prefix), delete_after=10) await ctx.send('**Use a flag to manage favorites.**\n*Type* `{}help fav` *for more info.*'.format(ctx.prefix), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@favorite.error @favorite.error
async def favorite_error(self, ctx, error): async def favorite_error(self, ctx, error):
@ -1214,8 +1214,8 @@ class MsG:
async def __get_favorite_tags(self, ctx, *args): async def __get_favorite_tags(self, ctx, *args):
dest = u.get_kwargs(ctx, args)['destination'] dest = u.get_kwargs(ctx, args)['destination']
await dest.send('⭐️ {}**\'s favorite tags:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(self.favorites.get(ctx.author.id, {}).get('tags', set()))), delete_after=10) await dest.send('\N{WHITE MEDIUM STAR} {}**\'s favorite tags:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(self.favorites.get(ctx.author.id, {}).get('tags', set()))), delete_after=10)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_get_favorite.command(name='posts', aliases=['p']) @_get_favorite.command(name='posts', aliases=['p'])
async def __get_favorite_posts(self, ctx): async def __get_favorite_posts(self, ctx):
@ -1241,14 +1241,14 @@ class MsG:
u.dump(self.favorites, 'cogs/favorites.pkl') u.dump(self.favorites, 'cogs/favorites.pkl')
await dest.send('{} **added to their favorites:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) await dest.send('{} **added to their favorites:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.BoundsError: except exc.BoundsError:
await ctx.send('**Favorites list currently limited to:** `5`', delete_after=10) await ctx.send('**Favorites list currently limited to:** `5`', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except exc.TagBlacklisted as e: except exc.TagBlacklisted as e:
await ctx.send('🚫 `{}` **blacklisted**', delete_after=10) await ctx.send('\N{NO ENTRY SIGN} `{}` **blacklisted**', delete_after=10)
await ctx.message.add_reaction('🚫') await ctx.message.add_reaction('\N{NO ENTRY SIGN}')
@_add_favorite.command(name='posts', aliases=['p']) @_add_favorite.command(name='posts', aliases=['p'])
async def __add_favorite_posts(self, ctx, *posts): async def __add_favorite_posts(self, ctx, *posts):
@ -1274,11 +1274,11 @@ class MsG:
u.dump(self.favorites, 'cogs/favorites.pkl') u.dump(self.favorites, 'cogs/favorites.pkl')
await dest.send('{} **removed from their favorites:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) await dest.send('{} **removed from their favorites:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.TagError as e: except exc.TagError as e:
await ctx.send('`{}` **not in favorites**'.format(e), delete_after=10) await ctx.send('`{}` **not in favorites**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_remove_favorite.command(name='posts', aliases=['p']) @_remove_favorite.command(name='posts', aliases=['p'])
async def __remove_favorite_posts(self, ctx): async def __remove_favorite_posts(self, ctx):
@ -1297,7 +1297,7 @@ class MsG:
u.dump(self.favorites, 'cogs/favorites.pkl') u.dump(self.favorites, 'cogs/favorites.pkl')
await dest.send('{}**\'s favorites cleared**'.format(ctx.author.mention), delete_after=5) await dest.send('{}**\'s favorites cleared**'.format(ctx.author.mention), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_clear_favorite.command(name='posts', aliases=['p']) @_clear_favorite.command(name='posts', aliases=['p'])
async def __clear_favorite_posts(self, ctx): async def __clear_favorite_posts(self, ctx):
@ -1309,7 +1309,7 @@ class MsG:
async def blacklist(self, ctx): async def blacklist(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Use a flag to manage blacklists.**\n*Type* `{}help bl` *for more info.*'.format(ctx.prefix), delete_after=10) await ctx.send('**Use a flag to manage blacklists.**\n*Type* `{}help bl` *for more info.*'.format(ctx.prefix), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
# @blacklist.error # @blacklist.error
# async def blacklist_error(self, ctx, error): # async def blacklist_error(self, ctx, error):
@ -1320,14 +1320,14 @@ class MsG:
async def _get_blacklist(self, ctx): async def _get_blacklist(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Invalid blacklist**', delete_after=10) await ctx.send('**Invalid blacklist**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_get_blacklist.command(name='global', aliases=['gl', 'g']) @_get_blacklist.command(name='global', aliases=['gl', 'g'])
async def __get_global_blacklist(self, ctx, *args): async def __get_global_blacklist(self, ctx, *args):
dest = u.get_kwargs(ctx, args)['destination'] dest = u.get_kwargs(ctx, args)['destination']
await dest.send('🚫 **Global blacklist:**\n```\n{}```'.format(formatter.tostring(self.blacklists['global_blacklist']))) await dest.send('\N{NO ENTRY SIGN} **Global blacklist:**\n```\n{}```'.format(formatter.tostring(self.blacklists['global_blacklist'])))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_get_blacklist.command(name='channel', aliases=['ch', 'c']) @_get_blacklist.command(name='channel', aliases=['ch', 'c'])
async def __get_channel_blacklist(self, ctx, *args): async def __get_channel_blacklist(self, ctx, *args):
@ -1336,15 +1336,15 @@ class MsG:
guild = ctx.guild if isinstance( guild = ctx.guild if isinstance(
ctx.guild, d.Guild) else ctx.channel ctx.guild, d.Guild) else ctx.channel
await dest.send('🚫 {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set())))) await dest.send('\N{NO ENTRY SIGN} {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set()))))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_get_blacklist.command(name='me', aliases=['m']) @_get_blacklist.command(name='me', aliases=['m'])
async def __get_user_blacklist(self, ctx, *args): async def __get_user_blacklist(self, ctx, *args):
dest = u.get_kwargs(ctx, args)['destination'] dest = u.get_kwargs(ctx, args)['destination']
await dest.send('🚫 {}**\'s blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(self.blacklists['user_blacklist'].get(ctx.author.id, set()))), delete_after=10) await dest.send('\N{NO ENTRY SIGN} {}**\'s blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(self.blacklists['user_blacklist'].get(ctx.author.id, set()))), delete_after=10)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_get_blacklist.command(name='here', aliases=['h']) @_get_blacklist.command(name='here', aliases=['h'])
async def __get_here_blacklists(self, ctx, *args): async def __get_here_blacklists(self, ctx, *args):
@ -1353,14 +1353,14 @@ class MsG:
guild = ctx.guild if isinstance( guild = ctx.guild if isinstance(
ctx.guild, d.Guild) else ctx.channel ctx.guild, d.Guild) else ctx.channel
await dest.send('🚫 **__Blacklisted:__**\n\n**Global:**\n```\n{}```\n**{}:**\n```\n{}```'.format(formatter.tostring(self.blacklists['global_blacklist']), ctx.channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set())))) await dest.send('\N{NO ENTRY SIGN} **__Blacklisted:__**\n\n**Global:**\n```\n{}```\n**{}:**\n```\n{}```'.format(formatter.tostring(self.blacklists['global_blacklist']), ctx.channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set()))))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_get_blacklist.group(name='all', aliases=['a']) @_get_blacklist.group(name='all', aliases=['a'])
async def __get_all_blacklists(self, ctx): async def __get_all_blacklists(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Invalid blacklist**') await ctx.send('**Invalid blacklist**')
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@__get_all_blacklists.command(name='guild', aliases=['g']) @__get_all_blacklists.command(name='guild', aliases=['g'])
@commands.has_permissions(manage_channels=True) @commands.has_permissions(manage_channels=True)
@ -1370,22 +1370,22 @@ class MsG:
guild = ctx.guild if isinstance( guild = ctx.guild if isinstance(
ctx.guild, d.Guild) else ctx.channel ctx.guild, d.Guild) else ctx.channel
await dest.send('🚫 **__{} blacklists:__**\n\n{}'.format(guild.name, formatter.dict_tostring(self.blacklists['guild_blacklist'].get(guild.id, {})))) await dest.send('\N{NO ENTRY SIGN} **__{} blacklists:__**\n\n{}'.format(guild.name, formatter.dict_tostring(self.blacklists['guild_blacklist'].get(guild.id, {}))))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@__get_all_blacklists.command(name='user', aliases=['u', 'member', 'm']) @__get_all_blacklists.command(name='user', aliases=['u', 'member', 'm'])
@commands.is_owner() @commands.is_owner()
async def ___get_all_user_blacklists(self, ctx, *args): async def ___get_all_user_blacklists(self, ctx, *args):
dest = u.get_kwargs(ctx, args)['destination'] dest = u.get_kwargs(ctx, args)['destination']
await dest.send('🚫 **__User blacklists:__**\n\n{}'.format(formatter.dict_tostring(self.blacklists['user_blacklist']))) await dest.send('\N{NO ENTRY SIGN} **__User blacklists:__**\n\n{}'.format(formatter.dict_tostring(self.blacklists['user_blacklist'])))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@blacklist.group(name='add', aliases=['a']) @blacklist.group(name='add', aliases=['a'])
async def _add_tags(self, ctx): async def _add_tags(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Invalid blacklist**', delete_after=10) await ctx.send('**Invalid blacklist**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_add_tags.command(name='global', aliases=['gl', 'g']) @_add_tags.command(name='global', aliases=['gl', 'g'])
@commands.is_owner() @commands.is_owner()
@ -1407,7 +1407,7 @@ class MsG:
u.dump(self.aliases, 'cogs/aliases.pkl') u.dump(self.aliases, 'cogs/aliases.pkl')
await dest.send('**Added to global blacklist:**\n```\n{}```'.format(formatter.tostring(tags)), delete_after=5) await dest.send('**Added to global blacklist:**\n```\n{}```'.format(formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_add_tags.command(name='channel', aliases=['ch', 'c']) @_add_tags.command(name='channel', aliases=['ch', 'c'])
@commands.has_permissions(manage_channels=True) @commands.has_permissions(manage_channels=True)
@ -1433,7 +1433,7 @@ class MsG:
u.dump(self.aliases, 'cogs/aliases.pkl') u.dump(self.aliases, 'cogs/aliases.pkl')
await dest.send('**Added to** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(tags)), delete_after=5) await dest.send('**Added to** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_add_tags.command(name='me', aliases=['m']) @_add_tags.command(name='me', aliases=['m'])
async def __add_user_tags(self, ctx, *args): async def __add_user_tags(self, ctx, *args):
@ -1454,13 +1454,13 @@ class MsG:
u.dump(self.aliases, 'cogs/aliases.pkl') u.dump(self.aliases, 'cogs/aliases.pkl')
await dest.send('{} **added to their blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) await dest.send('{} **added to their blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@blacklist.group(name='remove', aliases=['rm', 'r']) @blacklist.group(name='remove', aliases=['rm', 'r'])
async def _remove_tags(self, ctx): async def _remove_tags(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Invalid blacklist**', delete_after=10) await ctx.send('**Invalid blacklist**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_remove_tags.command(name='global', aliases=['gl', 'g']) @_remove_tags.command(name='global', aliases=['gl', 'g'])
@commands.is_owner() @commands.is_owner()
@ -1479,11 +1479,11 @@ class MsG:
u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.blacklists, 'cogs/blacklists.pkl')
await dest.send('**Removed from global blacklist:**\n```\n{}```'.format(formatter.tostring(tags)), delete_after=5) await dest.send('**Removed from global blacklist:**\n```\n{}```'.format(formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.TagError as e: except exc.TagError as e:
await ctx.send('`{}` **not in blacklist**'.format(e), delete_after=10) await ctx.send('`{}` **not in blacklist**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_remove_tags.command(name='channel', aliases=['ch', 'c']) @_remove_tags.command(name='channel', aliases=['ch', 'c'])
@commands.has_permissions(manage_channels=True) @commands.has_permissions(manage_channels=True)
@ -1505,11 +1505,11 @@ class MsG:
u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.blacklists, 'cogs/blacklists.pkl')
await dest.send('**Removed from** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(tags), delete_after=5)) await dest.send('**Removed from** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(tags), delete_after=5))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.TagError as e: except exc.TagError as e:
await ctx.send('`{}` **not in blacklist**'.format(e), delete_after=10) await ctx.send('`{}` **not in blacklist**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_remove_tags.command(name='me', aliases=['m']) @_remove_tags.command(name='me', aliases=['m'])
async def __remove_user_tags(self, ctx, *args): async def __remove_user_tags(self, ctx, *args):
@ -1527,17 +1527,17 @@ class MsG:
u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.blacklists, 'cogs/blacklists.pkl')
await dest.send('{} **removed from their blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) await dest.send('{} **removed from their blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.TagError as e: except exc.TagError as e:
await ctx.send('`{}` **not in blacklist**'.format(e), delete_after=10) await ctx.send('`{}` **not in blacklist**'.format(e), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@blacklist.group(name='clear', aliases=['cl', 'c']) @blacklist.group(name='clear', aliases=['cl', 'c'])
async def _clear_blacklist(self, ctx): async def _clear_blacklist(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send('**Invalid blacklist**', delete_after=10) await ctx.send('**Invalid blacklist**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@_clear_blacklist.command(name='global', aliases=['gl', 'g']) @_clear_blacklist.command(name='global', aliases=['gl', 'g'])
@commands.is_owner() @commands.is_owner()
@ -1548,7 +1548,7 @@ class MsG:
u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.blacklists, 'cogs/blacklists.pkl')
await dest.send('**Global blacklist cleared**', delete_after=5) await dest.send('**Global blacklist cleared**', delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_clear_blacklist.command(name='channel', aliases=['ch', 'c']) @_clear_blacklist.command(name='channel', aliases=['ch', 'c'])
@commands.has_permissions(manage_channels=True) @commands.has_permissions(manage_channels=True)
@ -1563,7 +1563,7 @@ class MsG:
u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.blacklists, 'cogs/blacklists.pkl')
await dest.send('{} **blacklist cleared**'.format(ctx.channel.mention), delete_after=5) await dest.send('{} **blacklist cleared**'.format(ctx.channel.mention), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@_clear_blacklist.command(name='me', aliases=['m']) @_clear_blacklist.command(name='me', aliases=['m'])
async def __clear_user_blacklist(self, ctx, *args): async def __clear_user_blacklist(self, ctx, *args):
@ -1574,4 +1574,4 @@ class MsG:
u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.blacklists, 'cogs/blacklists.pkl')
await dest.send('{}**\'s blacklist cleared**'.format(ctx.author.mention), delete_after=5) await dest.send('{}**\'s blacklist cleared**'.format(ctx.author.mention), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')

32
src/main/cogs/management.py
View file

@ -50,63 +50,63 @@ class Administration:
history = [] history = []
try: try:
pru_sent = await ctx.send('⌛️ **Pruning** <@{}>**\'s messages will take some time**'.format(user)) pru_sent = await ctx.send('\N{HOURGLASS} **Pruning** <@{}>**\'s messages will take some time**'.format(user))
ch_sent = await ctx.send('🗄 **Caching channels...**') ch_sent = await ctx.send('\N{FILE CABINET} **Caching channels...**')
if when is None: if when is None:
for channel in channels: for channel in channels:
async for message in channel.history(limit=None): async for message in channel.history(limit=None):
if message.author.id == int(user): if message.author.id == int(user):
history.append(message) history.append(message)
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels))) await ch_sent.edit(content='\N{FILE CABINET} **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels)))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
elif when == 'before': elif when == 'before':
for channel in channels: for channel in channels:
async for message in channel.history(limit=None, before=ref.created_at): async for message in channel.history(limit=None, before=ref.created_at):
if message.author.id == int(user): if message.author.id == int(user):
history.append(message) history.append(message)
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels))) await ch_sent.edit(content='\N{FILE CABINET} **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels)))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
elif when == 'after': elif when == 'after':
for channel in channels: for channel in channels:
async for message in channel.history(limit=None, after=ref.created_at): async for message in channel.history(limit=None, after=ref.created_at):
if message.author.id == int(user): if message.author.id == int(user):
history.append(message) history.append(message)
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels))) await ch_sent.edit(content='\N{FILE CABINET} **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels)))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
elif when == 'about': elif when == 'about':
for channel in channels: for channel in channels:
async for message in channel.history(limit=None, about=ref.created_at): async for message in channel.history(limit=None, about=ref.created_at):
if message.author.id == int(user): if message.author.id == int(user):
history.append(message) history.append(message)
await ch_sent.edit(content='🗄 **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels))) await ch_sent.edit(content='\N{FILE CABINET} **Cached** `{}/{}` **channels**'.format(channels.index(channel) + 1, len(channels)))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
est_sent = await ctx.send('⏱ **Estimated time to delete history:** `{}m {}s`'.format(int(self.RATE_LIMIT * len(history) / 60), int(self.RATE_LIMIT * len(history) % 60))) est_sent = await ctx.send('\N{STOPWATCH} **Estimated time to delete history:** `{}m {}s`'.format(int(self.RATE_LIMIT * len(history) / 60), int(self.RATE_LIMIT * len(history) % 60)))
cont_sent = await ctx.send('{} **Continue?** `Y` or `N`'.format(ctx.author.mention)) cont_sent = await ctx.send('{} **Continue?** `Y` or `N`'.format(ctx.author.mention))
await self.bot.wait_for('message', check=yes, timeout=10 * 60) await self.bot.wait_for('message', check=yes, timeout=10 * 60)
await cont_sent.delete() await cont_sent.delete()
del_sent = await ctx.send('🗑 **Deleting messages..**') del_sent = await ctx.send('\N{WASTEBASKET} **Deleting messages..**')
await del_sent.pin() await del_sent.pin()
c = 0 c = 0
for message in history: for message in history:
with suppress(err.NotFound): with suppress(err.NotFound):
await message.delete() await message.delete()
c += 1 c += 1
await del_sent.edit(content='🗑 **Deleted** `{}/{}` **messages**'.format(history.index(message) + 1, len(history))) await del_sent.edit(content='\N{WASTEBASKET} **Deleted** `{}/{}` **messages**'.format(history.index(message) + 1, len(history)))
await asyncio.sleep(self.RATE_LIMIT) await asyncio.sleep(self.RATE_LIMIT)
await del_sent.unpin() await del_sent.unpin()
await ctx.send('🗑 `{}` **of** <@{}>**\'s messages left in** {}****'.format(len(history) - c, user, ctx.guild.name)) await ctx.send('\N{WASTEBASKET} `{}` **of** <@{}>**\'s messages left in** {}****'.format(len(history) - c, user, ctx.guild.name))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except exc.CheckFail: except exc.CheckFail:
await ctx.send('**Deletion aborted**', delete_after=10) await ctx.send('**Deletion aborted**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except TimeoutError: except TimeoutError:
await ctx.send('**Deletion timed out**', delete_after=10) await ctx.send('**Deletion timed out**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
async def delete(self): async def delete(self):
while self.deleting: while self.deleting:
@ -159,13 +159,13 @@ class Administration:
self.deleting = True self.deleting = True
print('AUTO-DELETING : #{}'.format(ctx.channel.id)) print('AUTO-DELETING : #{}'.format(ctx.channel.id))
await ctx.send('**Auto-deleting all messages in {}**'.format(ctx.channel.mention), delete_after=5) await ctx.send('**Auto-deleting all messages in {}**'.format(ctx.channel.mention), delete_after=5)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
else: else:
raise exc.Exists raise exc.Exists
except exc.Exists: except exc.Exists:
await ctx.send('**Already auto-deleting in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10) await ctx.send('**Already auto-deleting in {}.** Type `stop` to stop.'.format(ctx.channel.mention), delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@commands.command(name='deletecommands', aliases=['delcmds']) @commands.command(name='deletecommands', aliases=['delcmds'])
@commands.has_permissions(administrator=True) @commands.has_permissions(administrator=True)
@ -177,7 +177,7 @@ class Administration:
u.dump(u.settings, 'settings.pkl') u.dump(u.settings, 'settings.pkl')
await ctx.send('**Delete command invocations:** `{}`'.format(ctx.guild.id in u.settings['del_ctx'])) await ctx.send('**Delete command invocations:** `{}`'.format(ctx.guild.id in u.settings['del_ctx']))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.command(name='setprefix', aliases=['setpre', 'spre']) @commands.command(name='setprefix', aliases=['setpre', 'spre'])
@commands.has_permissions(administrator=True) @commands.has_permissions(administrator=True)

22
src/main/cogs/owner.py
View file

@ -26,9 +26,9 @@ class Bot:
@commands.is_owner() @commands.is_owner()
@checks.del_ctx() @checks.del_ctx()
async def die(self, ctx): async def die(self, ctx):
await ctx.message.add_reaction('🌙') await ctx.message.add_reaction('\N{CRESCENT MOON}')
await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** 🌙 . . .') await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** \N{CRESCENT MOON} . . .')
u.temp['startup_chan'] = ctx.channel.id u.temp['startup_chan'] = ctx.channel.id
u.temp['startup_msg'] = ctx.message.id u.temp['startup_msg'] = ctx.message.id
@ -46,10 +46,10 @@ class Bot:
@commands.is_owner() @commands.is_owner()
@checks.del_ctx() @checks.del_ctx()
async def restart(self, ctx): async def restart(self, ctx):
await ctx.message.add_reaction('💤') await ctx.message.add_reaction('\N{SLEEPING SYMBOL}')
print('\n^ ^ ^ ^ ^ ^ ^ ^ ^ ^\nR E S T A R T I N G\n^ ^ ^ ^ ^ ^ ^ ^ ^ ^\n') print('\n^ ^ ^ ^ ^ ^ ^ ^ ^ ^\nR E S T A R T I N G\n^ ^ ^ ^ ^ ^ ^ ^ ^ ^\n')
await self.bot.get_channel(u.config['info_channel']).send('**Restarting** 💤 . . .') await self.bot.get_channel(u.config['info_channel']).send('**Restarting** \N{SLEEPING SYMBOL} . . .')
# u.notify('R E S T A R T I N G') # u.notify('R E S T A R T I N G')
u.temp['startup_chan'] = ctx.channel.id u.temp['startup_chan'] = ctx.channel.id
@ -68,7 +68,7 @@ class Bot:
@commands.is_owner() @commands.is_owner()
@checks.del_ctx() @checks.del_ctx()
async def invite(self, ctx): async def invite(self, ctx):
await ctx.message.add_reaction('✉') await ctx.message.add_reaction('\N{ENVELOPE}')
await ctx.send('https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}'.format(u.config['client_id'], u.config['permissions']), delete_after=10) await ctx.send('https://discordapp.com/oauth2/authorize?&client_id={}&scope=bot&permissions={}'.format(u.config['client_id'], u.config['permissions']), delete_after=10)
@ -85,7 +85,7 @@ class Bot:
u.config['playing'] = 'None' u.config['playing'] = 'None'
u.dump(u.config, 'config.json', json=True) u.dump(u.config, 'config.json', json=True)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
class Tools: class Tools:
@ -132,7 +132,7 @@ class Tools:
return False return False
def exit(reaction, user): def exit(reaction, user):
if reaction.emoji == '↩️' and user is ctx.author and reaction.message.id == ctx.message.id: if reaction.emoji == '\N{LEFTWARDS ARROW WITH HOOK}' and user is ctx.author and reaction.message.id == ctx.message.id:
results.cancel() results.cancel()
raise exc.Abort raise exc.Abort
return False return False
@ -141,7 +141,7 @@ class Tools:
console = await self.generate(ctx) console = await self.generate(ctx)
exception = await self.generate_err(ctx) exception = await self.generate_err(ctx)
await ctx.message.add_reaction('↩️') await ctx.message.add_reaction('\N{LEFTWARDS ARROW WITH HOOK}')
while not self.bot.is_closed(): while not self.bot.is_closed():
try: try:
@ -187,9 +187,9 @@ class Tools:
sys.stderr = sys.__stderr__ sys.stderr = sys.__stderr__
print('Reset sys output.') print('Reset sys output.')
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.command(name='arbitrary', aliases=[',arbit', ',ar']) @commands.command(name='arbitrary', aliases=[',arbit', ',ar'], hidden=True)
@commands.is_owner() @commands.is_owner()
@checks.del_ctx() @checks.del_ctx()
async def arbitrary(self, ctx, *, exe): async def arbitrary(self, ctx, *, exe):
@ -202,7 +202,7 @@ class Tools:
finally: finally:
sys.stdout = sys.__stdout__ sys.stdout = sys.__stdout__
print('Reset stdout.') print('Reset stdout.')
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.group(aliases=[',db'], hidden=True) @commands.group(aliases=[',db'], hidden=True)
@commands.is_owner() @commands.is_owner()

14
src/main/cogs/tools.py
View file

@ -48,16 +48,16 @@ class Utils:
async def ping(self, ctx): async def ping(self, ctx):
global command_dict global command_dict
await ctx.message.add_reaction('🏓') await ctx.message.add_reaction('\N{TABLE TENNIS PADDLE AND BALL}')
await ctx.send(ctx.author.mention + ' 🏓 `' + str(round(self.bot.latency * 1000)) + 'ms`', delete_after=5) await ctx.send(ctx.author.mention + ' \N{TABLE TENNIS PADDLE AND BALL} `' + str(round(self.bot.latency * 1000)) + 'ms`', delete_after=5)
command_dict.setdefault(str(ctx.author.id), {}).update({'command': ctx.command}) command_dict.setdefault(str(ctx.author.id), {}).update({'command': ctx.command})
@commands.command(aliases=['pre'], brief='List bot prefixes', description='Shows all used prefixes') @commands.command(aliases=['pre'], brief='List bot prefixes', description='Shows all used prefixes')
@checks.del_ctx() @checks.del_ctx()
async def prefix(self, ctx): async def prefix(self, ctx):
await ctx.send('**Prefix:** `{}`'.format('` or `'.join(u.settings['prefixes'][ctx.guild.id] if ctx.guild.id in u.settings['prefixes'] else u.config['prefix']))) await ctx.send('**Prefix:** `{}`'.format('` or `'.join(u.settings['prefixes'][ctx.guild.id] if ctx.guild.id in u.settings['prefixes'] else u.config['prefix'])))
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.group(name=',send', aliases=[',s'], hidden=True) @commands.group(name=',send', aliases=[',s'], hidden=True)
@commands.is_owner() @commands.is_owner()
@ -73,20 +73,20 @@ class Utils:
try: try:
await tempchannel.send(message) await tempchannel.send(message)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
except AttributeError: except AttributeError:
await ctx.send('**Invalid channel**', delete_after=10) await ctx.send('**Invalid channel**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
except AttributeError: except AttributeError:
await ctx.send('**Invalid guild**', delete_after=10) await ctx.send('**Invalid guild**', delete_after=10)
await ctx.message.add_reaction('❌') await ctx.message.add_reaction('\N{CROSS MARK}')
@send.command(name='user', aliases=['u', 'member', 'm']) @send.command(name='user', aliases=['u', 'member', 'm'])
async def send_user(self, ctx, user, *, message): async def send_user(self, ctx, user, *, message):
await d.utils.get(self.bot.get_all_members(), id=int(user)).send(message) await d.utils.get(self.bot.get_all_members(), id=int(user)).send(message)
await ctx.message.add_reaction('✅') await ctx.message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
@commands.command(aliases=['authenticateupload', 'authupload', 'authup', 'auth']) @commands.command(aliases=['authenticateupload', 'authupload', 'authup', 'auth'])
async def authenticate_upload(self, ctx): async def authenticate_upload(self, ctx):

2
src/main/misc/exceptions.py
View file

@ -1,4 +1,4 @@
base = '⚠️ **An internal error has occurred.** This has been reported to my master. 🐺' base = '\N{WARNING SIGN} **An internal error has occurred.** This has been reported to my master. \N{WOLF FACE}'
async def send_error(ctx, error): async def send_error(ctx, error):

22
src/main/run.py
View file

@ -48,12 +48,12 @@ async def on_ready():
await bot.change_presence(game=None) await bot.change_presence(game=None)
print('\n> > > > > > > > >\nC O N N E C T E D : {}\n> > > > > > > > >\n'.format(bot.user.name)) print('\n> > > > > > > > >\nC O N N E C T E D : {}\n> > > > > > > > >\n'.format(bot.user.name))
await bot.get_channel(u.config['info_channel']).send('**Started** ☀️ .') await bot.get_channel(u.config['info_channel']).send('**Started** \N{BLACK SUN WITH RAYS} .')
# u.notify('C O N N E C T E D') # u.notify('C O N N E C T E D')
if u.temp: if u.temp:
channel = bot.get_channel(u.temp['startup_chan']) channel = bot.get_channel(u.temp['startup_chan'])
message = await channel.get_message(u.temp['startup_msg']) message = await channel.get_message(u.temp['startup_msg'])
await message.add_reaction('✅') await message.add_reaction('\N{WHITE HEAVY CHECK MARK}')
u.temp.clear() u.temp.clear()
@ -67,12 +67,12 @@ async def on_message(message):
async def on_error(error, *args, **kwargs): async def on_error(error, *args, **kwargs):
print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(error), file=sys.stderr) print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(error), file=sys.stderr)
tb.print_exc() tb.print_exc()
await bot.get_user(u.config['owner_id']).send('**ERROR** ⚠\n```\n{}```'.format(error)) await bot.get_user(u.config['owner_id']).send('**ERROR** \N{WARNING SIGN}\n```\n{}```'.format(error))
await bot.get_channel(u.config['info_channel']).send('**ERROR** ⚠\n```\n{}```'.format(error)) await bot.get_channel(u.config['info_channel']).send('**ERROR** \N{WARNING SIGN}\n```\n{}```'.format(error))
if u.temp: if u.temp:
channel = bot.get_channel(u.temp['startup_chan']) channel = bot.get_channel(u.temp['startup_chan'])
message = await channel.get_message(u.temp['startup_msg']) message = await channel.get_message(u.temp['startup_msg'])
await message.add_reaction('⚠') await message.add_reaction('\N{WARNING SIGN}')
u.temp.clear() u.temp.clear()
# u.notify('E R R O R') # u.notify('E R R O R')
await bot.logout() await bot.logout()
@ -82,19 +82,19 @@ async def on_error(error, *args, **kwargs):
@bot.event @bot.event
async def on_command_error(ctx, error): async def on_command_error(ctx, error):
if isinstance(error, errext.CheckFailure): if isinstance(error, errext.CheckFailure):
await ctx.send('⛔️ **Insufficient permissions**', delete_after=10) await ctx.send('\N{NO ENTRY} **Insufficient permissions**', delete_after=10)
await ctx.message.add_reaction('⛔️') await ctx.message.add_reaction('\N{NO ENTRY}')
elif isinstance(error, errext.CommandNotFound): elif isinstance(error, errext.CommandNotFound):
print('INVALID COMMAND : {}'.format(error), file=sys.stderr) print('INVALID COMMAND : {}'.format(error), file=sys.stderr)
await ctx.message.add_reaction('❓') await ctx.message.add_reaction('\N{BLACK QUESTION MARK ORNAMENT}')
else: else:
print('\n! ! ! ! ! ! ! ! ! ! ! !\nC O M M A N D E R R O R : {}\n! ! ! ! ! ! ! ! ! ! ! !\n'.format( print('\n! ! ! ! ! ! ! ! ! ! ! !\nC O M M A N D E R R O R : {}\n! ! ! ! ! ! ! ! ! ! ! !\n'.format(
error), file=sys.stderr) error), file=sys.stderr)
tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr) tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
await bot.get_user(u.config['owner_id']).send('**COMMAND ERROR** ⚠\n```\n{}```'.format(error)) await bot.get_user(u.config['owner_id']).send('**COMMAND ERROR** \N{WARNING SIGN} `{}` *from* @{}\n```\n{}```'.format(ctx.message.content, ctx.author.name, error))
await bot.get_channel(u.config['info_channel']).send('**COMMAND ERROR** ⚠\n```\n{}```'.format(error)) await bot.get_channel(u.config['info_channel']).send('**COMMAND ERROR** \N{WARNING SIGN} `{}` *from* @{}\n```\n{}```'.format(ctx.message.content, ctx.author.name, error))
await exc.send_error(ctx, error) await exc.send_error(ctx, error)
await ctx.message.add_reaction('⚠') 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')
# d.opus.load_opus('opus') # d.opus.load_opus('opus')