package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.135.5",
+    "version": "1.135.4",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.135.5",
+    "version": "1.135.4",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {

src/scrapers/mindgeek.js

@@ -121,10 +121,9 @@ function scrapeScene(data, url, _site, networkName) {
 }
 
 function getUrl(site) {
-	const { searchParams } = new URL(site.url);
+	const { search } = new URL(site.url);
 
-	// if (search.match(/\?site=\d+/)) {
-	if (searchParams.has('site')) {
+	if (search.match(/\?site=\d+/)) {
 		return site.url;
 	}
 
@@ -143,12 +142,11 @@ function getUrl(site) {
 	throw new Error(`Mind Geek site '${site.name}' (${site.url}) not supported`);
 }
 
-async function getSession(url, site) {
+async function getSession(url) {
 	const cookieJar = new CookieJar();
 	const session = bhttp.session({ cookieJar });
 
-	// const res = await session.get(url);
-	const res = await session.get(site.parameters?.siteId ? site.parent.url : site.url);
+	const res = await session.get(url);
 
 	if (res.statusCode === 200) {
 		const cookieString = await cookieJar.getCookieStringAsync(url);
@@ -200,10 +198,10 @@ function scrapeProfile(data, html, releases = [], networkName) {
 
 async function fetchLatest(site, page = 1) {
 	const url = getUrl(site);
-	const { searchParams } = new URL(url);
-	const siteId = searchParams.get('site');
+	const { search } = new URL(url);
+	const siteId = new URLSearchParams(search).get('site');
 
-	const { session, instanceToken } = await getSession(url, site);
+	const { session, instanceToken } = await getSession(url);
 
 	const beforeDate = moment().add('1', 'day').format('YYYY-MM-DD');
 	const limit = 10;
@@ -228,7 +226,7 @@ async function fetchLatest(site, page = 1) {
 
 async function fetchUpcoming(site) {
 	const url = getUrl(site);
-	const { session, instanceToken } = await getSession(url, site);
+	const { session, instanceToken } = await getSession(url);
 
 	const apiUrl = 'https://site-api.project1service.com/v2/upcoming-releases';
 
@@ -254,7 +252,7 @@ async function fetchScene(url, site, baseScene) {
 	}
 
 	const entryId = url.match(/\d+/)[0];
-	const { session, instanceToken } = await getSession(url, site);
+	const { session, instanceToken } = await getSession(url);
 
 	const res = await session.get(`https://site-api.project1service.com/v2/releases/${entryId}`, {
 		headers: {
@@ -271,7 +269,7 @@ async function fetchScene(url, site, baseScene) {
 
 async function fetchProfile({ name: actorName }, networkOrNetworkSlug, actorPath = 'model') {
 	const url = `https://www.${networkOrNetworkSlug.slug || networkOrNetworkSlug}.com`;
-	const { session, instanceToken } = await getSession(url, networkOrNetworkSlug);
+	const { session, instanceToken } = await getSession(url);
 
 	const res = await session.get(`https://site-api.project1service.com/v1/actors/?search=${encodeURI(actorName)}`, {
 		headers: {