package-lock.json

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

package.json

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

seeds/01_networks.js

@@ -262,9 +262,6 @@ const networks = [
 		name: 'Girlsway',
 		url: 'https://www.girlsway.com',
 		description: 'Girlsway.com has the best lesbian porn videos online! The hottest pornstars & first time lesbians in real girl on girl sex, tribbing, squirting & pussy licking action right HERE!',
-		parameters: {
-			layout: 'api',
-		},
 		parent: 'gamma',
 	},
 	{
@@ -447,9 +444,6 @@ const networks = [
 		name: 'Pure Taboo',
 		url: 'https://www.puretaboo.com',
 		description: 'PureTaboo.com is the ultimate site for family taboo porn, featuring submissive teens & virgins in rough sex videos in ultra 4k HD.',
-		parameters: {
-			layout: 'api',
-		},
 		parent: 'gamma',
 	},
 	{
@@ -539,9 +533,6 @@ const networks = [
 		name: 'XEmpire',
 		url: 'https://www.xempire.com',
 		description: 'XEmpire.com brings you today\'s top pornstars in beautifully shot, HD sex scenes across 4 unique porn sites of gonzo porn, interracial, lesbian & erotica!',
-		parameters: {
-			actorScenes: 'https://www.xempire.com/en/videos/xempire/latest/{page}/All-Categories/0{actorPath}',
-		},
 		parent: 'gamma',
 	},
 	{
@@ -549,9 +540,6 @@ const networks = [
 		name: 'Zero Tolerance',
 		alias: ['ztod'],
 		url: 'http://www.ztod.com',
-		parameters: {
-			layout: 'api',
-		},
 		parent: 'gamma',
 	},
 ];

seeds/02_sites.js

@@ -1627,9 +1627,6 @@ const sites = [
 		alias: ['burna'],
 		url: 'https://www.burningangel.com',
 		independent: true,
-		parameters: {
-			layout: 'api',
-		},
 		parent: 'gamma',
 	},
 	// CHERRY PIMPS
@@ -3630,7 +3627,7 @@ const sites = [
 		url: 'https://cospimps.com',
 		parent: 'jayrock',
 		parameters: {
-			layout: 'api',
+			useApi: true,
 			/* Gamma scenes are out of date
 			referer: 'https://www.21sextury.com',
 			scene: false,
@@ -9427,9 +9424,6 @@ const sites = [
 		url: 'https://www.wicked.com',
 		description: 'Welcome to the new Wicked.com! Watch over 25 years of Wicked Pictures\' brand of award-winning porn for couples and women in 4k HD movies & xxx videos',
 		independent: true,
-		parameters: {
-			layout: 'api',
-		},
 		parent: 'gamma',
 	},
 	// XEMPIRE

src/scrapers/burningangel.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma');
+
+module.exports = {
+	fetchLatest: fetchApiLatest,
+	fetchProfile: fetchApiProfile,
+	fetchScene,
+	fetchUpcoming: fetchApiUpcoming,
+};

src/scrapers/girlsway.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const { fetchApiLatest, fetchApiUpcoming, fetchScene } = require('./gamma');
+
+
+module.exports = {
+	fetchLatest: fetchApiLatest,
+	fetchScene,
+	fetchUpcoming: fetchApiUpcoming,
+};

src/scrapers/jayrock.js

@@ -178,6 +178,10 @@ async function fetchLatestApi(channel, page = 1) {
 }
 
 async function fetchLatest(channel, page = 1, options, preData) {
+	if (channel.parameters?.useApi) {
+		return fetchLatestApi(channel, page, options, preData);
+	}
+
 	if (channel.parameters?.useGamma) {
 		return fetchApiLatest(channel, page, preData, options, false);
 	}
@@ -207,6 +211,10 @@ async function fetchSceneApi(url, channel, baseRelease) {
 }
 
 async function fetchScene(url, channel) {
+	if (channel.parameters?.useApi) {
+		return fetchSceneApi(url, channel);
+	}
+
 	const res = await qu.get(url);
 
 	if (res.ok) {
@@ -219,8 +227,4 @@ async function fetchScene(url, channel) {
 module.exports = {
 	fetchLatest,
 	fetchScene,
-	api: {
-		fetchLatest: fetchLatestApi,
-		fetchScene: fetchSceneApi,
-	},
 };

src/scrapers/puretaboo.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const { fetchApiLatest, fetchApiUpcoming, fetchScene } = require('./gamma');
+
+module.exports = {
+	fetchLatest: fetchApiLatest,
+	fetchScene,
+	fetchUpcoming: fetchApiUpcoming,
+};

src/scrapers/scrapers.js

@@ -10,6 +10,7 @@ const bamvisions = require('./bamvisions');
 const bang = require('./bang');
 const bangbros = require('./bangbros');
 const blowpass = require('./blowpass');
+const burningangel = require('./burningangel');
 const cherrypimps = require('./cherrypimps');
 const czechav = require('./czechav');
 const ddfnetwork = require('./ddfnetwork');
@@ -23,6 +24,7 @@ const firstanalquest = require('./firstanalquest');
 const fcuk = require('./fcuk');
 const fullpornnetwork = require('./fullpornnetwork');
 const gamma = require('./gamma');
+const girlsway = require('./girlsway');
 const hitzefrei = require('./hitzefrei');
 const hookuphotshot = require('./hookuphotshot');
 const hush = require('./hush');
@@ -56,6 +58,7 @@ const pascalssubsluts = require('./pascalssubsluts'); // reserved keyword
 const pierrewoodman = require('./pierrewoodman');
 const pinkyxxx = require('./pinkyxxx');
 const privateNetwork = require('./private'); // reserved keyword
+const puretaboo = require('./puretaboo');
 const realitykings = require('./realitykings');
 const score = require('./score');
 const teamskeet = require('./teamskeet');
@@ -68,7 +71,9 @@ const vivid = require('./vivid');
 const vixen = require('./vixen');
 const vogov = require('./vogov');
 const whalemember = require('./whalemember');
+const wicked = require('./wicked');
 const xempire = require('./xempire');
+const zerotolerance = require('./zerotolerance');
 
 // profiles
 const boobpedia = require('./boobpedia');
@@ -89,6 +94,7 @@ const scrapers = {
 		bangbros,
 		blowpass,
 		brazzers: mindgeek,
+		burningangel,
 		cherrypimps,
 		czechav,
 		pornworld: ddfnetwork,
@@ -105,6 +111,7 @@ const scrapers = {
 		fullpornnetwork,
 		gamma,
 		gaywire: bangbros,
+		girlsway,
 		girlgirl: julesjordan,
 		hitzefrei,
 		hookuphotshot,
@@ -142,6 +149,7 @@ const scrapers = {
 		porncz,
 		pornpros: whalemember,
 		private: privateNetwork,
+		puretaboo,
 		realitykings,
 		score,
 		sexyhub: mindgeek,
@@ -157,7 +165,9 @@ const scrapers = {
 		vixen,
 		vogov,
 		whalemember,
+		wicked,
 		xempire,
+		zerotolerance,
 	},
 	actors: {
 		'21sextury': gamma,
@@ -180,7 +190,7 @@ const scrapers = {
 		boobpedia,
 		brattysis: nubiles,
 		brazzers: mindgeek,
-		burningangel: gamma,
+		burningangel,
 		cherrypimps,
 		pornworld: ddfnetwork,
 		deeper: vixen,
@@ -267,7 +277,7 @@ const scrapers = {
 		twistys,
 		vipsexvault: porndoe,
 		vixen,
-		wicked: gamma,
+		wicked,
 		wildoncam: cherrypimps,
 		xempire,
 	},

src/scrapers/wicked.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma');
+
+module.exports = {
+	fetchLatest: fetchApiLatest,
+	fetchProfile: fetchApiProfile,
+	fetchScene,
+	fetchUpcoming: fetchApiUpcoming,
+};

src/scrapers/xempire.js

@@ -18,9 +18,17 @@ async function fetchScene(url, site, baseRelease, options) {
 	return release;
 }
 
+function getActorReleasesUrl(actorPath, page = 1) {
+	return `https://www.xempire.com/en/videos/xempire/latest/${page}/All-Categories/0${actorPath}`;
+}
+
+async function networkFetchProfile(baseActor, context, include) {
+	return fetchProfile(baseActor, context, null, getActorReleasesUrl, include);
+}
+
 module.exports = {
 	fetchLatest,
-	fetchProfile,
+	fetchProfile: networkFetchProfile,
 	fetchUpcoming,
 	fetchScene,
 };

src/scrapers/zerotolerance.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma');
+
+module.exports = {
+	fetchLatest: fetchApiLatest,
+	fetchProfile: fetchApiProfile,
+	fetchScene,
+	fetchUpcoming: fetchApiUpcoming,
+};