From 041ad99b8bb9981485914b782e5b8cff14098364 Mon Sep 17 00:00:00 2001 From: 2D <44017640+melike2d@users.noreply.github.com> Date: Tue, 15 Mar 2022 02:02:13 -0700 Subject: [PATCH 1/2] Update Manager.ts --- src/structures/Manager.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/structures/Manager.ts b/src/structures/Manager.ts index c1f4a49..c85ac25 100644 --- a/src/structures/Manager.ts +++ b/src/structures/Manager.ts @@ -223,7 +223,7 @@ export class Manager extends EventEmitter { public static readonly DEFAULT_SOURCES: Record = { "youtube music": "ytmsearch", "youtube": "ytsearch", - "soundcloud": "scsearch" + "soundcloud": "scsearch", } /** The map of players. */ @@ -344,7 +344,7 @@ export class Manager extends EventEmitter { const _source = Manager.DEFAULT_SOURCES[_query.source ?? this.options.defaultSearchPlatform] ?? _query.source; let search = _query.query; - if (!/^https?:\/\//.test(search)) { + if (_source !== "local" && /^https?:\/\//.test(search)) { search = `${_source}:${search}`; } @@ -546,7 +546,7 @@ export interface ManagerOptions { send(id: string, payload: Payload): void; } -export type SearchPlatform = "youtube" | "youtube music" | "soundcloud"; +export type SearchPlatform = "youtube" | "youtube music" | "soundcloud" | "local"; export interface SearchQuery { /** The source to search from. */ From 1f3b1d4196352ccb76aaf382681588ccb9fdeef0 Mon Sep 17 00:00:00 2001 From: 2D <44017640+melike2d@users.noreply.github.com> Date: Tue, 15 Mar 2022 02:12:33 -0700 Subject: [PATCH 2/2] Update Manager.ts --- src/structures/Manager.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/structures/Manager.ts b/src/structures/Manager.ts index c85ac25..2eec48a 100644 --- a/src/structures/Manager.ts +++ b/src/structures/Manager.ts @@ -220,7 +220,7 @@ export interface Manager { * @noInheritDoc */ export class Manager extends EventEmitter { - public static readonly DEFAULT_SOURCES: Record = { + public static readonly DEFAULT_SOURCES: Partial> = { "youtube music": "ytmsearch", "youtube": "ytsearch", "soundcloud": "scsearch", @@ -342,9 +342,9 @@ export class Manager extends EventEmitter { const _query: SearchQuery = typeof query === "string" ? { query } : query; const _source = Manager.DEFAULT_SOURCES[_query.source ?? this.options.defaultSearchPlatform] ?? _query.source; - + let search = _query.query; - if (_source !== "local" && /^https?:\/\//.test(search)) { + if (_source !== "local" && !/^(https?|file):\/\//.test(search)) { search = `${_source}:${search}`; }