From 79ba91a1f1220cb31f5751c410d28cb97872d215 Mon Sep 17 00:00:00 2001
From: Shiba <44804845+DeepDoge@users.noreply.github.com>
Date: Fri, 14 Jan 2022 18:36:18 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=A1=20set=20madiator=20scrap=20api=20v?=
 =?UTF-8?q?ersion=20to=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/settings.ts      | 19 ++++++++++++++-----
 src/common/yt/urlResolve.ts |  5 +++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/common/settings.ts b/src/common/settings.ts
index 5114354..c6fa00c 100644
--- a/src/common/settings.ts
+++ b/src/common/settings.ts
@@ -111,7 +111,8 @@ export const SingleValueAtATime = Symbol()
 export type YtUrlResolveResponsePath = (string | number | typeof Keys | typeof Values)[]
 export interface YtUrlResolveFunction {
   pathname: string
-  paramName: string
+  defaultParams: Record<string, string | number>
+  valueParamName: string
   paramArraySeperator: string | typeof SingleValueAtATime
   responsePath: YtUrlResolveResponsePath
 }
@@ -131,13 +132,15 @@ export const ytUrlResolversSettings: Record<YTUrlResolverName, YTUrlResolver> =
     functions: {
       getChannelId: {
         pathname: "/yt/resolve",
-        paramName: "channel_ids",
+        defaultParams: {},
+        valueParamName: "channel_ids",
         paramArraySeperator: ',',
         responsePath: ["data", "channels", Values]
       },
       getVideoId: {
         pathname: "/yt/resolve",
-        paramName: "video_ids",
+        defaultParams: {},
+        valueParamName: "video_ids",
         paramArraySeperator: ",",
         responsePath: ["data", "videos", Values]
       }
@@ -149,13 +152,19 @@ export const ytUrlResolversSettings: Record<YTUrlResolverName, YTUrlResolver> =
     functions: {
       getChannelId: {
         pathname: "/api/get-lbry-channel",
-        paramName: "url",
+        defaultParams: {
+          v: 2
+        },
+        valueParamName: "url",
         paramArraySeperator: SingleValueAtATime,
         responsePath: ["lbrych"]
       },
       getVideoId: {
         pathname: "/api/get-lbry-video",
-        paramName: "url",
+        defaultParams: {
+          v: 2
+        },
+        valueParamName: "url",
         paramArraySeperator: SingleValueAtATime,
         responsePath: ["lbryurl"]
       }
diff --git a/src/common/yt/urlResolve.ts b/src/common/yt/urlResolve.ts
index 1e6c37e..41d1944 100644
--- a/src/common/yt/urlResolve.ts
+++ b/src/common/yt/urlResolve.ts
@@ -59,10 +59,11 @@ export async function resolveById(descriptors: YtIdResolverDescriptor[], progres
 
         async function requestGroup(urlResolverFunction: YtUrlResolveFunction, descriptorsGroup: typeof descriptorsPayload) {
             url.pathname = urlResolverFunction.pathname
+            Object.entries(urlResolverFunction.defaultParams).forEach(([name, value]) => url.searchParams.set(name, value.toString()))
 
             if (urlResolverFunction.paramArraySeperator === SingleValueAtATime) {
                 await Promise.all(descriptorsGroup.map(async (descriptor) => {
-                    url.searchParams.set(urlResolverFunction.paramName, descriptor.id)
+                    url.searchParams.set(urlResolverFunction.valueParamName, descriptor.id)
 
                     const apiResponse = await fetch(url.toString(), { cache: 'no-store' })
                     if (apiResponse.ok) {
@@ -77,7 +78,7 @@ export async function resolveById(descriptors: YtIdResolverDescriptor[], progres
                 }))
             }
             else {
-                url.searchParams.set(urlResolverFunction.paramName, descriptorsGroup
+                url.searchParams.set(urlResolverFunction.valueParamName, descriptorsGroup
                     .map((descriptor) => descriptor.id)
                     .join(urlResolverFunction.paramArraySeperator))