From 03c07170279efd43ab4ac4e593db978cd0bab3ef Mon Sep 17 00:00:00 2001 From: astieman Date: Thu, 14 Feb 2019 21:32:10 -0700 Subject: Code review changes implemented. Reverted so error handling is done by base bot. --- bot/seasons/evergreen/fun.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'bot') diff --git a/bot/seasons/evergreen/fun.py b/bot/seasons/evergreen/fun.py index ebc10fca..afe70462 100644 --- a/bot/seasons/evergreen/fun.py +++ b/bot/seasons/evergreen/fun.py @@ -15,22 +15,14 @@ class Fun: self.bot = bot @commands.command() - async def roll(self, ctx, str_input: str = None): + async def roll(self, ctx, num_rolls: int): output = "" - - if not str_input: - output = "To use .roll, format it as such: .roll (number)" - else: - try: - num_rolls = int(str_input) - if num_rolls > 6: - num_rolls = 6 - elif num_rolls < 1: - return - for i in range(num_rolls): - output += ":terning%d: " % random.randint(1, 6) - except ValueError: - return + if num_rolls > 6: + num_rolls = 6 + elif num_rolls < 0: + output = ":no_entry: You must roll at least once." + for _ in range(num_rolls): + output += ":terning%d: " % random.randint(1, 6) await ctx.send(output) -- cgit v1.2.3