Merge branch 'dev' into dev

This commit is contained in:
mrjvs 2023-05-22 19:16:54 +02:00 committed by GitHub
commit 4ad0d53683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,12 +4,12 @@ import {
getMWCaptionTypeFromUrl, getMWCaptionTypeFromUrl,
isSupportedSubtitle, isSupportedSubtitle,
} from "../helpers/captions"; } from "../helpers/captions";
import { proxiedFetch } from "../helpers/fetch"; import { mwFetch } from "../helpers/fetch";
import { registerProvider } from "../helpers/register"; import { registerProvider } from "../helpers/register";
import { MWCaption, MWStreamQuality, MWStreamType } from "../helpers/streams"; import { MWCaption, MWStreamQuality, MWStreamType } from "../helpers/streams";
import { MWMediaType } from "../metadata/types"; import { MWMediaType } from "../metadata/types";
const flixHqBase = "https://api.consumet.org/meta/tmdb"; const flixHqBase = "https://consumet-api-clone.vercel.app/meta/tmdb"; // instance stolen from streaminal :)
type FlixHQMediaType = "Movie" | "TV Series"; type FlixHQMediaType = "Movie" | "TV Series";
interface FLIXMediaBase { interface FLIXMediaBase {
@ -59,7 +59,7 @@ registerProvider({
throw new Error("Unsupported type"); throw new Error("Unsupported type");
} }
// search for relevant item // search for relevant item
const searchResults = await proxiedFetch<any>( const searchResults = await mwFetch<any>(
`/${encodeURIComponent(media.meta.title)}`, `/${encodeURIComponent(media.meta.title)}`,
{ {
baseURL: flixHqBase, baseURL: flixHqBase,
@ -79,7 +79,7 @@ registerProvider({
// get media info // get media info
progress(25); progress(25);
const mediaInfo = await proxiedFetch<any>(`/info/${foundItem.id}`, { const mediaInfo = await mwFetch<any>(`/info/${foundItem.id}`, {
baseURL: flixHqBase, baseURL: flixHqBase,
params: { params: {
type: flixTypeToMWType(foundItem.type), type: flixTypeToMWType(foundItem.type),
@ -103,7 +103,7 @@ registerProvider({
} }
if (!episodeId) throw new Error("No watchable item found"); if (!episodeId) throw new Error("No watchable item found");
progress(75); progress(75);
const watchInfo = await proxiedFetch<any>(`/watch/${episodeId}`, { const watchInfo = await mwFetch<any>(`/watch/${episodeId}`, {
baseURL: flixHqBase, baseURL: flixHqBase,
params: { params: {
id: mediaInfo.id, id: mediaInfo.id,