Final Fixes

This commit is contained in:
memecornucopia
2024-02-17 16:41:19 -05:00
parent ac2261bbd1
commit 8e4a87421c
2 changed files with 10 additions and 27 deletions

View File

@@ -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/',
},
},
},

View File

@@ -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 }),
},
});