diff --git a/assets/js/get-date-range.js b/assets/js/get-date-range.js index b30e3aae..573395bb 100644 --- a/assets/js/get-date-range.js +++ b/assets/js/get-date-range.js @@ -1,13 +1,16 @@ +import utc from 'dayjs/plugin/utc'; import dayjs from 'dayjs'; +dayjs.extend(utc); + const dateRanges = { latest: () => ({ after: '1900-01-01 00:00:00', - before: dayjs().format('YYYY-MM-DD HH:mm:ss'), + before: dayjs.utc().format('YYYY-MM-DD HH:mm:ss'), orderBy: 'DATE_DESC', }), upcoming: () => ({ - after: dayjs().format('YYYY-MM-DD HH:mm:ss'), + after: dayjs.utc().format('YYYY-MM-DD HH:mm:ss'), before: '2100-01-01 00:00:00', orderBy: 'DATE_ASC', }), diff --git a/public/img/tags/dap/9.jpeg b/public/img/tags/dap/9.jpeg index b2b5ff64..8228eb8e 100644 Binary files a/public/img/tags/dap/9.jpeg and b/public/img/tags/dap/9.jpeg differ diff --git a/public/img/tags/dap/lazy/9.jpeg b/public/img/tags/dap/lazy/9.jpeg index ba012d76..bfab830c 100644 Binary files a/public/img/tags/dap/lazy/9.jpeg and b/public/img/tags/dap/lazy/9.jpeg differ diff --git a/public/img/tags/dap/thumbs/9.jpeg b/public/img/tags/dap/thumbs/9.jpeg index e8e3058b..42ad69df 100644 Binary files a/public/img/tags/dap/thumbs/9.jpeg and b/public/img/tags/dap/thumbs/9.jpeg differ diff --git a/seeds/04_media.js b/seeds/04_media.js index e35e5c3f..87f97e35 100644 --- a/seeds/04_media.js +++ b/seeds/04_media.js @@ -685,7 +685,7 @@ const tagPhotos = [ ['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'], ['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'], ['dap', 6, 'Sheena Shaw in "Ass Worship 14" for Jules Jordan'], - ['dap', 9, 'Polly Pons in LegalPorno GIO1520'], + ['dap', 9, 'Vicky Sol in GIO1547 for LegalPorno'], ['dap', 1, 'Ria Sunn in SZ1801 for LegalPorno'], ['dap', 2, 'Lana Rhoades in "Lana Rhoades Unleashed" for HardX'], ['dap', 5, 'Riley Reid in "The Gangbang of Riley Reid" for Jules Jordan'], diff --git a/src/scrapers/mindgeek.js b/src/scrapers/mindgeek.js index 4becb564..c0b845b6 100644 --- a/src/scrapers/mindgeek.js +++ b/src/scrapers/mindgeek.js @@ -146,12 +146,16 @@ async function getSession(url) { const cookieJar = new CookieJar(); const session = bhttp.session({ cookieJar }); - await session.get(url); + const res = await session.get(url); - const cookieString = await cookieJar.getCookieStringAsync(url); - const { instance_token: instanceToken } = cookieToData(cookieString); + if (res.statusCode === 200) { + const cookieString = await cookieJar.getCookieStringAsync(url); + const { instance_token: instanceToken } = cookieToData(cookieString); - return { session, instanceToken }; + return { session, instanceToken }; + } + + throw new Error(`Failed to acquire MindGeek session: ${res.statusCode}`); } function scrapeProfile(data, html, releases = [], networkName) { @@ -242,11 +246,14 @@ async function fetchUpcoming(site) { } async function fetchScene(url, site, baseScene) { + if (baseScene?.entryId) { + // overview and deep data is the same, don't hit server unnecessarily + return baseScene; + } + const entryId = url.match(/\d+/)[0]; const { session, instanceToken } = await getSession(url); - console.log(baseScene); - const res = await session.get(`https://site-api.project1service.com/v2/releases/${entryId}`, { headers: { Instance: instanceToken,