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

Merge branch 'dev'

Browse source
This commit is contained in:
Myned 2019-02-19 23:14:46 -05:00
commit d4c42f0282
4 changed files with 51 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

303
src/cogs/booru.py
View file

@ -137,7 +137,7 @@ class MsG:
print('STOPPED : hearting') print('STOPPED : hearting')
async def queue_for_hearts(self, *, message=None, send=None, channel=None, reaction=True, timeout=60 * 60): async def queue_for_hearts(self, *, message=None, send=None, channel=None, reaction=True, timeout=60 * 60 * 24):
def on_reaction(reaction, user): def on_reaction(reaction, user):
if reaction.emoji == '\N{HEAVY BLACK HEART}' and reaction.message.id == message.id and not user.bot: if reaction.emoji == '\N{HEAVY BLACK HEART}' and reaction.message.id == message.id and not user.bot:
raise exc.Save(user) raise exc.Save(user)
@ -868,10 +868,7 @@ class MsG:
await ctx.author.send(content=f'`{n} / {len(hearted)}`', embed=embed) await ctx.author.send(content=f'`{n} / {len(hearted)}`', embed=embed)
n += 1 n += 1
@cmds.command(name='e621page', aliases=['e621p', 'e6p', '6p']) async def _get_paginator(self, ctx, args, booru='e621'):
@checks.is_nsfw()
@cmds.cooldown(1, 5, cmds.BucketType.member)
async def e621_paginator(self, ctx, *args):
def on_reaction(reaction, user): def on_reaction(reaction, user):
if reaction.emoji == '\N{OCTAGONAL SIGN}' and reaction.message.id == ctx.message.id and (user is ctx.author or user.permissions_in(reaction.message.channel).manage_messages): if reaction.emoji == '\N{OCTAGONAL SIGN}' and reaction.message.id == ctx.message.id and (user is ctx.author or user.permissions_in(reaction.message.channel).manage_messages):
raise exc.Abort raise exc.Abort
@ -879,8 +876,6 @@ class MsG:
raise exc.Save raise exc.Save
elif reaction.emoji == '\N{LEFTWARDS BLACK ARROW}' 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 == '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.GoTo
elif reaction.emoji == '\N{BLACK RIGHTWARDS ARROW}' and reaction.message.id == paginator.id and user is ctx.author: 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
@ -899,21 +894,21 @@ class MsG:
await ctx.trigger_typing() await ctx.trigger_typing()
posts, order = await self._get_posts(ctx, booru='e621', tags=tags, limit=limit) posts, order = await self._get_posts(ctx, booru=booru, tags=tags, limit=limit)
keys = list(posts.keys()) keys = list(posts.keys())
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 u.color) title=values[c - 1]['artist'], url='https://{}.net/post/show/{}'.format(booru, keys[c - 1]), color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else u.color)
embed.set_image(url=values[c - 1]['file_url']) embed.set_image(url=values[c - 1]['file_url'])
embed.set_author(name=' '.join(tags) if tags else order, embed.set_author(name=' '.join(tags) if tags else order,
url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url) url='https://{}.net/post?tags={}'.format(booru, ','.join(tags)), icon_url=ctx.author.avatar_url)
embed.set_footer(text=values[c - 1]['score'], embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
paginator = await ctx.send(embed=embed) paginator = await ctx.send(embed=embed)
for emoji in ('\N{HEAVY BLACK HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'): for emoji in ('\N{HEAVY BLACK HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{BLACK RIGHTWARDS ARROW}'):
await paginator.add_reaction(emoji) await paginator.add_reaction(emoji)
await u.add_reaction(ctx.message, '\N{OCTAGONAL SIGN}') await u.add_reaction(ctx.message, '\N{OCTAGONAL SIGN}')
await asyncio.sleep(1) await asyncio.sleep(1)
@ -937,7 +932,8 @@ class MsG:
if c > 1: if c > 1:
c -= 1 c -= 1
embed.title = values[c - 1]['artist'] embed.title = values[c - 1]['artist']
embed.url = 'https://e621.net/post/show/{}'.format( embed.url = 'https://{}.net/post/show/{}'.format(
booru,
keys[c - 1]) keys[c - 1])
embed.set_footer(text=values[c - 1]['score'], embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
@ -947,31 +943,11 @@ class MsG:
else: else:
await paginator.edit(content='\N{BLACK RIGHTWARDS ARROW}') await paginator.edit(content='\N{BLACK RIGHTWARDS ARROW}')
except exc.GoTo:
await paginator.edit(content=f'`{c} / {len(posts)}`')
number = await self.bot.wait_for('message', check=on_message, timeout=8*60)
if int(number.content) != 0:
c = int(number.content)
embed.title = values[c - 1]['artist']
embed.url = 'https://e621.net/post/show/{}'.format(
keys[c - 1])
embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score']))
embed.set_image(url=values[c - 1]['file_url'])
if ctx.channel is d.TextChannel:
with suppress(errext.CheckFailure):
await number.delete()
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:
if c % limit == 0: if c % limit == 0:
await ctx.trigger_typing() await ctx.trigger_typing()
temposts, order = await self._get_posts(ctx, booru='e621', tags=tags, limit=limit, previous=posts) temposts, order = await self._get_posts(ctx, booru=booru, tags=tags, limit=limit, previous=posts)
posts.update(temposts) posts.update(temposts)
keys = list(posts.keys()) keys = list(posts.keys())
@ -980,7 +956,8 @@ class MsG:
if c < len(keys): if c < len(keys):
c += 1 c += 1
embed.title = values[c - 1]['artist'] embed.title = values[c - 1]['artist']
embed.url = 'https://e621.net/post/show/{}'.format( embed.url = 'https://{}.net/post/show/{}'.format(
booru,
keys[c - 1]) keys[c - 1])
embed.set_footer(text=values[c - 1]['score'], embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score'])) icon_url=self._get_score(values[c - 1]['score']))
@ -1028,153 +1005,54 @@ class MsG:
await ctx.author.send(content=f'`{n} / {len(hearted)}`', embed=embed) await ctx.author.send(content=f'`{n} / {len(hearted)}`', embed=embed)
n += 1 n += 1
# @e621_paginator.error @cmds.command(name='e621page', aliases=['e621p', 'e6p', '6p'])
# async def e621_paginator_error(self, ctx, error): @checks.is_nsfw()
# if isinstance(error, exc.NSFW): @cmds.cooldown(1, 5, cmds.BucketType.member)
# await ctx.send('\N{NO ENTRY} {} **is not an NSFW channel**'.format(ctx.channel.mention)) async def e621_paginator(self, ctx, *args):
# await u.add_reaction(ctx.message, '\N{NO ENTRY}') await self._get_paginator(ctx, args, booru='e621')
@cmds.command(name='e926page', aliases=['e926p', 'e9p', '9p']) @cmds.command(name='e926page', aliases=['e926p', 'e9p', '9p'])
@cmds.cooldown(1, 5, cmds.BucketType.member) @cmds.cooldown(1, 5, cmds.BucketType.member)
async def e926_paginator(self, ctx, *args): async def e926_paginator(self, ctx, *args):
def on_reaction(reaction, user): await self._get_paginator(ctx, args, booru='e926')
if reaction.emoji == '\N{OCTAGONAL SIGN}' and reaction.message.id == ctx.message.id and (user is ctx.author or user.permissions_in(reaction.message.channel).manage_messages):
raise exc.Abort
elif reaction.emoji == '\N{HEAVY BLACK HEART}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Save
elif reaction.emoji == '\N{LEFTWARDS BLACK ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Left
elif reaction.emoji == '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.GoTo
elif reaction.emoji == '\N{BLACK RIGHTWARDS ARROW}' and reaction.message.id == paginator.id and user is ctx.author:
raise exc.Right
return False
def on_message(msg):
return msg.content.isdigit() and 0 <= int(msg.content) <= len(posts) and msg.author is ctx.author and msg.channel is ctx.channel
async def _get_images(self, ctx, args, booru='e621'):
try: try:
kwargs = u.get_kwargs(ctx, args) kwargs = u.get_kwargs(ctx, args, limit=3)
tags = kwargs['remaining'] args, limit = kwargs['remaining'], kwargs['limit']
limit = self.LIMIT / 5
hearted = {}
c = 1
tags = self._get_favorites(ctx, tags) tags = self._get_favorites(ctx, args)
await ctx.trigger_typing() await ctx.trigger_typing()
posts, order = await self._get_posts(ctx, booru='e926', tags=tags, limit=limit) posts, order = await self._get_posts(ctx, booru=booru, tags=tags, limit=limit)
keys = list(posts.keys())
values = list(posts.values())
embed = d.Embed( for ident, post in posts.items():
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 = d.Embed(title=post['artist'], url='https://{}.net/post/show/{}'.format(booru, ident),
embed.set_image(url=values[c - 1]['file_url']) color=ctx.me.color if isinstance(ctx.channel, d.TextChannel) else u.color)
embed.set_author(name=' '.join(tags) if tags else order, embed.set_image(url=post['file_url'])
url='https://e926.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url) embed.set_author(name=' '.join(tags) if tags else order,
embed.set_footer(text=values[c - 1]['score'], url='https://{}.net/post?tags={}'.format(booru, ','.join(tags)), icon_url=ctx.author.avatar_url)
icon_url=self._get_score(values[c - 1]['score'])) embed.set_footer(
text=post['score'], icon_url=self._get_score(post['score']))
paginator = await ctx.send(embed=embed) message = await ctx.send(embed=embed)
for emoji in ('\N{HEAVY BLACK HEART}', '\N{LEFTWARDS BLACK ARROW}', '\N{NUMBER SIGN}\N{COMBINING ENCLOSING KEYCAP}', '\N{BLACK RIGHTWARDS ARROW}'): self.bot.loop.create_task(self.queue_for_hearts(message=message, send=embed))
await paginator.add_reaction(emoji)
await u.add_reaction(ctx.message, '\N{OCTAGONAL SIGN}')
await asyncio.sleep(1)
while not self.bot.is_closed():
try:
await asyncio.gather(*[self.bot.wait_for('reaction_add', check=on_reaction, timeout=8*60),
self.bot.wait_for('reaction_remove', check=on_reaction, timeout=8*60)])
except exc.Save:
if keys[c - 1] not in hearted:
hearted[keys[c - 1]] = copy.deepcopy(embed)
await paginator.edit(content='\N{HEAVY BLACK HEART}')
else:
del hearted[keys[c - 1]]
await paginator.edit(content='\N{BROKEN HEART}')
except exc.Left:
if c > 1:
c -= 1
embed.title = values[c - 1]['artist']
embed.url = 'https://e926.net/post/show/{}'.format(
keys[c - 1])
embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score']))
embed.set_image(url=values[c - 1]['file_url'])
await paginator.edit(content='\N{HEAVY BLACK HEART}' if keys[c - 1] in hearted.keys() else None, embed=embed)
else:
await paginator.edit(content='\N{BLACK RIGHTWARDS ARROW}')
except exc.GoTo:
await paginator.edit(content=f'`{c} / {len(posts)}`')
number = await self.bot.wait_for('message', check=on_message, timeout=8*60)
if int(number.content) != 0:
c = int(number.content)
embed.title = values[c - 1]['artist']
embed.url = 'https://e926.net/post/show/{}'.format(
keys[c - 1])
embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score']))
embed.set_image(url=values[c - 1]['file_url'])
await number.delete()
await paginator.edit(content='\N{HEAVY BLACK HEART}' if keys[c - 1] in hearted.keys() else None, embed=embed)
except exc.Right:
try:
if c % limit == 0:
await ctx.trigger_typing()
temposts, order = await self._get_posts(ctx, booru='e926', tags=tags, limit=limit, previous=posts)
posts.update(temposts)
keys = list(posts.keys())
values = list(posts.values())
if c < len(keys):
c += 1
embed.title = values[c - 1]['artist']
embed.url = 'https://e926.net/post/show/{}'.format(
keys[c - 1])
embed.set_footer(text=values[c - 1]['score'],
icon_url=self._get_score(values[c - 1]['score']))
embed.set_image(url=values[c - 1]['file_url'])
await paginator.edit(content='\N{HEAVY BLACK HEART}' if keys[c - 1] in hearted.keys() else None, embed=embed)
else:
await paginator.edit(content='\N{LEFTWARDS BLACK ARROW}')
except exc.NotFound:
await paginator.edit(content='\N{LEFTWARDS BLACK ARROW}')
except exc.Abort:
try:
await paginator.edit(content='\N{WHITE HEAVY CHECK MARK}')
except UnboundLocalError:
await ctx.send('\N{WHITE HEAVY CHECK MARK}')
except asyncio.TimeoutError:
try:
await paginator.edit(content='\N{HOURGLASS}')
except UnboundLocalError:
await ctx.send('\N{HOURGLASS}')
except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.TagBlacklisted as e: except exc.TagBlacklisted as e:
await ctx.send('\N{NO ENTRY SIGN} `{}` **blacklisted**'.format(e)) await ctx.send('`{}` **blacklisted**'.format(e))
await u.add_reaction(ctx.message, '\N{NO ENTRY SIGN}') await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.BoundsError as e:
await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e))
await u.add_reaction(ctx.message, '\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)) await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}') await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.FavoritesNotFound: except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**') await ctx.send('**You have no favorite tags**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}') await u.add_reaction(ctx.message, '\N{CROSS MARK}')
@ -1182,113 +1060,18 @@ class MsG:
await ctx.send('**Request timed out**') await ctx.send('**Request timed out**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}') await u.add_reaction(ctx.message, '\N{CROSS MARK}')
finally:
if hearted:
await u.add_reaction(ctx.message, '\N{HOURGLASS WITH FLOWING SAND}')
n = 1
for embed in hearted.values():
await ctx.author.send(content=f'`{n} / {len(hearted)}`', 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.command(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.command(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])')
@checks.is_nsfw() @checks.is_nsfw()
@cmds.cooldown(1, 5, cmds.BucketType.member) @cmds.cooldown(1, 5, cmds.BucketType.member)
async def e621(self, ctx, *args): async def e621(self, ctx, *args):
try: await self._get_images(ctx, args, booru='e621')
kwargs = u.get_kwargs(ctx, args, limit=3)
args, limit = kwargs['remaining'], kwargs['limit']
tags = self._get_favorites(ctx, args)
await ctx.trigger_typing()
posts, order = await self._get_posts(ctx, booru='e621', tags=tags, limit=limit)
for ident, post in posts.items():
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 u.color)
embed.set_image(url=post['file_url'])
embed.set_author(name=' '.join(tags) if tags else order,
url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url)
embed.set_footer(
text=post['score'], icon_url=self._get_score(post['score']))
message = await ctx.send(embed=embed)
self.bot.loop.create_task(self.queue_for_hearts(message=message, send=embed))
except exc.TagBlacklisted as e:
await ctx.send('`{}` **blacklisted**'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.BoundsError as e:
await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.TagBoundsError as e:
await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.Timeout:
await ctx.send('**Request timed out**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
# @e621.error
# async def e621_error(self, ctx, error):
# if isinstance(error, exc.NSFW):
# await ctx.send('\N{NO ENTRY} {} **is not an NSFW channel**'.format(ctx.channel.mention))
# await u.add_reaction(ctx.message, '\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
@cmds.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])') @cmds.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])')
@cmds.cooldown(1, 5, cmds.BucketType.member) @cmds.cooldown(1, 5, cmds.BucketType.member)
async def e926(self, ctx, *args): async def e926(self, ctx, *args):
try: await self._get_images(ctx, args, booru='e926')
kwargs = u.get_kwargs(ctx, args, limit=3)
args, limit = kwargs['remaining'], kwargs['limit']
tags = self._get_favorites(ctx, args)
await ctx.trigger_typing()
posts, order = await self._get_posts(ctx, booru='e926', tags=tags, limit=limit)
for ident, post in posts.items():
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 u.color)
embed.set_image(url=post['file_url'])
embed.set_author(name=' '.join(tags) if tags else order,
url='https://e621.net/post?tags={}'.format(','.join(tags)), icon_url=ctx.author.avatar_url)
embed.set_footer(
text=post['score'], icon_url=self._get_score(post['score']))
message = await ctx.send(embed=embed)
self.bot.loop.create_task(self.queue_for_hearts(message=message, send=embed))
except exc.TagBlacklisted as e:
await ctx.send('`{}` **blacklisted**'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.BoundsError as e:
await ctx.send('`{}` **out of bounds.** Images limited to 3.'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.TagBoundsError as e:
await ctx.send('`{}` **out of bounds.** Tags limited to 5.'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.NotFound as e:
await ctx.send('`{}` **not found**'.format(e))
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.FavoritesNotFound:
await ctx.send('**You have no favorite tags**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
except exc.Timeout:
await ctx.send('**Request timed out**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}')
# @cmds.group(aliases=['fave', 'fav', 'f']) # @cmds.group(aliases=['fave', 'fav', 'f'])
# async def favorite(self, ctx): # async def favorite(self, ctx):

5
src/cogs/owner.py
View file

@ -27,8 +27,6 @@ class Bot:
async def die(self, ctx): async def die(self, ctx):
await u.add_reaction(ctx.message, '\N{CRESCENT MOON}') await u.add_reaction(ctx.message, '\N{CRESCENT MOON}')
await self.bot.get_channel(u.config['info_channel']).send('**Shutting down** \N{CRESCENT MOON} . . .')
chantype = 'guild' if isinstance(ctx.channel, d.TextChannel) else 'private' chantype = 'guild' if isinstance(ctx.channel, d.TextChannel) else 'private'
u.temp['startup'] = (chantype, ctx.channel.id if chantype == 'guild' else ctx.author.id, ctx.message.id) u.temp['startup'] = (chantype, ctx.channel.id if chantype == 'guild' else ctx.author.id, ctx.message.id)
u.dump(u.temp, 'temp/temp.pkl') u.dump(u.temp, 'temp/temp.pkl')
@ -37,7 +35,6 @@ class Bot:
# for task in loop: # for task in loop:
# task.cancel() # task.cancel()
print('\n< < < < < < < < < < < <\nD I S C O N N E C T E D\n< < < < < < < < < < < <\n') print('\n< < < < < < < < < < < <\nD I S C O N N E C T E D\n< < < < < < < < < < < <\n')
# u.notify('D I S C O N N E C T E D')
await self.bot.logout() await self.bot.logout()
@cmds.command(name=',restart', aliases=[',res', ',r'], hidden=True) @cmds.command(name=',restart', aliases=[',res', ',r'], hidden=True)
@ -46,8 +43,6 @@ class Bot:
await u.add_reaction(ctx.message, '\N{SLEEPING SYMBOL}') await u.add_reaction(ctx.message, '\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** \N{SLEEPING SYMBOL} . . .')
# u.notify('R E S T A R T I N G')
chantype = 'guild' if isinstance(ctx.channel, d.TextChannel) else 'private' chantype = 'guild' if isinstance(ctx.channel, d.TextChannel) else 'private'
u.temp['startup'] = (chantype, ctx.channel.id if chantype == 'guild' else ctx.author.id, ctx.message.id) u.temp['startup'] = (chantype, ctx.channel.id if chantype == 'guild' else ctx.author.id, ctx.message.id)

27
src/run.py
View file

@ -87,8 +87,6 @@ async def on_ready():
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))
try: try:
await bot.get_channel(u.config['info_channel']).send(f'**Started** \N{BLACK SUN WITH RAYS} `{"` or `".join(u.config["prefix"])}`')
if u.temp['startup']: if u.temp['startup']:
with suppress(err.NotFound): with suppress(err.NotFound):
if u.temp['startup'][0] == 'guild': if u.temp['startup'][0] == 'guild':
@ -142,21 +140,11 @@ async def on_error(error, *args, **kwargs):
print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(sys.exc_info()[1].text), file=sys.stderr) print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(sys.exc_info()[1].text), file=sys.stderr)
tb.print_exc() tb.print_exc()
await bot.get_user(u.config['owner_id']).send('**ERROR** \N{WARNING SIGN}\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{WARNING SIGN}\n```\n{}```'.format(error))
if u.temp['startup']: if u.temp['startup']:
with suppress(err.NotFound):
if u.temp['startup'][0] == 'guild':
ctx = bot.get_channel(u.temp['startup'][1])
else:
ctx = bot.get_user(u.temp['startup'][1])
message = await ctx.get_message(u.temp['startup'][2])
await message.add_reaction('\N{WARNING SIGN}')
u.temp.clear() u.temp.clear()
u.dump(u.temp, 'temp/temp.pkl') u.dump(u.temp, 'temp/temp.pkl')
# u.notify('E R R O R')
await bot.logout() await bot.logout()
@ -165,12 +153,14 @@ async def on_command_error(ctx, error):
with suppress(err.NotFound): with suppress(err.NotFound):
if isinstance(error, err.NotFound): if isinstance(error, err.NotFound):
print('NOT FOUND') print('NOT FOUND')
elif isinstance(error, errext.CommandInvokeError):
print(f'ERROR : {error}')
elif isinstance(error, err.Forbidden): elif isinstance(error, err.Forbidden):
pass pass
elif isinstance(error, errext.CommandOnCooldown): elif isinstance(error, errext.CommandOnCooldown):
await u.add_reaction(ctx.message, '\N{HOURGLASS}') await u.add_reaction(ctx.message, '\N{HOURGLASS}')
await asyncio.sleep(error.retry_after) await asyncio.sleep(error.retry_after)
await u.add_reaction(ctx.message, '\N{WHITE HEAVY CHECK MARK}') await u.add_reaction(ctx.message, '\N{WHITE HEAVY CHECK MARK}')
elif isinstance(error, errext.MissingRequiredArgument): elif isinstance(error, errext.MissingRequiredArgument):
await ctx.send('**Missing required argument**') await ctx.send('**Missing required argument**')
await u.add_reaction(ctx.message, '\N{CROSS MARK}') await u.add_reaction(ctx.message, '\N{CROSS MARK}')
@ -184,14 +174,11 @@ async def on_command_error(ctx, error):
print('INVALID COMMAND : {}'.format(error), file=sys.stderr) print('INVALID COMMAND : {}'.format(error), file=sys.stderr)
await u.add_reaction(ctx.message, '\N{BLACK QUESTION MARK ORNAMENT}') await u.add_reaction(ctx.message, '\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{WARNING SIGN} `{}` from {} in {}\n```\n{}```'.format(ctx.message.content, ctx.author.mention, ctx.channel.mention if isinstance(ctx.channel, d.channel.TextChannel) else 'DMs', error)) await bot.get_user(u.config['owner_id']).send('**COMMAND ERROR** \N{WARNING SIGN} `{}` from {} in {}\n```\n{}```'.format(ctx.message.content, ctx.author.mention, ctx.channel.mention if isinstance(ctx.channel, d.channel.TextChannel) else 'DMs', error))
await bot.get_channel(u.config['info_channel']).send('**COMMAND ERROR** \N{WARNING SIGN} `{}` from {} in {}\n```\n{}```'.format(ctx.message.content, ctx.author.name, ctx.channel.mention if isinstance(ctx.channel, d.channel.TextChannel) else 'DMs', error))
await exc.send_error(ctx, error) await exc.send_error(ctx, error)
await u.add_reaction(ctx.message, '\N{WARNING SIGN}') await u.add_reaction(ctx.message, '\N{WARNING SIGN}')
# u.notify('C O M M A N D E R R O R')
# @bot.event # @bot.event
# async def on_command(ctx): # async def on_command(ctx):

7
src/utils/utils.py
View file

@ -20,11 +20,6 @@ from misc import exceptions as exc
print('\nPID : {}\n'.format(os.getpid())) print('\nPID : {}\n'.format(os.getpid()))
# def notify(message):
# subprocess.run(['terminal-notifier', '-message', message, '-title',
# 'Modumind', '-activate', 'com.apple.Terminal', '-appIcon', 'icon.png', '-sound', 'Ping'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
try: try:
with open('config.json') as infile: with open('config.json') as infile:
config = jsn.load(infile) config = jsn.load(infile)
@ -32,7 +27,7 @@ try:
except FileNotFoundError: except FileNotFoundError:
with open('config.json', 'w') as outfile: with open('config.json', 'w') as outfile:
jsn.dump({'client_id': 0, 'info_channel': 0, 'owner_id': 0, 'permissions': 126016, jsn.dump({'client_id': 0, 'owner_id': 0, 'permissions': 126016,
'playing': 'a game', 'prefix': [',', 'm,'], 'selfbot': False, 'token': 'str'}, outfile, indent=4, sort_keys=True) 'playing': 'a game', 'prefix': [',', 'm,'], 'selfbot': False, 'token': 'str'}, outfile, indent=4, sort_keys=True)
print('FILE NOT FOUND : config.json created with abstract values. Restart run.py with correct values') print('FILE NOT FOUND : config.json created with abstract values. Restart run.py with correct values')