From 43f539bdd36d0683e66257ded5593b6ae73348ac Mon Sep 17 00:00:00 2001 From: Adam Piontek Date: Sun, 26 Aug 2018 10:41:09 -0400 Subject: [PATCH] fixing issue where trying to fetch a breed before breeds list loaded resulted in trying to fetch sub-breeds and then error --- doggo.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/doggo.py b/doggo.py index ac36b06..1066ebb 100644 --- a/doggo.py +++ b/doggo.py @@ -32,16 +32,17 @@ class Doggo(BotPlugin): # But what if user passed us a sub-breed? if len(args) > 1 and args[1]: subbreed = args[1] - if len(self.breeds[breed]) == 0: - if 'calledbyfunction' not in args: - args.append('calledbyfunction') - self.reloadsubbreeds(msg, args) + if subbreed != 'calledbyfunction': if len(self.breeds[breed]) == 0: - return 'No sub-breeds available for {}, so we cannot use {}.'.format(breed, subbreed) - if subbreed in self.breeds[breed]: - url = '{}/breed/{}/{}/images/random'.format(self.BASE_URL, breed, subbreed) - else: - return 'Sub-breed of {} not found: {}. List sub-breeds with !listsubbreeds'.format(breed, subbreed) + if 'calledbyfunction' not in args: + args.append('calledbyfunction') + self.reloadsubbreeds(msg, args) + if len(self.breeds[breed]) == 0: + return 'No sub-breeds available for {}, so we cannot use {}.'.format(breed, subbreed) + if subbreed in self.breeds[breed]: + url = '{}/breed/{}/{}/images/random'.format(self.BASE_URL, breed, subbreed) + else: + return 'Sub-breed of {} not found: {}. List sub-breeds with !listsubbreeds'.format(breed, subbreed) try: resp = requests.get(url)