From 641821164c77f9fb01d2a15557e4fa1be5fa31dd Mon Sep 17 00:00:00 2001 From: TPN Date: Mon, 1 Apr 2024 14:06:51 +0000 Subject: [PATCH] make required changes --- src/providers/embeds/mixdrop.ts | 7 +++++-- src/providers/sources/gomovies/index.ts | 28 ++++++++++++------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/providers/embeds/mixdrop.ts b/src/providers/embeds/mixdrop.ts index 40769b5..90f67cf 100644 --- a/src/providers/embeds/mixdrop.ts +++ b/src/providers/embeds/mixdrop.ts @@ -18,7 +18,10 @@ export const mixdropScraper = makeEmbed({ // this also handels the case where preview page urls are returned // Example: https://mixdrop.vc/f/pkwrgp0pizgod0 // these don't have the packed code - const streamRes = await ctx.proxiedFetcher(`https://mixdrop.si/e/${embedId}`); + const mixdropBase = 'https://mixdrop.ag'; + const streamRes = await ctx.proxiedFetcher(`/e/${embedId}`, { + baseUrl: mixdropBase, + }); const packed = streamRes.match(packedRegex); // MixDrop uses a queue system for embeds @@ -51,7 +54,7 @@ export const mixdropScraper = makeEmbed({ url: url.startsWith('http') ? url : `https:${url}`, // URLs don't always start with the protocol headers: { // MixDrop requires this header on all streams - Referer: 'https://mixdrop.co/', + Referer: mixdropBase, }, }, }, diff --git a/src/providers/sources/gomovies/index.ts b/src/providers/sources/gomovies/index.ts index ea29641..42095a0 100644 --- a/src/providers/sources/gomovies/index.ts +++ b/src/providers/sources/gomovies/index.ts @@ -103,32 +103,32 @@ export const goMoviesScraper = makeSourcerer({ const embeds = [ { embedId: upcloudScraper.id, - url: upcloudSource?.link ?? null, + url: upcloudSource?.link, }, { embedId: vidCloudScraper.id, - url: vidcloudSource?.link ?? null, + url: vidcloudSource?.link, }, { embedId: voeScraper.id, - url: voeSource?.link ?? null, + url: voeSource?.link, }, { embedId: doodScraper.id, - url: doodSource?.link ?? null, + url: doodSource?.link, }, { embedId: upstreamScraper.id, - url: upstreamSource?.link ?? null, + url: upstreamSource?.link, }, { embedId: mixdropScraper.id, - url: mixdropSource?.link ?? null, + url: mixdropSource?.link, }, ]; const filteredEmbeds = embeds - .filter((embed) => embed.url !== null) + .filter((embed) => embed.url) .map((embed) => ({ embedId: embed.embedId, url: embed.url as string, @@ -186,32 +186,32 @@ export const goMoviesScraper = makeSourcerer({ const embeds = [ { embedId: upcloudScraper.id, - url: upcloudSource?.link ?? null, + url: upcloudSource?.link, }, { embedId: vidCloudScraper.id, - url: vidcloudSource?.link ?? null, + url: vidcloudSource?.link, }, { embedId: voeScraper.id, - url: voeSource?.link ?? null, + url: voeSource?.link, }, { embedId: doodScraper.id, - url: doodSource?.link ?? null, + url: doodSource?.link, }, { embedId: upstreamScraper.id, - url: upstreamSource?.link ?? null, + url: upstreamSource?.link, }, { embedId: mixdropScraper.id, - url: mixdropSource?.link ?? null, + url: mixdropSource?.link, }, ]; const filteredEmbeds = embeds - .filter((embed) => embed.url !== null) + .filter((embed) => embed.url) .map((embed) => ({ embedId: embed.embedId, url: embed.url as string,