diff --git a/src/misc/exceptions.py b/src/misc/exceptions.py index ac58f01..4c94ed2 100644 --- a/src/misc/exceptions.py +++ b/src/misc/exceptions.py @@ -7,12 +7,10 @@ async def send_error(ctx, error): await ctx.send('{}\n```\n{}```'.format(base, error)) -# class NSFW(errext.CheckFailure): -# pass - class Remove(Exception): pass + class SizeError(Exception): pass @@ -46,6 +44,7 @@ class Save(Exception): self.user = user self.message = message + class GoTo(Exception): pass diff --git a/src/utils/scraper.py b/src/utils/scraper.py index 49edfc5..d7817db 100644 --- a/src/utils/scraper.py +++ b/src/utils/scraper.py @@ -48,6 +48,10 @@ async def query_kheina(url): content = re.sub('', '', content) soup = BeautifulSoup(content, 'html5lib') + + if soup.find('data', id='error'): + return False + results = soup.find('data', id='results').string results = ast.literal_eval(results) iqdbdata = soup.find('data', id='iqdbdata').string diff --git a/src/utils/utils.py b/src/utils/utils.py index 6298cb2..c7f9fe2 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -24,7 +24,7 @@ except FileNotFoundError: with open('config.json', 'w') as outfile: jsn.dump({'client_id': 0, 'owner_id': 0, 'permissions': 126016, 'playing': 'a game', 'prefix': [',', 'm,'], 'selfbot': False, 'token': 'str', 'saucenao_api': 'str'}, outfile, indent=4, sort_keys=True) - print('FILE NOT FOUND : config.json created with abstract values. Restart run.py with correct values') + print('FILE NOT FOUND : config.json created with default values. Restart run.py with correct values') def setdefault(filename, default=None, json=False): @@ -87,10 +87,10 @@ asession = aiohttp.ClientSession() async def fetch(url, *, params={}, json=False, response=False, text=False): async with asession.get(url, params=params, headers={ 'User-Agent': 'Myned/Modufur (https://github.com/Myned/Modufur)'}, ssl=False) as r: - if json: - return await r.json() - elif response: + if response: return r + elif json: + return await r.json() elif text: return await r.text() else: