From 06c7428cc2b3f174161d977e48fece5b66aa42e2 Mon Sep 17 00:00:00 2001 From: Myned Date: Sun, 15 Oct 2017 12:57:31 -0400 Subject: [PATCH 1/3] Converted except passes to suppress(), * > ctx.*, cleaned some code --- src/main/cogs/booru.py | 176 ++++++++++++++---------------------- src/main/cogs/info.py | 10 +- src/main/cogs/management.py | 78 ++++------------ 3 files changed, 86 insertions(+), 178 deletions(-) diff --git a/src/main/cogs/booru.py b/src/main/cogs/booru.py index f1a5f5d..f5820c4 100644 --- a/src/main/cogs/booru.py +++ b/src/main/cogs/booru.py @@ -1,6 +1,7 @@ import asyncio import json import traceback as tb +from contextlib import suppress import discord as d from discord import errors as err @@ -79,21 +80,13 @@ class MsG: return await ctx.send('❌ **Invalid url.**', delete_after=10) async def return_pool(self, *, ctx, booru='e621', query=[]): - channel = ctx.channel - user = ctx.author - def on_message(msg): - if msg.content.lower() == 'cancel' and msg.author is user and msg.channel is channel: + if msg.content.lower() == 'cancel' and msg.author is ctx.author and msg.channel is ctx.channel: raise exc.Abort - try: - if int(msg.content) <= len(pools) and int(msg.content) > 0 and msg.author is user and msg.channel is channel: + with suppress(ValueError): + if int(msg.content) <= len(pools) and int(msg.content) > 0 and msg.author is ctx.author and msg.channel is ctx.channel: return True - - except ValueError: - pass - - else: - return False + return False posts = {} pool = {} @@ -133,33 +126,25 @@ class MsG: @commands.command(name='pool', aliases=['e6pp'], brief='e621 pool paginator', description='e621 | NSFW\nShow pools in a page format', hidden=True) @checks.del_ctx() async def pool_paginator(self, ctx, *kwords): - channel = ctx.channel - user = ctx.author - def on_react(reaction, user): - if reaction.emoji == '🚫' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + if reaction.emoji == '🚫' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Abort - elif reaction.emoji == '📁' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '📁' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Save - elif reaction.emoji == '⬅' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '⬅' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Left - elif reaction.emoji == '🔢' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '🔢' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.GoTo - elif reaction.emoji == '➡' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '➡' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Right else: return False def on_message(msg): - try: - if int(msg.content) <= len(posts) and msg.author is user and msg.channel is channel: + with suppress(ValueError): + if int(msg.content) <= len(posts) and msg.author is ctx.author and msg.channel is ctx.channel: return True - - except ValueError: - pass - - else: - return False + return False starred = [] c = 1 @@ -173,7 +158,7 @@ class MsG: embed = d.Embed( title=values[c - 1]['author'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color).set_image(url=values[c - 1]['url']) embed.set_author(name=pool['name'], - url='https://e621.net/pool/show?id={}'.format(pool['id']), icon_url=user.avatar_url) + url='https://e621.net/pool/show?id={}'.format(pool['id']), icon_url=ctx.author.avatar_url) embed.set_footer(text='{} / {}'.format(c, len(posts)), icon_url='icon_e6.png') @@ -256,7 +241,7 @@ class MsG: finally: for url in starred: - await user.send(url) + await ctx.author.send(url) if len(starred) > 5: await asyncio.sleep(2.1) @@ -264,16 +249,14 @@ class MsG: async def check_return_posts(self, *, ctx, booru='e621', tags=[], limit=1, previous={}): guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - channel = ctx.channel - user = ctx.author blacklist = set() # Creates temp blacklist based on context for tag in self.blacklists['global_blacklist']: blacklist.update(list(self.aliases[tag]) + [tag]) - for tag in self.blacklists['guild_blacklist'].get(guild.id, {}).get(channel.id, set()): + for tag in self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set()): blacklist.update(list(self.aliases[tag]) + [tag]) - for tag in self.blacklists['user_blacklist'].get(user.id, set()): + for tag in self.blacklists['user_blacklist'].get(ctx.author.id, set()): blacklist.update(list(self.aliases[tag]) + [tag]) # Checks if tags are in local blacklists if tags: @@ -316,33 +299,25 @@ class MsG: @checks.del_ctx() @checks.is_nsfw() async def e621_paginator(self, ctx, *args): - channel = ctx.channel - user = ctx.author - def on_react(reaction, user): - if reaction.emoji == '🚫' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + if reaction.emoji == '🚫' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Abort - elif reaction.emoji == '📁' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '📁' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Save - elif reaction.emoji == '⬅' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '⬅' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Left - elif reaction.emoji == '🔢' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '🔢' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.GoTo - elif reaction.emoji == '➡' and reaction.message.content == paginator.content and (user is user or user.id == u.config['owner_id']): + elif reaction.emoji == '➡' and reaction.message.content == paginator.content and (user is ctx.author or user.id == u.config['owner_id']): raise exc.Right else: return False def on_message(msg): - try: - if int(msg.content) <= len(posts) and msg.author is user and msg.channel is channel: + with suppress(ValueError): + if int(msg.content) <= len(posts) and msg.author is ctx.author and msg.channel is ctx.channel: return True - - except ValueError: - pass - - else: - return False + return False args = list(args) limit = self.LIMIT / 5 @@ -358,7 +333,7 @@ class MsG: embed = d.Embed( title=values[c - 1]['author'], url='https://e621.net/post/show/{}'.format(keys[c - 1]), color=ctx.me.color).set_image(url=values[c - 1]['url']) embed.set_author(name=formatter.tostring(args, random=True), - url='https://e621.net/post?tags={}'.format(','.join(args)), icon_url=user.avatar_url) + url='https://e621.net/post?tags={}'.format(','.join(args)), icon_url=ctx.author.avatar_url) embed.set_footer(text='{} / {}'.format(c, len(posts)), icon_url='icon_e6.png') @@ -447,7 +422,7 @@ class MsG: finally: for url in starred: - await user.send(url) + await ctx.author.send(url) if len(starred) > 5: await asyncio.sleep(2.1) @@ -461,7 +436,6 @@ class MsG: @checks.del_ctx() @checks.is_nsfw() async def e621(self, ctx, *args): - user = ctx.author args = list(args) limit = 1 @@ -470,21 +444,18 @@ class MsG: # Checks for, defines, and removes limit from args for arg in args: if len(arg) == 1: - try: + with suppress(ValueError): if int(arg) <= 6 and int(arg) >= 1: limit = int(arg) args.remove(arg) else: raise exc.BoundsError(arg) - - except ValueError: - pass posts = await self.check_return_posts(ctx=ctx, booru='e621', tags=args, limit=limit) for ident, post in posts.items(): embed = d.Embed(title=post['author'], url='https://e621.net/post/show/{}'.format(ident), color=ctx.me.color).set_image(url=post['url']) embed.set_author(name=formatter.tostring(args, random=True), - url='https://e621.net/post?tags={}'.format(','.join(args)), icon_url=user.avatar_url) + url='https://e621.net/post?tags={}'.format(','.join(args)), icon_url=ctx.author.avatar_url) embed.set_footer( text=str(ident), icon_url='icon_e6.png') await ctx.send(embed=embed) @@ -504,7 +475,7 @@ class MsG: except exc.Timeout: await ctx.send('❌ **Request timed out.**') - tools.command_dict.setdefault(str(user.id), {}).update( + tools.command_dict.setdefault(str(ctx.author.id), {}).update( {'command': ctx.command, 'args': ctx.args}) @e621.error @@ -516,7 +487,6 @@ class MsG: @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])') @checks.del_ctx() async def e926(self, ctx, *args): - user = ctx.author args = list(args) limit = 1 @@ -525,21 +495,18 @@ class MsG: # Checks for, defines, and removes limit from args for arg in args: if len(arg) == 1: - try: + with suppress(ValueError): if int(arg) <= 6 and int(arg) >= 1: limit = int(arg) args.remove(arg) else: raise exc.BoundsError(arg) - - except ValueError: - pass posts = await self.check_return_posts(ctx=ctx, booru='e926', tags=args, limit=limit) for ident, post in posts.items(): embed = d.Embed(title=post['author'], url='https://e926.net/post/show/{}'.format(ident), color=ctx.me.color).set_image(url=post['url']) embed.set_author(name=formatter.tostring(args, random=True), - url='https://e621.net/post?tags={}'.format(','.join(args)), icon_url=user.avatar_url) + url='https://e621.net/post?tags={}'.format(','.join(args)), icon_url=ctx.author.avatar_url) embed.set_footer( text=str(ident), icon_url='icon_e6.png') await ctx.send(embed=embed) @@ -570,45 +537,39 @@ class MsG: @favorites.command(name='get', aliases=['g']) async def _get_favorites(self, ctx): - user = ctx.author - - await ctx.send('⭐ {}**\'s favorites:**\n```\n{}```'.format(user.mention, formatter.tostring(self.favorites.get(user.id, set())))) + await ctx.send('⭐ {}**\'s favorites:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(self.favorites.get(ctx.author.id, set())))) @favorites.command(name='add', aliases=['a']) async def _add_favorites(self, ctx, *tags): - user = ctx.author - - self.favorites.setdefault(user.id, set()).update(tags) + self.favorites.setdefault(ctx.author.id, set()).update(tags) u.dump(self.favorites, 'cogs/favorites.pkl') - await ctx.send('✅ {} **added:**\n```\n{}```'.format(user.mention, formatter.tostring(tags))) + await ctx.send('✅ {} **added:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags))) @favorites.command(name='remove', aliases=['r']) async def _remove_favorites(self, ctx, *tags): - user = ctx.author - try: for tag in tags: try: - self.favorites[user.id].remove(tag) + self.favorites[ctx.author.id].remove(tag) except KeyError: raise exc.TagError(tag) u.dump(self.favorites, 'cogs/favorites.pkl') - await ctx.send('✅ {} **removed:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)), delete_after=5) + await ctx.send('✅ {} **removed:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) except exc.TagError as e: await ctx.send('❌ `{}` **not in favorites.**'.format(e), delete_after=10) @favorites.command(name='clear', aliases=['c']) async def _clear_favorites(self, ctx): - user = ctx.author + with suppress(KeyError): + del self.favorites[ctx.author.id] + u.dump(self.favorites, 'cogs/favorites.pkl') - del self.favorites[user.id] - - await ctx.send('✅ {}**\'s favorites cleared.**'.format(user.mention)) + await ctx.send('✅ {}**\'s favorites cleared.**'.format(ctx.author.mention)) # Umbrella command structure to manage global, channel, and user blacklists @commands.group(aliases=['bl', 'b'], brief='Manage blacklists', description='Blacklist base command for managing blacklists\n\n`bl get [blacklist]` to show a blacklist\n`bl set [blacklist] [tags]` to replace a blacklist\n`bl clear [blacklist]` to clear a blacklist\n`bl add [blacklist] [tags]` to add tags to a blacklist\n`bl remove [blacklist] [tags]` to remove tags from a blacklist', usage='[flag] [blacklist] ([tags])') @@ -637,23 +598,19 @@ class MsG: async def __get_channel_blacklist(self, ctx): guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - channel = ctx.channel - await ctx.send('🚫 {} **blacklist:**\n```\n{}```'.format(channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(channel.id, set())))) + await ctx.send('🚫 {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(ctx.channel.id, set())))) @_get_blacklist.command(name='me', aliases=['m']) async def __get_user_blacklist(self, ctx): - user = ctx.author - - await ctx.send('🚫 {}**\'s blacklist:**\n```\n{}```'.format(user.mention, formatter.tostring(self.blacklists['user_blacklist'].get(user.id, set()))), delete_after=10) + await ctx.send('🚫 {}**\'s blacklist:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(self.blacklists['user_blacklist'].get(ctx.author.id, set()))), delete_after=10) @_get_blacklist.command(name='here', aliases=['h']) async def __get_here_blacklists(self, ctx): guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - channel = ctx.channel - await ctx.send('🚫 **__Blacklisted:__**\n\n**Global:**\n```\n{}```\n**{}:**\n```\n{}```'.format(formatter.tostring(self.blacklists['global_blacklist']), channel.mention, formatter.tostring(self.blacklists['guild_blacklist'].get(guild.id, {}).get(channel.id, set())))) + await ctx.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())))) @_get_blacklist.group(name='all', aliases=['a']) async def __get_all_blacklists(self, ctx): @@ -681,6 +638,8 @@ class MsG: @_add_tags.command(name='global', aliases=['gl', 'g']) @commands.is_owner() async def __add_global_tags(self, ctx, *tags): + await ctx.trigger_typing() + self.blacklists['global_blacklist'].update(tags) for tag in tags: alias_request = await u.fetch('https://e621.net/tag_alias/index.json', params={'aliased_to': tag, 'approved': 'true'}, json=True) @@ -697,10 +656,11 @@ class MsG: async def __add_channel_tags(self, ctx, *tags): guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - channel = ctx.channel + + await ctx.trigger_typing() self.blacklists['guild_blacklist'].setdefault( - guild.id, {}).setdefault(channel.id, set()).update(tags) + guild.id, {}).setdefault(ctx.channel.id, set()).update(tags) for tag in tags: alias_request = await u.fetch('https://e621.net/tag_alias/index.json', params={'aliased_to': tag, 'approved': 'true'}, json=True) if alias_request: @@ -709,13 +669,13 @@ class MsG: u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.aliases, 'cogs/aliases.pkl') - await ctx.send('✅ **Added to** {} **blacklist:**\n```\n{}```'.format(channel.mention, formatter.tostring(tags)), delete_after=5) + await ctx.send('✅ **Added to** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(tags)), delete_after=5) @_add_tags.command(name='me', aliases=['m']) async def __add_user_tags(self, ctx, *tags): - user = ctx.author + await ctx.trigger_typing() - self.blacklists['user_blacklist'].setdefault(user.id, set()).update(tags) + self.blacklists['user_blacklist'].setdefault(ctx.author.id, set()).update(tags) for tag in tags: alias_request = await u.fetch('https://e621.net/tag_alias/index.json', params={'aliased_to': tag, 'approved': 'true'}, json=True) if alias_request: @@ -724,7 +684,7 @@ class MsG: u.dump(self.blacklists, 'cogs/blacklists.pkl') u.dump(self.aliases, 'cogs/aliases.pkl') - await ctx.send('✅ {} **added:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)), delete_after=5) + await ctx.send('✅ {} **added:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) @blacklist.group(name='remove', aliases=['rm', 'r']) async def _remove_tags(self, ctx): @@ -754,38 +714,35 @@ class MsG: async def __remove_channel_tags(self, ctx, *tags): guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - channel = ctx.channel try: for tag in tags: try: - self.blacklists['guild_blacklist'][guild.id][channel.id].remove(tag) + self.blacklists['guild_blacklist'][guild.id][ctx.channel.id].remove(tag) except KeyError: raise exc.TagError(tag) u.dump(self.blacklists, 'cogs/blacklists.pkl') - await ctx.send('✅ **Removed from** {} **blacklist:**\n```\n{}```'.format(channel.mention, formatter.tostring(tags), delete_after=5)) + await ctx.send('✅ **Removed from** {} **blacklist:**\n```\n{}```'.format(ctx.channel.mention, formatter.tostring(tags), delete_after=5)) except exc.TagError as e: await ctx.send('❌ `{}` **not in blacklist.**'.format(e), delete_after=10) @_remove_tags.command(name='me', aliases=['m']) async def __remove_user_tags(self, ctx, *tags): - user = ctx.author - try: for tag in tags: try: - self.blacklists['user_blacklist'][user.id].remove(tag) + self.blacklists['user_blacklist'][ctx.author.id].remove(tag) except KeyError: raise exc.TagError(tag) u.dump(self.blacklists, 'cogs/blacklists.pkl') - await ctx.send('✅ {} **removed:**\n```\n{}```'.format(user.mention, formatter.tostring(tags)), delete_after=5) + await ctx.send('✅ {} **removed:**\n```\n{}```'.format(ctx.author.mention, formatter.tostring(tags)), delete_after=5) except exc.TagError as e: await ctx.send('❌ `{}` **not in blacklist.**'.format(e), delete_after=10) @@ -798,7 +755,7 @@ class MsG: @_clear_blacklist.command(name='global', aliases=['gl', 'g']) @commands.is_owner() async def __clear_global_blacklist(self, ctx): - del self.blacklists['global_blacklist'] + self.blacklists['global_blacklist'].clear() u.dump(self.blacklists, 'cogs/blacklists.pkl') await ctx.send('✅ **Global blacklist cleared.**', delete_after=5) @@ -808,18 +765,17 @@ class MsG: async def __clear_channel_blacklist(self, ctx): guild = ctx.guild if isinstance( ctx.guild, d.Guild) else ctx.channel - channel = ctx.channel - del self.blacklists['guild_blacklist'][str(guild.id)][channel.id] - u.dump(self.blacklists, 'cogs/blacklists.pkl') + with suppress(KeyError): + del self.blacklists['guild_blacklist'][guild.id][ctx.channel.id] + u.dump(self.blacklists, 'cogs/blacklists.pkl') - await ctx.send('✅ {} **blacklist cleared.**'.format(channel.mention), delete_after=5) + await ctx.send('✅ {} **blacklist cleared.**'.format(ctx.channel.mention), delete_after=5) @_clear_blacklist.command(name='me', aliases=['m']) async def __clear_user_blacklist(self, ctx): - user = ctx.author + with suppress(KeyError): + del self.blacklists['user_blacklist'][ctx.author.id] + u.dump(self.blacklists, 'cogs/blacklists.pkl') - del self.blacklists['user_blacklist'][user.id] - u.dump(self.blacklists, 'cogs/blacklists.pkl') - - await ctx.send('✅ {}**\'s blacklist cleared.**'.format(user.mention), delete_after=5) + await ctx.send('✅ {}**\'s blacklist cleared.**'.format(ctx.author.mention), delete_after=5) diff --git a/src/main/cogs/info.py b/src/main/cogs/info.py index 1bdb7de..737db18 100644 --- a/src/main/cogs/info.py +++ b/src/main/cogs/info.py @@ -24,14 +24,12 @@ class Info: @commands.command(hidden=True) async def hi(self, ctx): - user = ctx.author - - hello = 'Hewwo, {}.'.format(user.mention) - if user.id == checks.owner_id: + hello = 'Hewwo, {}.'.format(ctx.author.mention) + if ctx.author.id == checks.owner_id: hello += '.. ***Master.*** uwu' - elif user.guild_permissions.administrator: + elif ctx.author.guild_permissions.administrator: hello = '{} **Admin** {}'.format(hello[:7], hello[7:]) - elif user.guild_permissions.ban_members: + elif ctx.author.guild_permissions.ban_members: hello = '{} **Mod** {}'.format(hello[:7], hello[7:]) await ctx.send(hello) diff --git a/src/main/cogs/management.py b/src/main/cogs/management.py index 56579f2..04965d0 100644 --- a/src/main/cogs/management.py +++ b/src/main/cogs/management.py @@ -1,5 +1,6 @@ import asyncio import traceback as tb +from contextlib import suppress import discord as d from discord import errors as err @@ -26,47 +27,6 @@ class Administration: self.bot.loop.create_task(self.delete()) self.deleting = True - # @commands.group(aliases=['pr', 'clear', 'cl']) - # @commands.is_owner() - # @checks.del_ctx() - # async def prune(self, ctx): - # pass - # - # @prune.group(name='all', aliases=['a']) - # async def _all(self, ctx): - # pass - # @_all.group(name='user') - # async def __user(self, ctx, user: d.Member): - # channels = ctx.guild.text_channels - # bulk_history = {} - # bulk = {} - # history = [] - # c = 0 - # if ctx.invoked_subcommand is None: - # for channel in channels: - # bulk_history[channel] = await channel.history(limit=None, after=dt.datetime.utcnow() - dt.timedelta(days=14)).flatten() - # await ch_sent.edit(content='🗄 **Cached** `' + str(channels.index(channel) + 1) + '/' + str(len(channels)) + '` **channels.**') - # await asyncio.sleep(self.RATE_LIMIT) - # for channel, messages in bulk_history.items(): - # bulk[channel] = [message for message in messages if message.author.id == int(uid)] - # for channel, messages in bulk_history.items(): - # bulk[channel] = [bulk[channel][i:i+100] for i in range(0, len(bulk[channel]), 100)] - # await ctx.send('⏱ **Estimated time to delete `bulk-history`:** `' + str(int(self.RATE_LIMIT * sum([len(v) for v in bulk.values()]) / 60)) + ' mins ' + str(int(self.RATE_LIMIT * sum([len(v) for v in bulk.values()]) % 60)) + ' secs`') - # check = await ctx.send(ctx.author.mention + ' **Continue?** `Y` or `N`') - # await self.bot.wait_for('message', check=yes, timeout=60) - # del_sent = await ctx.send('🗑 **Deleting messages...**') - # for channel, messages in bulk.items(): - # for chunk in messages: - # c += len(chunk) - # await channel.delete_messages(chunk) - # await del_sent.edit(content='🗑 **Deleted** `' + str(c) + '/' + str(sum([len(v) for v in bulk.values()])) + '` **messages.**') - # await asyncio.sleep(5) - # await ctx.send('✅ `' + str(sum([len(v) for v in bulk.values()])) + '` **of** <@' + uid + '>**\'s messages deleted from** ' + ctx.guild.name + '**.**') - # for channel in channels: - # history.extend(await channel.history(limit=None, before=dt.datetime.utcnow() - dt.timedelta(days=14)).flatten()) - # await ch_sent.edit(content='🗄 **Cached** `' + str(channels.index(channel) + 1) + '/' + str(len(channels)) + '` **channels.**') - # await asyncio.sleep(self.RATE_LIMIT) - @commands.command(name=',prunefromguild', aliases=[',pfg', ',prunefromserver', ',pfs'], brief='Prune a user\'s messages from the guild', description='about flag centers on message 50 of 101 messages\n\npfg \{user id\} [before|after|about] [\{message id\}]\n\nExample:\npfg \{user id\} before \{message id\}') @commands.is_owner() @checks.del_ctx() @@ -121,12 +81,9 @@ class Administration: await cont_sent.delete() del_sent = await ctx.send('🗑 **Deleting messages...**') for message in history: - try: + with suppress(err.NotFound): await message.delete() - except d.NotFound: - pass - # print('Deleted {}/{} messages.'.format(history.index(message) + 1, len(history))) await del_sent.edit(content='🗑 **Deleted** `{}/{}` **messages.**'.format(history.index(message) + 1, len(history))) await asyncio.sleep(self.RATE_LIMIT) @@ -142,11 +99,9 @@ class Administration: while self.deleting: message = await self.queue.get() await asyncio.sleep(self.RATE_LIMIT) - try: + with suppress(err.NotFound): if not message.pinned: await message.delete() - except err.NotFound: - pass async def queue_on_message(self, channel): def check(msg): @@ -159,6 +114,8 @@ class Administration: try: async for message in channel.history(): + if message.content.lower() == 'stop' and message.author.guild_permissions.administrator: + raise exc.Abort if not message.pinned: await self.queue.put(message) @@ -171,8 +128,9 @@ class Administration: u.dump(u.tasks, 'cogs/tasks.pkl') if not u.tasks['auto_del']: self.deleting = False - print('Stopped looping {}'.format(channel.id)) - await channel.send('✅ **Stopped deleting messages in** {}**.**'.format(channel.mention), delete_after=5) + print('Stopped deleting.') + print('Stopped looping #{}'.format(channel.name)) + await channel.send('✅ **Stopped queueing messages for deletion in** {}**.**'.format(channel.mention), delete_after=5) except AttributeError: pass @@ -181,17 +139,15 @@ class Administration: @commands.has_permissions(administrator=True) @checks.del_ctx() async def auto_delete(self, ctx): - channel = ctx.channel - try: - if channel.id not in u.tasks['auto_del']: - u.tasks['auto_del'].append(channel.id) + if ctx.channel.id not in u.tasks['auto_del']: + u.tasks['auto_del'].append(ctx.channel.id) u.dump(u.tasks, 'cogs/tasks.pkl') - self.bot.loop.create_task(self.queue_on_message(channel)) + self.bot.loop.create_task(self.queue_on_message(ctx.channel)) if not self.deleting: self.bot.loop.create_task(self.delete()) self.deleting = True - print('Looping #{}'.format(channel.name)) + print('Looping #{}'.format(ctx.channel.name)) await ctx.send('✅ **Auto-deleting all messages in this channel.**', delete_after=5) else: raise exc.Exists @@ -202,12 +158,10 @@ class Administration: @commands.command(name='deletecommands', aliases=['delcmds']) @commands.has_permissions(administrator=True) async def delete_commands(self, ctx): - guild = ctx.guild - - if guild.id not in u.settings['del_ctx']: - u.settings['del_ctx'].append(guild.id) + if ctx.guild.id not in u.settings['del_ctx']: + u.settings['del_ctx'].append(ctx.guild.id) else: - u.settings['del_ctx'].remove(guild.id) + u.settings['del_ctx'].remove(ctx.guild.id) u.dump(u.settings, 'settings.pkl') - await ctx.send('✅ **Delete command invocations:** `{}`'.format(guild.id in u.settings['del_ctx'])) + await ctx.send('✅ **Delete command invocations:** `{}`'.format(ctx.guild.id in u.settings['del_ctx'])) From bfc39d7a99836c5f432824f210c2eb1feb2f8e27 Mon Sep 17 00:00:00 2001 From: Myned Date: Sun, 15 Oct 2017 12:58:16 -0400 Subject: [PATCH 2/3] WIP task cancellation on loop close, formatting --- src/main/cogs/owner.py | 10 ++++------ src/main/run.py | 5 ++--- src/main/utils/utils.py | 13 ++++++++++++- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/cogs/owner.py b/src/main/cogs/owner.py index a78d3fc..ac3b2c6 100644 --- a/src/main/cogs/owner.py +++ b/src/main/cogs/owner.py @@ -28,13 +28,12 @@ class Bot: @checks.del_ctx() async def die(self, ctx): if isinstance(self.bot.get_channel(u.config['shutdown_channel']), d.TextChannel): - await self.bot.get_channel(u.config['shutdown_channel']).send('**Shutting down . . .** 🌙') + await self.bot.get_channel(u.config['shutdown_channel']).send('**Shutting down 🌙 . . .**') # loop = self.bot.loop.all_tasks() # for task in loop: # task.cancel() - u.close() await self.bot.logout() - await self.bot.close() + u.close(self.bot.loop) 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') @@ -44,14 +43,13 @@ class Bot: async def restart(self, ctx): print('\n| | | | | | | | | |\nR E S T A R T I N G\n| | | | | | | | | |\n') if isinstance(self.bot.get_channel(u.config['shutdown_channel']), d.TextChannel): - await self.bot.get_channel(u.config['shutdown_channel']).send('**Restarting . . .** 💤') + await self.bot.get_channel(u.config['shutdown_channel']).send('**Restarting 💤 . . .**') # u.notify('R E S T A R T I N G') # loop = self.bot.loop.all_tasks() # for task in loop: # task.cancel() - u.close() await self.bot.logout() - await self.bot.close() + u.close(self.bot.loop) os.execl(sys.executable, 'python3', 'run.py') # Invite bot to bot owner's server diff --git a/src/main/run.py b/src/main/run.py index 8ee88a8..453debe 100644 --- a/src/main/run.py +++ b/src/main/run.py @@ -35,7 +35,7 @@ async def on_ready(): # bot.loop.create_task(u.clear(booru.temp_urls, 30*60)) if isinstance(bot.get_channel(u.config['startup_channel']), d.TextChannel): - await bot.get_channel(u.config['startup_channel']).send('**Started.** ☀️') + await bot.get_channel(u.config['startup_channel']).send('**Started ☀️ .**') print('\n\\ \\ \\ \\ \\ \\ \\ \\ \\\nC O N N E C T E D : {}\n/ / / / / / / / /\n'.format(bot.user.name)) # u.notify('C O N N E C T E D') @@ -44,9 +44,8 @@ async def on_ready(): async def on_error(error, *args, **kwargs): if isinstance(bot.get_channel(u.config['shutdown_channel']), d.TextChannel): await bot.get_channel(u.config['shutdown_channel']).send('**ERROR** ⚠️ {}'.format(error)) - u.close() await bot.logout() - await bot.close() + u.close(bot.loop) print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(error), file=sys.stderr) tb.print_exc() # u.notify('E R R O R') diff --git a/src/main/utils/utils.py b/src/main/utils/utils.py index 2bd4d6b..bf1d834 100644 --- a/src/main/utils/utils.py +++ b/src/main/utils/utils.py @@ -3,6 +3,7 @@ import json import os import pickle as pkl import subprocess +from contextlib import suppress import aiohttp from pync import Notifier @@ -72,12 +73,22 @@ async def clear(obj, interval=10 * 60, replace=None): session = aiohttp.ClientSession() -def close(): +def close(loop): global session if session: session.close() + loop.stop() + pending = asyncio.Task.all_tasks() + for task in pending: + task.cancel() + # with suppress(asyncio.CancelledError): + # loop.run_until_complete(task) + # loop.close() + + print('Finished cancelling tasks.') + async def fetch(url, *, params={}, json=False): global session From cb5d3549e4de66f82aeef6676207559b26e55f31 Mon Sep 17 00:00:00 2001 From: Myned Date: Sun, 15 Oct 2017 12:58:30 -0400 Subject: [PATCH 3/3] Redundant is True --- src/main/misc/checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/misc/checks.py b/src/main/misc/checks.py index 0c9891c..e124592 100644 --- a/src/main/misc/checks.py +++ b/src/main/misc/checks.py @@ -59,7 +59,7 @@ def is_nsfw(): def del_ctx(): async def predicate(ctx): - if ctx.me.permissions_in(ctx.channel).manage_messages is True and isinstance(ctx.message.channel, discord.TextChannel) and ctx.guild.id in u.settings['del_ctx']: + if ctx.me.permissions_in(ctx.channel).manage_messages and isinstance(ctx.message.channel, discord.TextChannel) and ctx.guild.id in u.settings['del_ctx']: try: await ctx.message.delete()