From baba9876979bda59520f320928abbbc64cafbec8 Mon Sep 17 00:00:00 2001 From: Myned Date: Tue, 31 Oct 2017 16:13:39 -0400 Subject: [PATCH 1/2] Fixed tags still being limited with order: --- src/main/cogs/booru.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/cogs/booru.py b/src/main/cogs/booru.py index bae06d5..f9e12d4 100644 --- a/src/main/cogs/booru.py +++ b/src/main/cogs/booru.py @@ -573,6 +573,13 @@ class MsG: blacklist.update(list(self.aliases[tag]) + [tag]) for tag in self.blacklists['user_blacklist'].get(ctx.author.id, set()): blacklist.update(list(self.aliases[tag]) + [tag]) + # Checks for, assigns, and removes first order in tags if possible + order = [tag for tag in tags if 'order:' in tag] + if order: + order = order[0] + tags.remove(order) + else: + order = 'order:random' # Checks if tags are in local blacklists if tags: if (len(tags) > 5 and booru == 'e621') or (len(tags) > 4 and booru == 'e926'): @@ -581,13 +588,6 @@ class MsG: if tag == 'swf' or tag == 'webm' or tag in blacklist: raise exc.TagBlacklisted(tag) - order = [tag for tag in tags if 'order:' in tag] - if order: - order = order[0] - tags.remove(order) - else: - order = 'order:random' - # Checks for blacklisted tags in endpoint blacklists - try/except is for continuing the parent loop posts = {} temposts = len(posts) From c87555bfee5885035d63c4f8562c8d8f222d1405 Mon Sep 17 00:00:00 2001 From: Myned Date: Tue, 31 Oct 2017 16:13:54 -0400 Subject: [PATCH 2/2] Output formatting change --- src/main/cogs/owner.py | 4 ++-- src/main/run.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/cogs/owner.py b/src/main/cogs/owner.py index 9982a9e..a9a1df3 100644 --- a/src/main/cogs/owner.py +++ b/src/main/cogs/owner.py @@ -39,7 +39,7 @@ class Bot: # task.cancel() await self.bot.logout() u.close(self.bot.loop) - 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') @commands.command(name=',restart', aliases=[',res', ',r'], hidden=True) @@ -48,7 +48,7 @@ class Bot: async def restart(self, ctx): await ctx.message.add_reaction('💤') - 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** 💤 . . .') # u.notify('R E S T A R T I N G') diff --git a/src/main/run.py b/src/main/run.py index d3c685f..a2447c6 100644 --- a/src/main/run.py +++ b/src/main/run.py @@ -47,7 +47,7 @@ async def on_ready(): else: 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** ☀️ .') # u.notify('C O N N E C T E D') if u.temp: