From baba9876979bda59520f320928abbbc64cafbec8 Mon Sep 17 00:00:00 2001 From: Myned Date: Tue, 31 Oct 2017 16:13:39 -0400 Subject: [PATCH] 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)