From 80f7b77cd3c09a66303172f71396bc366a954945 Mon Sep 17 00:00:00 2001 From: cloudwithax Date: Mon, 10 Jun 2024 21:20:59 -0400 Subject: [PATCH] refactor: update search_type handling in Player and Node classes to be nullish to support lavasrc --- pomice/player.py | 2 +- pomice/pool.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pomice/player.py b/pomice/player.py index e062456..5faaf62 100644 --- a/pomice/player.py +++ b/pomice/player.py @@ -396,7 +396,7 @@ class Player(VoiceProtocol): query: str, *, ctx: Optional[commands.Context] = None, - search_type: SearchType = SearchType.ytsearch, + search_type: SearchType | None = SearchType.ytsearch, filters: Optional[List[Filter]] = None, ) -> Optional[Union[List[Track], Playlist]]: """Fetches tracks from the node's REST api to parse into Lavalink. diff --git a/pomice/pool.py b/pomice/pool.py index 80e0eb8..08c8e44 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -560,7 +560,7 @@ class Node: query: str, *, ctx: Optional[commands.Context] = None, - search_type: SearchType = SearchType.ytsearch, + search_type: SearchType | None = SearchType.ytsearch, filters: Optional[List[Filter]] = None, ) -> Optional[Union[Playlist, List[Track]]]: """Fetches tracks from the node's REST api to parse into Lavalink. @@ -707,7 +707,11 @@ class Node: ) else: - if not URLRegex.BASE_URL.match(query) and not re.match(r"(?:[a-z]+?)search:.", query): + if ( + search_type + and not URLRegex.BASE_URL.match(query) + and not re.match(r"(?:[a-z]+?)search:.", query) + ): query = f"{search_type}:{query}" # If YouTube url contains a timestamp, capture it for use later.