This commit is contained in:
Drapersniper
2020-10-06 10:26:36 +01:00
parent bf6b7a95bb
commit 59659b1d03
3 changed files with 41 additions and 30 deletions

View File

@@ -61,6 +61,8 @@ class GlobalCacheWrapper:
if any([not query or not query.valid or query.is_spotify or query.is_local]):
return {}
await self._get_api_key()
if self.api_key is None:
return {}
search_response = "error"
query = query.lavalink_query
with contextlib.suppress(aiohttp.ContentTypeError, asyncio.TimeoutError):
@@ -91,6 +93,8 @@ class GlobalCacheWrapper:
search_response = "error"
params = {"title": title, "author": author}
await self._get_api_key()
if self.api_key is None:
return {}
with contextlib.suppress(aiohttp.ContentTypeError, asyncio.TimeoutError):
async with self.session.get(
api_url,
@@ -117,16 +121,13 @@ class GlobalCacheWrapper:
return
query = Query.process_input(query, self.cog.local_folder_current_path)
if llresponse.has_error or llresponse.load_type.value in ["NO_MATCHES", "LOAD_FAILED"]:
await asyncio.sleep(0)
return
if query and query.valid and query.is_youtube:
query = query.lavalink_query
else:
await asyncio.sleep(0)
return None
await self._get_api_key()
if self.api_key is None:
await asyncio.sleep(0)
return None
api_url = f"{_API_URL}api/v2/queries"
async with self.session.post(
@@ -164,6 +165,7 @@ class GlobalCacheWrapper:
global_api_user = copy(self.cog.global_api_user)
await self._get_api_key()
is_enabled = await self.config.global_db_enabled()
await self._get_api_key()
if (not is_enabled) or self.api_key is None:
return global_api_user
with contextlib.suppress(Exception):