From 7e1c897e30995fb92eeef50dd5e9405352710b66 Mon Sep 17 00:00:00 2001
From: Jorrin <jorrinkievit@hotmail.com>
Date: Fri, 5 Jan 2024 21:23:32 +0100
Subject: [PATCH] fix ranks and feedback

---
 src/providers/embeds/closeload.ts         |  2 +-
 src/providers/embeds/ridoo.ts             | 16 ++--------------
 src/providers/sources/ridomovies/index.ts |  5 +++--
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/providers/embeds/closeload.ts b/src/providers/embeds/closeload.ts
index e8d47dd..ebe842c 100644
--- a/src/providers/embeds/closeload.ts
+++ b/src/providers/embeds/closeload.ts
@@ -12,7 +12,7 @@ const referer = 'https://ridomovies.tv/';
 export const closeLoadScraper = makeEmbed({
   id: 'closeload',
   name: 'CloseLoad',
-  rank: 501,
+  rank: 106,
   async scrape(ctx) {
     const baseUrl = new URL(ctx.url).origin;
 
diff --git a/src/providers/embeds/ridoo.ts b/src/providers/embeds/ridoo.ts
index 326fc34..d7f5df5 100644
--- a/src/providers/embeds/ridoo.ts
+++ b/src/providers/embeds/ridoo.ts
@@ -1,6 +1,3 @@
-import { load } from 'cheerio';
-import { unpack } from 'unpacker';
-
 import { flags } from '@/entrypoint/utils/targets';
 import { NotFoundError } from '@/utils/errors';
 
@@ -11,24 +8,15 @@ const referer = 'https://ridomovies.tv/';
 export const ridooScraper = makeEmbed({
   id: 'ridoo',
   name: 'Ridoo',
-  rank: 500,
+  rank: 105,
   async scrape(ctx) {
     const res = await ctx.proxiedFetcher<string>(ctx.url, {
       headers: {
         referer,
       },
     });
-    const $ = load(res);
-    const evalCode = $('script')
-      .filter((_, el) => {
-        const script = $(el);
-        return (script.attr('type') === 'text/javascript' && script.html()?.includes('eval')) ?? false;
-      })
-      .html();
-    if (!evalCode) throw new Error("Couldn't find eval code");
-    const decoded = unpack(evalCode);
     const regexPattern = /file:"([^"]+)"/g;
-    const url = regexPattern.exec(decoded)?.[1];
+    const url = regexPattern.exec(res)?.[1];
     if (!url) throw new NotFoundError('Unable to find source url');
 
     return {
diff --git a/src/providers/sources/ridomovies/index.ts b/src/providers/sources/ridomovies/index.ts
index 2335149..f028875 100644
--- a/src/providers/sources/ridomovies/index.ts
+++ b/src/providers/sources/ridomovies/index.ts
@@ -16,10 +16,11 @@ const universalScraper = async (ctx: MovieScrapeContext | ShowScrapeContext) =>
   const searchResult = await ctx.proxiedFetcher<SearchResult>('/search', {
     baseUrl: ridoMoviesApiBase,
     query: {
-      q: encodeURIComponent(ctx.media.title),
+      q: ctx.media.title,
     },
   });
   const show = searchResult.data.items[0];
+  if (!show) throw new NotFoundError('No watchable item found');
 
   let iframeSourceUrl = `/${show.fullSlug}/videos`;
 
@@ -67,7 +68,7 @@ const universalScraper = async (ctx: MovieScrapeContext | ShowScrapeContext) =>
 export const ridooMoviesScraper = makeSourcerer({
   id: 'ridomovies',
   name: 'RidoMovies',
-  rank: 500,
+  rank: 105,
   flags: [flags.CORS_ALLOWED],
   scrapeMovie: universalScraper,
   scrapeShow: universalScraper,