From 8e4a87421c41ea34906dc6e7b7a4512c2d2b1d70 Mon Sep 17 00:00:00 2001
From: memecornucopia <memecornucopia@gmail.com>
Date: Sat, 17 Feb 2024 16:41:19 -0500
Subject: [PATCH] Final Fixes

---
 src/providers/embeds/dood.ts   | 10 +++++-----
 src/providers/embeds/wootly.ts | 27 +++++----------------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/providers/embeds/dood.ts b/src/providers/embeds/dood.ts
index 7a5fba1..3dd5d05 100644
--- a/src/providers/embeds/dood.ts
+++ b/src/providers/embeds/dood.ts
@@ -9,7 +9,7 @@ export const doodScraper = makeEmbed({
   name: 'dood',
   rank: 173,
   async scrape(ctx) {
-    const baseUrl = 'https://do0od.com';
+    const baseUrl = 'https://d0000d.com';
 
     const id = ctx.url.split('/d/')[1] || ctx.url.split('/e/')[1];
 
@@ -18,17 +18,17 @@ export const doodScraper = makeEmbed({
       baseUrl,
     });
 
-    const dataForLater = doodData.match(/a\+"\?token=([^"]+)/)?.[1];
+    const dataForLater = doodData.match(/\?token=([^&]+)&expiry=/)?.[1];
     const path = doodData.match(/\$\.get\('\/pass_md5([^']+)/)?.[1];
 
     const doodPage = await ctx.proxiedFetcher<string>(`/pass_md5${path}`, {
       headers: {
-        referer: `${baseUrl}/e/${id}`,
+        Referer: `${baseUrl}/e/${id}`,
       },
       method: 'GET',
       baseUrl,
     });
-    const downloadURL = `${doodPage}${nanoid()}?token=${dataForLater}${Date.now()}`;
+    const downloadURL = `${doodPage}${nanoid()}?token=${dataForLater}&expiry=${Date.now()}`;
 
     return {
       stream: [
@@ -42,7 +42,7 @@ export const doodScraper = makeEmbed({
               type: 'mp4',
               url: downloadURL,
               headers: {
-                referer: 'https://do0od.com/',
+                Referer: 'https://d0000d.com/',
               },
             },
           },
diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
index 3d75cbb..0119926 100644
--- a/src/providers/embeds/wootly.ts
+++ b/src/providers/embeds/wootly.ts
@@ -17,13 +17,7 @@ export const wootlyScraper = makeEmbed({
     });
 
     const cookies = parseSetCookie(wootlyData.headers.get('Set-Cookie') || '');
-    let wootssesCookie = '';
-    let cookie = '';
-
-    if (cookies && cookies.wootsses) {
-      wootssesCookie = cookies.wootsses.value;
-      cookie = makeCookieHeader({ wootsses: wootssesCookie });
-    }
+    const wootssesCookie = cookies.wootsses.value;
 
     let $ = load(wootlyData.body); // load the html data
     const iframeSrc = $('iframe').attr('src') ?? '';
@@ -32,24 +26,18 @@ export const wootlyScraper = makeEmbed({
       method: 'GET',
       readHeaders: ['Set-Cookie'],
       headers: {
-        cookie,
+        cookie: makeCookieHeader({ wootsses: wootssesCookie }),
       },
     });
 
     const woozCookies = parseSetCookie(woozCookieRequest.headers.get('Set-Cookie') || '');
-    let woozCookie = '';
-    cookie = '';
-
-    if (cookies && woozCookies.wooz) {
-      woozCookie = woozCookies.wooz.value;
-      cookie = makeCookieHeader({ wooz: woozCookie });
-    }
+    const woozCookie = woozCookies.wooz.value;
 
     const iframeData = await ctx.proxiedFetcher<string>(iframeSrc, {
       method: 'POST',
       body: new URLSearchParams({ qdf: '1' }),
       headers: {
-        cookie,
+        cookie: makeCookieHeader({ wooz: woozCookie }),
         Referer: iframeSrc,
       },
     });
@@ -63,18 +51,13 @@ export const wootlyScraper = makeEmbed({
     const vd = scriptText.match(/vd=([^,]+)/)?.[0].replace(/vd=|["\s]/g, '');
 
     if (!tk || !vd) throw new Error('wootly source not found');
-    cookie = '';
-
-    if (woozCookie && wootssesCookie !== '') {
-      cookie = makeCookieHeader({ wooz: woozCookie, wootsses: wootssesCookie });
-    }
 
     const url = await ctx.proxiedFetcher<string>(`/grabd`, {
       baseUrl,
       query: { t: tk, id: vd },
       method: 'GET',
       headers: {
-        cookie,
+        cookie: makeCookieHeader({ wooz: woozCookie, wootsses: wootssesCookie }),
       },
     });