Merge pull request #475 from movie-web/dev

Fix superstream
2025-09-13 17:33:25 +00:00 · 2023-11-01 14:07:45 +00:00 · 2023-11-01 15:04:52 +01:00 · 2023-08-16 20:09:03 +01:00 · 2023-08-16 19:33:22 +01:00 · 2023-08-16 19:26:43 +02:00
23 changed files with 442 additions and 174 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+* @movie-web/core
+
+.github @binaryoverload
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+codeofconduct@movie-web.app.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,112 @@
+# Contributing Guidelines for movie-web
+
+Thank you for investing your time in contributing to our project! Your contribution will be reflected on [movie-web.app](https://movie-web.app).
+
+Please read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
+
+## Contents
+ - [New Contributor Guide](#new-contributor-guide)
+ - [Requesting a feature or reporting a bug](#requesting-a-feature-or-reporting-a-bug)
+   - [Discord Server](#discord-server)
+   - [GitHub Issues](#github-issues)
+ - [Before you start](#before-you-start)
+ - [Contributing](#before-you-start)
+   - [Recommended Development Environment](#recommended-development-environment)
+   - [Tips](#tips)
+   - [Language Contributions](#language-contributions)
+
+## New contributor guide
+
+To get an overview of the project, read the [README](README.md). Here are some resources to help you get started with open-source contributions:
+
+- [Finding ways to contribute to open-source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github)
+- [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git)
+- [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow)
+- [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests)
+
+
+## Requesting a feature or reporting a bug
+There are two places where to request features or report bugs:
+ - GitHub Issues
+ - The movie-web Discord server
+
+### Discord Server
+If you do not have a GitHub account or want to discuss a feature or bug with us before making an issue, you can join our Discord server.
+
+<a href="https://discord.movie-web.app"><img src="https://discord.com/api/guilds/871713465100816424/widget.png?style=banner2" alt="Discord Server"></a>
+
+### GitHub Issues
+To make a GitHub issue for movie-web, please visit the [new issue page](https://github.com/movie-web/movie-web/issues/new/choose) where you can pick either the "Bug Report" or "Feature Request" template.
+
+When filling out an issue template, please include as much detail as possible and any screenshots or console logs as appropriate.
+
+After an issue is created, it will be assigned either the https://github.com/movie-web/movie-web/labels/bug or https://github.com/movie-web/movie-web/labels/feature label, along with https://github.com/movie-web/movie-web/labels/awaiting-approval. One of our maintainers will review your issue and, if it's accepted, will set the https://github.com/movie-web/movie-web/labels/approved label.
+
+## Before you start!
+Before starting a contribution, please check your contribution is part of an open issue on [our issues page](https://github.com/movie-web/movie-web/issues?q=is%3Aopen+is%3Aissue+label%3Aapproved). 
+
+GitHub issues are how we track our bugs and feature requests that will be implemented into movie-web - all contributions **must** have an issue and be approved by a maintainer before a pull request can be worked on.
+
+If a pull request is opened before an issue is created and accepted, you may risk having your pull request rejected! Always check with us before starting work on a feature - we don't want to waste your time!
+
+> **Note**
+> The exception to this are language contributions, which are discussed in [this section](#language-contributions)
+
+Also, make sure that the issue you would like to work on has been given the https://github.com/movie-web/movie-web/labels/approved label by a maintainer. Otherwise, if we reject the issue, it means your work will have gone to waste!
+
+## Contributing
+If you're here because you'd like to work on an issue, amazing! Thank you for even considering contributing to movie-web; it means a lot :heart:
+
+Firstly, make sure you've read the [Before you start!](#before-you-start) section!
+
+When you have found a GitHub issue you would like to work on, you can request to be assigned to the issue by commenting on the GitHub issue.
+
+If you are assigned to an issue but can't complete it for whatever reason, no problem! Just let us know, and we will open up the issue to have someone else assigned.
+
+### Recommended Development Environment
+Our recommended development environment to work on movie-web is:
+- [Visual Studio Code](https://code.visualstudio.com/)
+- [ESLint Extension](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+- [EditorConfig Extension](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig)
+
+When opening Visual Studio Code, you will be prompted to install our recommended extensions if they are not installed for you.
+
+Our project is set up to enforce formatting and code style standards using ESLint. 
+
+### Tips
+Here are some tips to make sure that your pull requests are :pinched_fingers: first time:
+
+- KISS - Keep It Simple Soldier! - Simple code makes readable and efficient code!
+- Follow standard best practices for TypeScript and React.
+- Keep as much as possible to the style of movie-web. Look around our codebase to familiarise yourself with how we do things!
+- Ensure to take note of the ESLint errors and warnings! **Do not ignore them!** They are there for a reason.
+- Test, test, test! Make sure you thoroughly test the features you are contributing.
+
+### Language Contributions
+Language contributions help movie-web massively, allowing people worldwide to use our app!
+
+Like most apps, our translations are stored in `.json` files. Each language string has a unique key (For example, `notFound.genericTitle`) that references a language string in the appropriate language file.
+
+Each language file is called `translation.json` and is stored in the `src/setup/languages/<language code>/` folder. For example, the English language file is located at `src/setup/languages/en/translation.json`.
+
+> **Warning**
+>
+> Before you start a translation, please:
+> - Check there isn't an existing GitHub [issue](https://github.com/movie-web/movie-web/issues) or [pull request](https://github.com/movie-web/movie-web/pulls) open for the language.
+> - Make sure we aren't in the middle of a new feature update. When releasing major versions, we only accept changes to translations once the new version is complete. Otherwise, the language files would need to be updated.
+>
+> Please speak to us before starting a language PR. We want to use your time effectively.
+
+To make a translation:
+ - Copy the `en` folder inside the `src/setup/languages` folder
+ - Rename the copied folder to the 2-letter code for the country/language which is being translated.
+   - [Click this link to see a list of codes](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes). Use the codes in the `639-1` column!
+   - For example, Arabic is `ar` 
+ - Edit the language strings inside the `translation.json` file
+   - **Do not** edit the keys. Only edit the values.
+   - e.g. in `"stopEditing": "Stop editing",` - only change the `Stop editing` part, not the `stopEditing` part.
+ - In the `src/setup/i18n.ts` file:
+   - Import your new translation file, e.g. `import ar from "./locales/ar/translation.json";`
+   - Add your translation to the `locales` object (Look at other languages for an example)
+
+Once you have completed your translation, please open a pull request. We do not accept partial translations, so please ensure every language string is translated to the intended language.
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
-labels: ["bug"]
+labels: ["bug", "awaiting-approval"]
 assignees: []
 body:
  - type: markdown
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,7 +1,7 @@
-name: Feature request
+name: Feature Request
 description: Suggest a new feature
 title: "[Feature]: "
-labels: ["enhancement"]
+labels: ["feature", "awaiting-approval"]
 assignees: []
 body:
  - type: textarea
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+The movie-web maintainers only support the latest version of movie-web published at https://movie-web.app.
+
+Support is not provided for any forks or mirrors of movie-web.
+
+## Reporting a Vulnerability
+
+There are two ways you can contact the movie-web maintainers to report a vulnerability:
+ - Email [security@movie-web.app](mailto:security@movie-web.app)
+ - Report the vulnerability in the [movie-web Discord server](https://discord.movie-web.app)
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -0,0 +1,6 @@
+This pull request resolves #XXX
+
+ - [ ] I have read and agreed to the [code of conduct](https://github.com/movie-web/movie-web/blob/dev/.github/CODE_OF_CONDUCT.md).
+ - [ ] I have read and complied with the [contributing guidelines](https://github.com/movie-web/movie-web/blob/dev/.github/CONTRIBUTING.md).
+ - [ ] What I'm implementing was assigned to me and is an [approved issue](https://github.com/movie-web/movie-web/issues?q=is%3Aopen+is%3Aissue+label%3Aapproved). For reference, please take a look at our [GitHub projects](https://github.com/movie-web/movie-web/projects).
+ - [ ] I have tested all of my changes.
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 <a href="https://github.com/movie-web/movie-web/blob/master/LICENSE.md"><img alt="GitHub license" src="https://img.shields.io/github/license/movie-web/movie-web?style=flat-square"></a>
 <a href="https://github.com/movie-web/movie-web/network"><img alt="GitHub forks" src="https://img.shields.io/github/forks/movie-web/movie-web?style=flat-square"></a>
 <a href="https://github.com/movie-web/movie-web/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/movie-web/movie-web?style=flat-square"></a><br/>
-<a href="https://discord.gg/vXsRvye8BS"><img src="https://discordapp.com/api/guilds/871713465100816424/widget.png?style=banner2" alt="Discord Server"></a>
+<a href="https://discord.movie-web.app"><img src="https://discord.com/api/guilds/871713465100816424/widget.png?style=banner2" alt="Discord Server"></a>
 </p>

 movie-web is a web app for watching movies easily. Check it out at **[movie-web.app](https://movie-web.app)**.
--- a/SELFHOSTING.md
+++ b/SELFHOSTING.md
@@ -1,39 +1,41 @@
-# Selfhosting tutorial
+# Self-hosting tutorial

-> **Note:** We do not provide support on how to selfhost, if you cant figure it out then tough luck. Please do not make Github issues or ask in our Discord server for support on how to selfhost.
+> **Note**
+> We **do not** provide support on how to self-host. If you can't figure it out then tough luck. Please do not make GitHub issues or ask in our Discord server for support on how to self-host.

-So you wanna selfhost. This app is made of two parts:
+So you would like to self-host. This app is made of two parts:
 - The proxy
 - The client

 ## Hosting the proxy

-The proxy is made as a cloudflare worker, cloudflare has a generous free plan, so you don't need to pay anything unless you get hundreds of users.
+The proxy is made as a Cloudflare worker. Cloudflare has a generous free plan, so you don't need to pay anything unless you get hundreds of users.

-1. Create a cloudflare account at [https://dash.cloudflare.com](https://dash.cloudflare.com)
+1. Create a Cloudflare account at [https://dash.cloudflare.com](https://dash.cloudflare.com).
 2. Navigate to `Workers`.
-3. If it asks you, choose a subdomain
-4. If it asks for a workers plan, press "Continue with free"
-5. Create a new service with a name of your choice. Must be type `HTTP handler`
-6. On the service page, Click `Quick edit`
-7. Download the `worker.js` file from the latest release of the proxy: [https://github.com/movie-web/simple-proxy/releases/latest](https://github.com/movie-web/simple-proxy/releases/latest)
-8. Open the downloaded `worker.js` file in notepad, VScode or similar.
+3. If it asks you, choose a subdomain.
+4. If it asks for a workers plan, press "Continue with free".
+5. Create a new service with a name of your choice. Must be type `HTTP handler`.
+6. On the service page, Click `Quick edit`.
+7. Remove the template code in the quick edit window.
+7. Download the `worker.js` file from the latest release of the proxy: [https://github.com/movie-web/simple-proxy/releases/latest](https://github.com/movie-web/simple-proxy/releases/latest).
+8. Open the downloaded `worker.js` file in Notepad, Visual Studio Code or similar.
 9. Copy the text contents of the `worker.js` file.
-10. Paste the text contents into the edit screen of the cloudflare service worker.
+10. Paste the text contents into the edit screen of the Cloudflare service worker.
 11. Click `Save and deploy` and confirm.

-Your proxy is now hosted on cloudflare. Note the url of your worker. you will need it later.
+Your proxy is now hosted on Cloudflare. Note the url of your worker as you will need it later.

 ## Hosting the client

-1. Download the file `movie-web.zip` from the latest release: [https://github.com/movie-web/movie-web/releases/latest](https://github.com/movie-web/movie-web/releases/latest)
+1. Download the file `movie-web.zip` from the latest release: [https://github.com/movie-web/movie-web/releases/latest](https://github.com/movie-web/movie-web/releases/latest).
 2. Extract the zip file so you can edit the files.
-3. Open `config.js` in notepad, VScode or similar.
-4. Put your cloudflare proxy URL inbetween the double qoutes of `VITE_CORS_PROXY_URL: "",`. Make sure to not have a slash at the end of your URL.
+3. Open `config.js` in Notepad, Visual Studio Code or similar.
+4. Put your Cloudflare proxy URL in-between the double quotes of `VITE_CORS_PROXY_URL: ""`. Make sure to not have a slash at the end of your URL.

-   Example (THIS IS MINE, IT WONT WORK FOR YOU): `VITE_CORS_PROXY_URL: "https://test-proxy.test.workers.dev",`
-5. Put your TMDB read access token inside the quotes of `VITE_TMDB_API_KEY: "",`. You can generate it for free at [https://www.themoviedb.org/settings/api](https://www.themoviedb.org/settings/api).
+   Example (THIS IS AN EXAMPLE, IT WON'T WORK FOR YOU): `VITE_CORS_PROXY_URL: "https://test-proxy.test.workers.dev"`
+5. Put your TMDB read access token inside the quotes of `VITE_TMDB_READ_API_KEY: ""`. You can generate it for free at [https://www.themoviedb.org/settings/api](https://www.themoviedb.org/settings/api).
 6. Save the file

-Your client has been prepared, you can now host it on any webhost.
-It doesn't require php, its just a standard static page.
+Your client has now been prepared, you can now host it with any static website hosting (Common ones include [GitHub Pages](https://pages.github.com/), [Netlify](https://www.netlify.com/) and [Vercel](https://vercel.com/) but any will work!).
+It doesn't require PHP, it's just a standard static page.
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "movie-web",
-  "version": "3.1.1",
+  "version": "3.2.2",
  "private": true,
  "homepage": "https://movie-web.app",
  "dependencies": {
--- a/public/config.js
+++ b/public/config.js
@@ -1,5 +1,5 @@
 window.__CONFIG__ = {
  // url must NOT end with a slash
  VITE_CORS_PROXY_URL: "",
-  TMDB_READ_API_KEY: ""
+  VITE_TMDB_READ_API_KEY: ""
 };
--- a/src/backend/embeds/upcloud.ts
+++ b/src/backend/embeds/upcloud.ts
@@ -51,27 +51,35 @@ registerEmbedScraper({
      }
    );

-    let sources:
-      | {
-          file: string;
-          type: string;
+    let sources: { file: string; type: string } | null = null;
+
+    if (!isJSON(streamRes.sources)) {
+      const decryptionKey = JSON.parse(
+        await proxiedFetch<string>(
+          `https://raw.githubusercontent.com/enimax-anime/key/e4/key.txt`
+        )
+      ) as [number, number][];
+
+      let extractedKey = "";
+      const sourcesArray = streamRes.sources.split("");
+      for (const index of decryptionKey) {
+        for (let i: number = index[0]; i < index[1]; i += 1) {
+          extractedKey += streamRes.sources[i];
+          sourcesArray[i] = "";
        }
-      | string = streamRes.sources;
-
-    if (!isJSON(sources) || typeof sources === "string") {
-      const decryptionKey = await proxiedFetch<string>(
-        `https://raw.githubusercontent.com/enimax-anime/key/e4/key.txt`
-      );
-
-      const decryptedStream = AES.decrypt(sources, decryptionKey).toString(
-        enc.Utf8
-      );
+      }

+      const decryptedStream = AES.decrypt(
+        sourcesArray.join(""),
+        extractedKey
+      ).toString(enc.Utf8);
      const parsedStream = JSON.parse(decryptedStream)[0];
      if (!parsedStream) throw new Error("No stream found");
-      sources = parsedStream as { file: string; type: string };
+      sources = parsedStream;
    }

+    if (!sources) throw new Error("upcloud source not found");
+
    return {
      embedId: MWEmbedType.UPCLOUD,
      streamUrl: sources.file,
--- a/src/backend/providers/flixhq.ts
+++ b/src/backend/providers/flixhq.ts
@@ -1,128 +0,0 @@
-import { compareTitle } from "@/utils/titleMatch";
-
-import {
-  getMWCaptionTypeFromUrl,
-  isSupportedSubtitle,
-} from "../helpers/captions";
-import { mwFetch } from "../helpers/fetch";
-import { registerProvider } from "../helpers/register";
-import { MWCaption, MWStreamQuality, MWStreamType } from "../helpers/streams";
-import { MWMediaType } from "../metadata/types/mw";
-
-const flixHqBase = "https://consumet-api-clone.vercel.app/meta/tmdb"; // instance stolen from streaminal :)
-
-type FlixHQMediaType = "Movie" | "TV Series";
-interface FLIXMediaBase {
-  id: number;
-  title: string;
-  url: string;
-  image: string;
-  type: FlixHQMediaType;
-  releaseDate: string;
-}
-interface FLIXSubType {
-  url: string;
-  lang: string;
-}
-function convertSubtitles({ url, lang }: FLIXSubType): MWCaption | null {
-  if (lang.includes("(maybe)")) return null;
-  const supported = isSupportedSubtitle(url);
-  if (!supported) return null;
-  const type = getMWCaptionTypeFromUrl(url);
-  return {
-    url,
-    langIso: lang,
-    type,
-  };
-}
-
-const qualityMap: Record<string, MWStreamQuality> = {
-  "360": MWStreamQuality.Q360P,
-  "540": MWStreamQuality.Q540P,
-  "480": MWStreamQuality.Q480P,
-  "720": MWStreamQuality.Q720P,
-  "1080": MWStreamQuality.Q1080P,
-};
-
-function flixTypeToMWType(type: FlixHQMediaType) {
-  if (type === "Movie") return MWMediaType.MOVIE;
-  return MWMediaType.SERIES;
-}
-
-registerProvider({
-  id: "flixhq",
-  displayName: "FlixHQ",
-  rank: 100,
-  type: [MWMediaType.MOVIE, MWMediaType.SERIES],
-  async scrape({ media, episode, progress }) {
-    if (!this.type.includes(media.meta.type)) {
-      throw new Error("Unsupported type");
-    }
-    // search for relevant item
-    const searchResults = await mwFetch<any>(
-      `/${encodeURIComponent(media.meta.title)}`,
-      {
-        baseURL: flixHqBase,
-      }
-    );
-
-    const foundItem = searchResults.results.find((v: FLIXMediaBase) => {
-      if (v.type !== "Movie" && v.type !== "TV Series") return false;
-      return (
-        compareTitle(v.title, media.meta.title) &&
-        flixTypeToMWType(v.type) === media.meta.type &&
-        v.releaseDate === media.meta.year
-      );
-    });
-
-    if (!foundItem) throw new Error("No watchable item found");
-
-    // get media info
-    progress(25);
-    const mediaInfo = await mwFetch<any>(`/info/${foundItem.id}`, {
-      baseURL: flixHqBase,
-      params: {
-        type: flixTypeToMWType(foundItem.type),
-      },
-    });
-    if (!mediaInfo.id) throw new Error("No watchable item found");
-    // get stream info from media
-    progress(50);
-
-    let episodeId: string | undefined;
-    if (media.meta.type === MWMediaType.MOVIE) {
-      episodeId = mediaInfo.episodeId;
-    } else if (media.meta.type === MWMediaType.SERIES) {
-      const seasonNo = media.meta.seasonData.number;
-      const episodeNo = media.meta.seasonData.episodes.find(
-        (e) => e.id === episode
-      )?.number;
-
-      const season = mediaInfo.seasons.find((o: any) => o.season === seasonNo);
-      episodeId = season.episodes.find((o: any) => o.episode === episodeNo).id;
-    }
-    if (!episodeId) throw new Error("No watchable item found");
-    progress(75);
-    const watchInfo = await mwFetch<any>(`/watch/${episodeId}`, {
-      baseURL: flixHqBase,
-      params: {
-        id: mediaInfo.id,
-      },
-    });
-
-    if (!watchInfo.sources) throw new Error("No watchable item found");
-
-    // get best quality source
-    // comes sorted by quality in descending order
-    const source = watchInfo.sources[0];
-    return {
-      embeds: [],
-      stream: {
-        streamUrl: source.url,
-        quality: qualityMap[source.quality],
-        type: source.isM3U8 ? MWStreamType.HLS : MWStreamType.MP4,
-        captions: watchInfo.subtitles.map(convertSubtitles).filter(Boolean),
-      },
-    };
-  },
-});
--- a/src/backend/providers/flixhq/common.ts
+++ b/src/backend/providers/flixhq/common.ts
@@ -0,0 +1 @@
+export const flixHqBase = "https://flixhq.to";
--- a/src/backend/providers/flixhq/index.ts
+++ b/src/backend/providers/flixhq/index.ts
@@ -0,0 +1,36 @@
+import { MWEmbedType } from "@/backend/helpers/embed";
+import { registerProvider } from "@/backend/helpers/register";
+import { MWMediaType } from "@/backend/metadata/types/mw";
+import {
+  getFlixhqSourceDetails,
+  getFlixhqSources,
+} from "@/backend/providers/flixhq/scrape";
+import { getFlixhqId } from "@/backend/providers/flixhq/search";
+
+registerProvider({
+  id: "flixhq",
+  displayName: "FlixHQ",
+  rank: 100,
+  type: [MWMediaType.MOVIE, MWMediaType.SERIES],
+  async scrape({ media }) {
+    const id = await getFlixhqId(media.meta);
+    if (!id) throw new Error("flixhq no matching item found");
+
+    // TODO tv shows not supported. just need to scrape the specific episode sources
+
+    const sources = await getFlixhqSources(id);
+    const upcloudStream = sources.find(
+      (v) => v.embed.toLowerCase() === "upcloud"
+    );
+    if (!upcloudStream) throw new Error("upcloud stream not found for flixhq");
+
+    return {
+      embeds: [
+        {
+          type: MWEmbedType.UPCLOUD,
+          url: await getFlixhqSourceDetails(upcloudStream.episodeId),
+        },
+      ],
+    };
+  },
+});
--- a/src/backend/providers/flixhq/scrape.ts
+++ b/src/backend/providers/flixhq/scrape.ts
@@ -0,0 +1,41 @@
+import { proxiedFetch } from "@/backend/helpers/fetch";
+import { flixHqBase } from "@/backend/providers/flixhq/common";
+
+export async function getFlixhqSources(id: string) {
+  const type = id.split("/")[0];
+  const episodeParts = id.split("-");
+  const episodeId = episodeParts[episodeParts.length - 1];
+
+  const data = await proxiedFetch<string>(
+    `/ajax/${type}/episodes/${episodeId}`,
+    {
+      baseURL: flixHqBase,
+    }
+  );
+  const doc = new DOMParser().parseFromString(data, "text/html");
+
+  const sourceLinks = [...doc.querySelectorAll(".nav-item > a")].map((el) => {
+    const embedTitle = el.getAttribute("title");
+    const linkId = el.getAttribute("data-linkid");
+    if (!embedTitle || !linkId) throw new Error("invalid sources");
+    return {
+      embed: embedTitle,
+      episodeId: linkId,
+    };
+  });
+
+  return sourceLinks;
+}
+
+export async function getFlixhqSourceDetails(
+  sourceId: string
+): Promise<string> {
+  const jsonData = await proxiedFetch<Record<string, any>>(
+    `/ajax/sources/${sourceId}`,
+    {
+      baseURL: flixHqBase,
+    }
+  );
+
+  return jsonData.link;
+}
--- a/src/backend/providers/flixhq/search.ts
+++ b/src/backend/providers/flixhq/search.ts
@@ -0,0 +1,43 @@
+import { proxiedFetch } from "@/backend/helpers/fetch";
+import { MWMediaMeta } from "@/backend/metadata/types/mw";
+import { flixHqBase } from "@/backend/providers/flixhq/common";
+import { compareTitle } from "@/utils/titleMatch";
+
+export async function getFlixhqId(meta: MWMediaMeta): Promise<string | null> {
+  const searchResults = await proxiedFetch<string>(
+    `/search/${meta.title.replaceAll(/[^a-z0-9A-Z]/g, "-")}`,
+    {
+      baseURL: flixHqBase,
+    }
+  );
+
+  const doc = new DOMParser().parseFromString(searchResults, "text/html");
+  const items = [...doc.querySelectorAll(".film_list-wrap > div.flw-item")].map(
+    (el) => {
+      const id = el
+        .querySelector("div.film-poster > a")
+        ?.getAttribute("href")
+        ?.slice(1);
+      const title = el
+        .querySelector("div.film-detail > h2 > a")
+        ?.getAttribute("title");
+      const year = el.querySelector(
+        "div.film-detail > div.fd-infor > span:nth-child(1)"
+      )?.textContent;
+
+      if (!id || !title || !year) return null;
+      return {
+        id,
+        title,
+        year,
+      };
+    }
+  );
+
+  const matchingItem = items.find(
+    (v) => v && compareTitle(meta.title, v.title) && meta.year === v.year
+  );
+
+  if (!matchingItem) return null;
+  return matchingItem.id;
+}
--- a/src/backend/providers/gomovies.ts
+++ b/src/backend/providers/gomovies.ts
@@ -103,7 +103,7 @@ registerProvider({
      )?.number;

      const targetEpisode = episodesData.find((ep) =>
-        ep.number ? +ep.number : ep.number === episodeNumber
+        ep.number ? +ep.number === episodeNumber : false
      );

      if (!targetEpisode?.dataId) throw new Error("Episode not found");
--- a/src/backend/providers/hdwatched.ts
+++ b/src/backend/providers/hdwatched.ts
@@ -120,6 +120,7 @@ registerProvider({
  id: "hdwatched",
  displayName: "HDwatched",
  rank: 150,
+  disabled: true, // very slow, haven't seen it work for a while
  type: [MWMediaType.MOVIE, MWMediaType.SERIES],
  async scrape(options) {
    const { media, progress } = options;
--- a/src/backend/providers/sflix.ts
+++ b/src/backend/providers/sflix.ts
@@ -9,6 +9,7 @@ registerProvider({
  id: "sflix",
  displayName: "Sflix",
  rank: 50,
+  disabled: true, // domain dead
  type: [MWMediaType.MOVIE, MWMediaType.SERIES],
  async scrape({ media, episode, progress }) {
    let searchQuery = `${media.meta.title} `;
--- a/src/backend/providers/superstream/index.ts
+++ b/src/backend/providers/superstream/index.ts
@@ -148,13 +148,13 @@ registerProvider({
  async scrape({ media, episode, progress }) {
    // Find Superstream ID for show
    const searchQuery = {
-      module: "Search3",
+      module: "Search4",
      page: "1",
      type: "all",
      keyword: media.meta.title,
      pagelimit: "20",
    };
-    const searchRes = (await get(searchQuery, true)).data;
+    const searchRes = (await get(searchQuery, true)).data.list;
    progress(33);

    const superstreamEntry = searchRes.find(
@@ -248,6 +248,7 @@ registerProvider({
    const mappedCaptions = subtitleRes.list
      .map(convertSubtitles)
      .filter(Boolean);
+
    return {
      embeds: [],
      stream: {
--- a/src/components/media/MediaCard.tsx
+++ b/src/components/media/MediaCard.tsx
@@ -117,7 +117,7 @@ function MediaCardContent({
            />
          </div>
        </div>
-        <h1 className="mb-1 max-h-[4.5rem] text-ellipsis break-words font-bold text-white line-clamp-3">
+        <h1 className="mb-1 line-clamp-3 max-h-[4.5rem] text-ellipsis break-words font-bold text-white">
          <span>{media.title}</span>
        </h1>
        <DotList className="text-xs" content={dotListContent} />
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -42,5 +42,5 @@ module.exports = {
      animation: { "loading-pin": "loading-pin 1.8s ease-in-out infinite" }
    }
  },
-  plugins: [require("tailwind-scrollbar"), require("@tailwindcss/line-clamp")]
+  plugins: [require("tailwind-scrollbar")]
 };
Author	SHA1	Message	Date
William Oldham	bb8b21324b	Merge pull request #475 from movie-web/dev Fix superstream	2023-11-01 14:07:45 +00:00
Jip Fr	53fe6031d1	Fix superstream	2023-11-01 15:04:52 +01:00
William Oldham	ee9400373d	Merge pull request #409 from movie-web/dev Release 3.2.1	2023-08-16 20:09:03 +01:00
William Oldham	6c8cc63cbc	Merge pull request #408 from movie-web/gone-is-fast-cdn Goodbye faster cdn	2023-08-16 19:33:22 +01:00
mrjvs	8c105e78b5	bump version	2023-08-16 19:26:43 +02:00
mrjvs	28f253c542	Remove faster cdn, as its broken	2023-08-16 19:26:29 +02:00
William Oldham	38fa25da2c	Merge pull request #405 from movie-web/dev Version 3.2.0	2023-08-15 22:33:15 +01:00
mrjvs	efb9a7a076	bump version	2023-08-15 23:30:41 +02:00
William Oldham	5eab635f19	Merge pull request #404 from movie-web/more-providers Updated providers	2023-08-15 22:25:29 +01:00
mrjvs	c1dceab8eb	Fix class sorting	2023-08-15 23:17:57 +02:00
mrjvs	e202229766	add todo	2023-08-15 23:04:01 +02:00
mrjvs	2e3684eaad	rip out consumet and fix upcloud	2023-08-15 22:46:48 +02:00
mrjvs	31fcd22822	Make superstream a fast boi	2023-08-15 20:19:25 +02:00
mrjvs	1524a3af39	faster superstream url	2023-08-15 20:13:35 +02:00
mrjvs	072b2d134b	Disabled broken providers	2023-08-15 20:10:51 +02:00
William Oldham	606e55d552	Create CODEOWNERS	2023-08-14 23:28:30 +01:00
William Oldham	0b8aeb1832	Merge pull request #391 from movie-web/dev Patch for FlixHQ	2023-07-27 23:09:12 +01:00
William Oldham	3bd2bb4b2c	chore(flixhq): remove wrong comment	2023-07-27 23:09:03 +01:00
William Oldham	6e8e323417	fix(flixhq): change consumet api to official URL	2023-07-27 23:05:26 +01:00
William Oldham	50fdf230a1	Merge branch 'master' into dev	2023-07-27 22:53:35 +01:00
St Peter and St Pauls Catholic Voluntary Academy	765cf2a17a	chore: bump version for FlixHQ patch	2023-07-27 22:51:34 +01:00
William Oldham	2d431595cd	Merge pull request #390 from kacperkwapisz/patch-1 Update flixhq.ts	2023-07-27 22:47:50 +01:00
Kacper Kwapisz	3bceb2a905	Update flixhq.ts flixHqBase changed. Old: `https://consumet-api-clone.vercel.app` New: `https://consumet-api-clone-six.vercel.app`	2023-07-27 13:39:09 +02:00
William Oldham	e9c0e64cf0	Merge pull request #384 from movie-web/dev v3.1.3	2023-07-13 18:41:11 +01:00
William Oldham	d9c944a8fa	chore: bump version number for patch fix	2023-07-13 18:37:38 +01:00
William Oldham	bd40165bc2	docs(pr-template): minor changes to pr template Remove heading Update closes issue to conform to the spec fix grammary	2023-07-13 18:37:03 +01:00
William Oldham	65c7a461d7	Merge pull request #383 from movie-web/fix-ep Fix wrong targeted episode on GoMovies	2023-07-13 18:32:32 +01:00
mrjvs	3103ecd004	Fix wrong targeted episode on GoMovies	2023-07-13 19:15:57 +02:00
William Oldham	c744d3bc7d	Merge pull request #352 from movie-web/meta/code-of-conduct Community Standards	2023-07-06 17:46:49 +01:00
William Oldham	e0009c8f29	docs(contributing): add new line to warning message	2023-07-04 17:16:21 +01:00
William Oldham	f6af13f7a6	docs(contributing): change issue page link to one with approved label filter	2023-07-04 17:16:04 +01:00
William Oldham	f7ebb6ed89	docs(contributing): fix contents link	2023-07-04 17:12:46 +01:00
William Oldham	468ee4dcf6	docs(pr-template): add pull request template	2023-07-04 17:08:33 +01:00
William Oldham	bc21fa4749	docs(contributing): rename planned label to approved	2023-07-03 19:00:56 +01:00
William Oldham	3cdb056d43	docs(contributing): fix grammar error in language contributions	2023-07-03 18:39:31 +01:00
William Oldham	6a926ec7fe	docs(contributing): reword note to be based off the planned label rather than awaiting approval	2023-07-03 18:30:28 +01:00
William Oldham	0c18d8f04b	docs(contributing): add note about editorconfig ext and vsc auto install	2023-07-03 18:29:56 +01:00
William Oldham	6705683c19	doc(selfhosting): update example message to be more clear Co-authored-by: Jip Fr <jipfrijlink@gmail.com>	2023-07-03 18:14:17 +01:00
William Oldham	91f9f56174	doc: use discord.com instead of discordapp.com	2023-07-03 18:08:03 +01:00
William Oldham	ce71a2d638	docs(selfhosting): match update with dev branch	2023-07-03 18:07:45 +01:00
William Oldham	d2d710ad37	Merge branch 'dev' into meta/code-of-conduct	2023-07-03 17:59:45 +01:00
William Oldham	8d82ee5f88	docs(contributing): proof reading pass	2023-07-03 17:52:09 +01:00
William Oldham	b1663a919f	docs(contributing): add links and tweak text of language guidelines	2023-07-03 10:34:39 +01:00
William Oldham	bc3848fae4	docs(contributing): Add the meat of the language contribution section	2023-07-03 10:31:39 +01:00
William Oldham	76a12b8f7a	docs(contributing): add start of language contributions	2023-07-02 23:26:17 +01:00
William Oldham	8d0cd59d85	docs(contributing): Add a contents sections	2023-07-02 23:26:02 +01:00
William Oldham	8b1a5bce4a	doc(selfhosting): emphasis DO NOT and fix further grammar	2023-07-02 16:56:20 +01:00
William Oldham	9b852f12cf	doc(selfhosting): tweak text for grammar and add links to common services	2023-07-02 16:54:49 +01:00
William Oldham	81f0425755	Apply suggestions from code review Co-authored-by: James Hawkins <jhawki2005@gmail.com>	2023-06-25 18:29:50 +01:00
William Oldham	a9a3eac4ea	Add contributing, dev env and tips section to CONTRIBUTING.md	2023-06-24 21:52:16 +01:00
mrjvs	06e54886e5	Merge branch 'dev'	2023-06-23 23:04:52 +02:00
mrjvs	ce00f1c5c2	version bump	2023-06-23 23:04:42 +02:00
mrjvs	244c603ad7	Merge branch 'dev'	2023-06-23 23:00:40 +02:00
mrjvs	ea52156bb8	fix config.js preset and typo in documentation	2023-06-23 23:00:28 +02:00
William Oldham	03d414a200	Add initial content to contributing guidelines	2023-06-20 21:04:29 +01:00
William Oldham	81b22b0473	Add "awaiting-approval" label to issue templates	2023-06-20 21:04:29 +01:00
William Oldham	5c50155718	Update Discord invite to discord.movie-web.app	2023-06-20 21:04:29 +01:00
William Oldham	102d252f82	Move code of conduct and security police into .github folder	2023-06-20 21:04:29 +01:00
William Oldham	969aa6156e	Create SECURITY.md	2023-06-20 21:04:29 +01:00
William Oldham	d19f0cf305	Create CODE_OF_CONDUCT.md	2023-06-20 21:04:29 +01:00
				`@@ -0,0 +1 @@`
				`export const flixHqBase = "https://flixhq.to";`