package-lock.json

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

package.json

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

seeds/02_sites.js

@@ -631,9 +631,6 @@ const sites = [
 		url: 'https://www.badoinkvr.com',
 		tags: ['vr'],
 		parent: 'badoink',
-		parameters: {
-			actor: 'vr-pornstar',
-		},
 	},
 	{
 		name: 'VR Cosplay X',
@@ -643,7 +640,6 @@ const sites = [
 		parent: 'badoink',
 		parameters: {
 			latest: 'cosplaypornvideos',
-			actor: 'cosplaygirl',
 		},
 	},
 	{
@@ -652,9 +648,6 @@ const sites = [
 		url: 'https://18vr.com',
 		tags: ['vr'],
 		parent: 'badoink',
-		parameters: {
-			actor: 'vrgirl',
-		},
 	},
 	{
 		name: 'BabeVR',
@@ -662,9 +655,6 @@ const sites = [
 		url: 'https://babevr.com',
 		tags: ['vr'],
 		parent: 'badoink',
-		parameters: {
-			actor: 'vrbabe',
-		},
 	},
 	{
 		name: 'RealVR',
@@ -673,7 +663,6 @@ const sites = [
 		tags: ['vr'],
 		parameters: {
 			teasers: false,
-			actor: 'pornstar',
 		},
 		parent: 'badoink',
 	},
@@ -4541,7 +4530,7 @@ const sites = [
 		name: 'Virtual Reality',
 		slug: 'littlecapricevr',
 		url: 'https://www.littlecaprice-dreams.com/virtual-reality-little-caprice',
-		tags: ['vr'],
+		tags: ['virtual-reality'],
 		hasLogo: false,
 		parent: 'littlecapricedreams',
 	},
@@ -9448,7 +9437,7 @@ const sites = [
 		name: 'Wet VR',
 		slug: 'wetvr',
 		url: 'https://wetvr.com',
-		tags: ['vr'],
+		tags: ['virtual-reality'],
 		parent: 'whalemember',
 	},
 	{

seeds/03_studios.js

@@ -443,8 +443,8 @@ const studios = [
 		parent: 'legalporno',
 	},
 	{
-		slug: 'honourmaysmanorhouse',
+		slug: 'Honour Mays\' Manor House',
-		name: 'Honour Mays\' Manor House',
+		name: 'honourmaysmanorhouse',
 		url: 'https://www.legalporno.com/studios/honour-mays---manor-house',
 		alias: ['hm'],
 		parent: 'legalporno',

src/actors.js

@@ -324,7 +324,6 @@ async function curateProfile(profile, actor) {
 		const curatedProfile = {
 			id: profile.id,
 			name: profile.name,
-			url: profile.url,
 			avatar: profile.avatar,
 			scraper: profile.scraper,
 			entity: profile.entity,
@@ -366,22 +365,10 @@ async function curateProfile(profile, actor) {
 		curatedProfile.height = Number(profile.height) || profile.height?.match?.(/\d+/)?.[0] || null;
 		curatedProfile.weight = Number(profile.weight) || profile.weight?.match?.(/\d+/)?.[0] || null;
 
-		// separate measurement values
 		curatedProfile.cup = profile.cup || (typeof profile.bust === 'string' && profile.bust?.match?.(/[a-zA-Z]+/)?.[0]) || null;
 		curatedProfile.bust = Number(profile.bust) || profile.bust?.match?.(/\d+/)?.[0] || null;
 		curatedProfile.waist = Number(profile.waist) || profile.waist?.match?.(/\d+/)?.[0] || null;
 		curatedProfile.hip = Number(profile.hip) || profile.hip?.match?.(/\d+/)?.[0] || null;
-
-		// combined measurement value
-		const measurements = profile.measurements?.match(/(\d+)(\w+)-(\d+)-(\d+)/);
-
-		if (measurements) {
-			curatedProfile.bust = Number(measurements[1]);
-			curatedProfile.cup = measurements[2];
-			curatedProfile.waist = Number(measurements[3]);
-			curatedProfile.hip = Number(measurements[4]);
-		}
-
 		curatedProfile.penisLength = Number(profile.penisLength) || profile.penisLength?.match?.(/\d+/)?.[0] || null;
 		curatedProfile.penisGirth = Number(profile.penisGirth) || profile.penisGirth?.match?.(/\d+/)?.[0] || null;
 

src/scrapers/badoink.js

@@ -1,8 +1,6 @@
 'use strict';
 
 const qu = require('../utils/qu');
-const slugify = require('../utils/slugify');
-const { convert } = require('../utils/convert');
 
 function getPoster(posterSources) {
 	if (posterSources?.[0]) {
@@ -82,38 +80,6 @@ function scrapeScene({ query }, url, channel) {
 	return release;
 }
 
-function scrapeProfile({ query }, url, entity) {
-	const profile = { url };
-
-	const bio = query.all('.girl-details-stats-item').reduce((acc, el) => ({
-		...acc,
-		[slugify(qu.query.cnt(el, '.girl-details-stat'))]: qu.query.cnt(el, '.girl-details-stat-value'),
-	}), {});
-
-	profile.description = query.cnt('.girl-details-bio');
-
-	profile.age = bio.age;
-	profile.birthPlace = bio.country;
-	profile.ethnicity = bio.ethnicity;
-
-	profile.height = convert(bio.height, 'cm');
-	profile.weight = convert(bio.weight, 'lb', 'kg');
-
-	profile.measurements = bio.measurements;
-
-	profile.hairColor = bio.hair;
-	profile.eyes = bio.eyes;
-
-	const avatarSources = query.srcset('.girl-details-photo-content picture source', 'srcset') || [query.img('.girl-details-photo')];
-
-	profile.avatar = getPoster(avatarSources);
-	profile.social = query.urls('.girl-details-social-media-list a');
-
-	profile.scenes = scrapeAll(qu.initAll(query.all('.video-card')), entity);
-
-	return profile;
-}
-
 async function fetchLatest(channel, page) {
 	const res = await qu.getAll(`${channel.url}/${channel.parameters?.latest || 'vrpornvideos'}/${page}`, '.video-card', {
 		Cookie: 'affsubid=12345-;', // required to show teaser video, exact number doesn't seem to matter
@@ -126,19 +92,7 @@ async function fetchLatest(channel, page) {
 	return res.status;
 }
 
-async function fetchProfile(baseActor, { entity }) {
-	const url = `${entity.url}/${entity.parameters?.actor || 'pornstar'}/${slugify(baseActor.name, '')}/`;
-	const res = await qu.get(url);
-
-	if (res.ok) {
-		return scrapeProfile(res.item, url, entity);
-	}
-
-	return res.status;
-}
-
 module.exports = {
 	fetchLatest,
-	fetchProfile,
 	scrapeScene,
 };

src/scrapers/scrapers.js

@@ -141,7 +141,6 @@ const scrapers = {
 		xempire,
 	},
 	actors: {
-		'18vr': badoink,
 		'21sextury': gamma,
 		allanal: mikeadriano,
 		amateureuro: porndoe,
@@ -152,9 +151,7 @@ const scrapers = {
 		anilos: nubiles,
 		aziani,
 		babes: mindgeek,
-		babevr: badoink,
 		baddaddypov: fullpornnetwork,
-		badoinkvr: badoink,
 		bamvisions,
 		bang,
 		bangbros,
@@ -166,19 +163,20 @@ const scrapers = {
 		brazzers: mindgeek,
 		burningangel: gamma,
 		cherrypimps,
+		pornworld: ddfnetwork,
 		deeper: vixen,
 		deeplush: nubiles,
 		devilsfilm: famedigital,
 		digitalplayground: mindgeek,
+		dtfsluts: fullpornnetwork,
 		dogfartnetwork: dogfart,
 		dorcelclub: dorcel,
 		doubleviewcasting: firstanalquest,
-		dtfsluts: fullpornnetwork,
 		elegantangel,
 		evilangel: gamma,
-		exploitedcollegegirls: fcuk,
 		eyeontheguy: hush,
 		fakehub: mindgeek,
+		exploitedcollegegirls: fcuk,
 		firstanalquest,
 		forbondage: porndoe,
 		freeones,
@@ -204,9 +202,7 @@ const scrapers = {
 		killergram,
 		kink,
 		legalporno,
-		letsdoeit: porndoe,
 		littlecapricedreams,
-		mamacitaz: porndoe,
 		men: mindgeek,
 		metrohd: mindgeek,
 		milehighmedia: mindgeek,
@@ -219,31 +215,31 @@ const scrapers = {
 		nubilesporn: nubiles,
 		nympho: mikeadriano,
 		onlyprince: fullpornnetwork,
-		pascalssubsluts,
 		pervcity,
 		pervertgallery: fullpornnetwork,
 		peternorth: famedigital,
 		pierrewoodman,
 		pimpxxx: cherrypimps,
+		letsdoeit: porndoe,
+		mamacitaz: porndoe,
+		pascalssubsluts,
 		porncz,
 		pornhub,
-		pornworld: ddfnetwork,
 		povperverts: fullpornnetwork,
 		povpornstars: hush,
 		private: privateNetwork,
 		realitykings: mindgeek,
-		realvr: badoink,
 		roccosiffredi: famedigital,
 		score,
 		seehimfuck: hush,
 		sexyhub: mindgeek,
 		silverstonedvd: famedigital,
 		silviasaint: famedigital,
+		topwebmodels,
 		swallowed: mikeadriano,
 		teamskeet,
 		teencoreclub,
 		thatsitcomshow: nubiles,
-		topwebmodels,
 		transangels: mindgeek,
 		transbella: porndoe,
 		trueanal: mikeadriano,
@@ -252,7 +248,6 @@ const scrapers = {
 		twistys: mindgeek,
 		vipsexvault: porndoe,
 		vixen,
-		vrcosplayx: badoink,
 		wicked: gamma,
 		wildoncam: cherrypimps,
 		xempire,

src/utils/convert.js

@@ -61,8 +61,7 @@ function kgToLbs(kgs) {
 function convertManyApi(input, to) {
 	const curatedInput = input
 		.replace('\'', 'ft')
-		.replace(/"|''/, 'in')
+		.replace('"', 'in');
-		.replace(/\d+ft\s*\d+\s*$/, match => `${match}in`); // height without any inch symbol
 
 	return Math.round(convertMany(curatedInput).to(to)) || null;
 }
@@ -77,9 +76,7 @@ function convertApi(input, fromOrTo, to) {
 			return convertManyApi(input, fromOrTo);
 		}
 
-		const inputNumber = Number(typeof input === 'string' ? input.match(/\d+(\.\d+)?/)?.[0] : input);
+		return Math.round(convert(input).from(fromOrTo).to(to)) || null;
-
-		return Math.round(convert(inputNumber).from(fromOrTo).to(to)) || null;
 	} catch (error) {
 		logger.error(error);
 		return null;