From 0a8dae2c41c43973b0f3b047318834dc597bed90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B5=90=E5=9F=8E=E3=82=A4=E3=83=B4?= Date: Tue, 23 Apr 2019 22:09:54 -0400 Subject: [PATCH] Place hash_allow within reset --- cogs/verification.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cogs/verification.py b/cogs/verification.py index b52f6db..98c2ca8 100644 --- a/cogs/verification.py +++ b/cogs/verification.py @@ -106,11 +106,12 @@ welcome_footer = ( """, ) -hidden_term_line = ' • When you have finished reading all of the rules, send a message in this channel that includes the {0} hash of your discord "name#discriminator" (for example, {0}(User#1234)), and we\'ll grant you access to the other channels. You can find your "name#discriminator" (your username followed by a ‘#’ and four numbers) under the discord channel list.'.format(hash_choice.upper()) +hidden_term_line = ' • When you have finished reading all of the rules, send a message in this channel that includes the {0} hash of your discord "name#discriminator" (for example, {0}(User#1234)), and we\'ll grant you access to the other channels. You can find your "name#discriminator" (your username followed by a ‘#’ and four numbers) under the discord channel list.' class Verification(Cog): - def __init__(self, bot): + def __init__(self, bot, hash_choice): self.bot = bot + self.hash_choice = random.choice(tuple(hashlib.algorithms_guaranteed)) @commands.check(check_if_staff) @commands.command() @@ -127,13 +128,13 @@ class Verification(Cog): rules = ['**{}**. {}'.format(i, cleandoc(r)) for i, r in enumerate(welcome_rules, 1)] rule_choice = random.randint(2, len(rules)) - rules[rule_choice - 1] += '\n' + hidden_term_line + rules[rule_choice - 1] += '\n' + hidden_term_line.format(self.hash_choice.upper()) msg = f"🗑 **Reset**: {ctx.author.mention} cleared {limit} messages "\ f" in {ctx.channel.mention}" msg += f"\n💬 __Current challenge location__: under rule {rule_choice}" log_channel = self.bot.get_channel(config.log_channel) await log_channel.send(msg) - + # find rule that puts us over 2,000 characters, if any total = 0 messages = [] @@ -198,8 +199,7 @@ class Verification(Cog): close_names += [(cn + '\r') for cn in close_names] # Finally, hash the stuff so that we can access them later :) - hash_choice = random.choice(tuple(hashlib.algorithms_guaranteed)) - hash_allow = [hashlib.new(hash_choice, name.encode('utf-8')).hexdigest() + hash_allow = [hashlib.new(self.hash_choice, name.encode('utf-8')).hexdigest() for name in allowed_names] # I'm not even going to attempt to break those into lines jfc