assets/components/actors/tile.vue

@@ -22,7 +22,7 @@
 					class="favicon"
 				>
 					<img
-						:src="`/img/logos/${actor.entity.slug}/favicon_light.png`"
+						:src="`/img/logos/${actor.entity.slug}/favicon_dark.png`"
 						class="favicon-icon"
 					>
 				</RouterLink>

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.217.1",
+    "version": "1.216.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.217.1",
+            "version": "1.216.0",
             "license": "ISC",
             "dependencies": {
                 "@casl/ability": "^5.2.2",

package.json

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

seeds/02_sites.js

@@ -8093,12 +8093,6 @@ const sites = [
 		parameters: null,
 		parent: 'realitykings',
 	},
-	// RICKYS ROOM
-	{
-		name: 'Ricky\'s Room',
-		slug: 'rickysroom',
-		url: 'https://rickysroom.com',
-	},
 	// SCORE
 	{
 		name: '18 Eighteen',

src/scrapers/mindgeek.js

@@ -242,22 +242,29 @@ async function getSession(site, parameters, url) {
 	throw new Error(`Failed to acquire MindGeek session (${res.statusCode})`);
 }
 
-function scrapeProfile(data, releases = [], networkName) {
+function scrapeProfile(data, html, releases = [], networkName) {
+	const { query } = qu.extract(html);
+
 	const profile = {
 		description: data.bio,
-		aliases: data.aliases.filter(Boolean),
+		aliases: data.aliases,
 	};
 
 	profile.gender = data.gender === 'other' ? 'transsexual' : data.gender;
-	profile.measurements = data.measurements;
 
-	profile.dateOfBirth = qu.parseDate(data.birthday);
-	profile.birthPlace = data.birthPlace;
-	profile.height = inchesToCm(data.height);
-	profile.weight = lbsToKg(data.weight);
+	if (data.measurements) {
+		const [bust, waist, hip] = data.measurements.split('-');
 
-	profile.hairColor = data.tags.find((tag) => /hair color/i.test(tag.category))?.name;
-	profile.ethnicity = data.tags.find((tag) => /ethnicity/i.test(tag.category))?.name;
+		if (profile.gender === 'female') {
+			if (bust) profile.bust = bust.toUpperCase();
+			if (waist) profile.waist = waist;
+			if (hip) profile.hip = hip;
+		}
+	}
+
+	if (data.birthPlace) profile.birthPlace = data.birthPlace;
+	if (data.height) profile.height = inchesToCm(data.height);
+	if (data.weight) profile.weight = lbsToKg(data.weight);
 
 	if (data.images.card_main_rect?.[0]) {
 		profile.avatar = data.images.card_main_rect[0].xl?.url
@@ -267,6 +274,9 @@ function scrapeProfile(data, releases = [], networkName) {
             || data.images.card_main_rect[0].xs?.url;
 	}
 
+	const birthdate = query.all('li').find((el) => /Date of Birth/.test(el.textContent));
+	if (birthdate) profile.birthdate = query.date(birthdate, 'span', 'MMMM Do, YYYY');
+
 	if (data.tags.some((tag) => /boob type/i.test(tag.category) && /natural tits/i.test(tag.name))) {
 		profile.naturalBoobs = true;
 	}
@@ -275,14 +285,6 @@ function scrapeProfile(data, releases = [], networkName) {
 		profile.naturalBoobs = false;
 	}
 
-	if (data.tags.some((tag) => /body art/i.test(tag.category) && /tattoo/i.test(tag.name))) {
-		profile.hasTattoos = true;
-	}
-
-	if (data.tags.some((tag) => /body art/i.test(tag.category) && /piercing/i.test(tag.name))) {
-		profile.hasPiercings = true;
-	}
-
 	profile.releases = releases.map((release) => scrapeRelease(release, null, null, networkName));
 
 	return profile;
@@ -375,7 +377,7 @@ async function fetchRelease(url, site, baseScene, options) {
 	return null;
 }
 
-async function fetchProfile({ name: actorName }, { entity, parameters }, include) {
+async function fetchProfile({ name: actorName, slug: actorSlug }, { entity, parameters }) {
 	// const url = `https://www.${networkOrNetworkSlug.slug || networkOrNetworkSlug}.com`;
 	const { session, instanceToken } = await getSession(entity, parameters);
 
@@ -393,22 +395,31 @@ async function fetchProfile({ name: actorName }, { entity, parameters }, include
 		const actorData = res.body.result.find((actor) => actor.name.toLowerCase() === actorName.toLowerCase());
 
 		if (actorData) {
+			const actorUrl = `https://www.${entity.slug}.com/${entity.parameters?.actorPath || 'model'}/${actorData.id}/${actorSlug}`;
 			const actorReleasesUrl = `https://site-api.project1service.com/v2/releases?actorId=${actorData.id}&limit=100&offset=0&orderBy=-dateReleased&type=scene`;
 
-			const actorReleasesRes = include.includeActorScenes && await http.get(actorReleasesUrl, {
-				session,
-				interval: parameters.interval,
-				concurrency: parameters.concurrency,
-				headers: {
-					Instance: instanceToken,
-				},
-			});
+			const [actorRes, actorReleasesRes] = await Promise.all([
+				http.get(actorUrl, {
+					interval: parameters.interval,
+					concurrency: parameters.concurrency,
+				}),
+				http.get(actorReleasesUrl, {
+					session,
+					interval: parameters.interval,
+					concurrency: parameters.concurrency,
+					headers: {
+						Instance: instanceToken,
+					},
+				}),
+			]);
 
-			if (actorReleasesRes.statusCode === 200 && actorReleasesRes.body.result) {
-				return scrapeProfile(actorData, actorReleasesRes.body.result, entity.slug);
+			if (actorRes.statusCode === 200 && actorReleasesRes.statusCode === 200 && actorReleasesRes.body.result) {
+				return scrapeProfile(actorData, actorRes.body.toString(), actorReleasesRes.body.result, entity.slug);
 			}
 
-			return scrapeProfile(actorData, [], entity.slug);
+			if (actorRes.statusCode === 200) {
+				return scrapeProfile(actorData, actorRes.body.toString(), null, entity.slug);
+			}
 		}
 	}
 

src/scrapers/rickysroom.js

@@ -1,125 +0,0 @@
-'use strict';
-
-const qu = require('../utils/q');
-const { lbsToKg, feetInchesToCm } = require('../utils/convert');
-
-function scrapeScene(data, channel) {
-	const release = {};
-
-	release.entryId = data.id;
-	release.url = qu.prefixUrl(`/videos/${data.slug}`, channel.url);
-
-	release.title = data.title;
-	release.description = data.description;
-	release.date = qu.parseDate(data.publish_date, 'YYYY/MM/DD HH:mm:ss');
-	release.duration = qu.durationToSeconds(data.videos_duration);
-
-	release.actors = data?.models_thumbs.map((model) => ({
-		name: model.name,
-		url: qu.prefixUrl(`/models/${model.slug}`, channel.url),
-		avatar: model.thumb,
-	})) || data.models;
-
-	release.tags = data.tags;
-
-	release.poster = [data.trailer_screencap].concat(data.extra_thumbnails);
-	release.photos = data.previews.full
-		.map((url) => [url, url.replace('full/', 'thumbs/')]) // photos
-		.concat(data.thumbs); // screenshots
-
-	release.trailer = data.trailer_url;
-	release.teaser = data.special_thumbnails;
-
-	release.qualities = data.videos && Object.values(data.videos).map((video) => video.height);
-	release.rating = data.rating;
-
-	return release;
-}
-
-function scrapeProfile(data, scenes, entity) {
-	const profile = {};
-
-	profile.entryId = data.id;
-	profile.url = qu.prefixUrl(`/models/${data.slug}`, entity.url);
-
-	profile.description = data.Bio || data.bio;
-	profile.birthPlace = data.Born || data.born;
-	profile.dateOfBirth = qu.parseDate(data.Birthdate || data.birthdate, 'YYYY-MM-DD');
-
-	profile.measurements = data.Measurements || data.Measurements;
-	profile.height = feetInchesToCm(data.Height || data.height);
-	profile.weight = lbsToKg(data.Weight || data.weight);
-
-	profile.eyes = data.Eyes || data.eyes;
-	profile.hairColor = data.Hair || data.hair;
-
-	profile.avatar = data.thumb;
-
-	profile.scenes = scenes?.map((scene) => scrapeScene(scene, entity));
-
-	return profile;
-}
-
-async function fetchLatest(channel, page = 1) {
-	const url = `${channel.url}/videos?order_by=publish_date&per_page=100&page=${page}`; // unsure if page works, not enough videos as of 2022-05-29
-	const res = await qu.get(url);
-
-	if (res.ok) {
-		const dataString = res.item.query.html('#__NEXT_DATA__');
-		const data = dataString && JSON.parse(dataString);
-
-		if (data.props?.pageProps?.contents?.data) {
-			return data.props.pageProps.contents.data.map((scene) => scrapeScene(scene, channel));
-		}
-
-		return null;
-	}
-
-	return res.status;
-}
-
-async function fetchScene(url, channel, baseRelease) {
-	if (baseRelease.entryId) {
-		// deep data is identical to update data
-		return baseRelease;
-	}
-
-	const res = await qu.get(url);
-
-	if (res.ok) {
-		const dataString = res.item.query.html('#__NEXT_DATA__');
-		const data = dataString && JSON.parse(dataString);
-
-		if (data.props?.pageProps?.content) {
-			return scrapeScene(data.props.pageProps.content, channel);
-		}
-
-		return null;
-	}
-
-	return res.status;
-}
-
-async function fetchProfile({ slug }, entity) {
-	const url = `${entity.url}/models/${slug}`;
-	const res = await qu.get(url);
-
-	if (res.ok) {
-		const dataString = res.item.query.html('#__NEXT_DATA__');
-		const data = dataString && JSON.parse(dataString);
-
-		if (data.props?.pageProps?.model) {
-			return scrapeProfile(data.props.pageProps.model, data.props.pageProps.model_contents, entity);
-		}
-
-		return null;
-	}
-
-	return res.status;
-}
-
-module.exports = {
-	fetchLatest,
-	fetchScene,
-	fetchProfile,
-};

src/scrapers/scrapers.js

@@ -53,7 +53,6 @@ const pinkyxxx = require('./pinkyxxx');
 const privateNetwork = require('./private'); // reserved keyword
 const purgatoryx = require('./purgatoryx'); // reserved keyword
 const radical = require('./radical');
-const rickysroom = require('./rickysroom');
 const score = require('./score');
 const spizoo = require('./spizoo');
 const teamskeet = require('./teamskeet');
@@ -141,7 +140,6 @@ const scrapers = {
 		private: privateNetwork,
 		purgatoryx,
 		radical,
-		rickysroom,
 		score,
 		sexyhub: mindgeek,
 		spizoo,
@@ -266,7 +264,6 @@ const scrapers = {
 		purgatoryx,
 		realitykings: mindgeek,
 		realvr: badoink,
-		rickysroom,
 		roccosiffredi: famedigital,
 		score,
 		seehimfuck: hush,

src/scrapers/vixen.js

@@ -14,6 +14,34 @@ const genderMap = {
 	T: 'transsexual', // not yet observed
 };
 
+function getPosterFallbacks(poster) {
+	return poster
+		.filter((image) => /landscape/i.test(image.name))
+		.sort((imageA, imageB) => imageB.height - imageA.height)
+		.map((image) => {
+			const sources = [image.src, image.highdpi?.['2x'], image.highdpi?.['3x']];
+			// high DPI images for full HD source are huge, only prefer for smaller fallback sources
+			return image.height === 1080 ? sources : sources.reverse();
+		})
+		.flat()
+		.map((src) => ({
+			src,
+			expectType: {
+				'binary/octet-stream': 'image/jpeg',
+			},
+		}));
+}
+
+function getTeaserFallbacks(teaser) {
+	return teaser
+		.filter((video) => /landscape/i.test(video.name))
+		.map((video) => ({
+			src: video.src,
+			type: video.type,
+			quality: Number(String(video.height).replace('353', '360')),
+		}));
+}
+
 function getAvatarFallbacks(avatar) {
 	return avatar
 		.sort((imageA, imageB) => imageB.height - imageA.height)
@@ -153,101 +181,42 @@ function scrapeAll(scenes, channel) {
 
 		release.stars = data.rating;
 
+		console.log(data);
+		console.log(release);
+
 		return release;
 	});
 }
 
 function scrapeUpcoming(scene, site) {
-	if (!scene || scene.isPreReleasePeriod) {
-		return null;
-	}
+	if (!scene || scene.isPreReleasePeriod) return null;
 
 	const release = {};
 
-	release.entryId = scene.videoId;
-	release.url = `${site.url}/videos/${scene.slug}`;
-
-	release.title = scene.slug
+	release.title = scene.targetUrl
+		.slice(1)
 		.split('-')
 		.map((component) => `${component.charAt(0).toUpperCase()}${component.slice(1)}`)
 		.join(' ');
 
+	release.url = `${site.url}/videos${scene.targetUrl}`;
+
 	release.date = moment.utc(scene.releaseDate).toDate();
 	release.datePrecision = 'minute';
 
-	release.actors = scene.models.map((model) => model.name);
+	release.actors = scene.models;
 
-	release.poster = curateSources(scene.images.poster);
-	release.teaser = curateSources(scene.previews.poster);
+	release.poster = getPosterFallbacks(scene.images.poster);
+	release.teaser = getTeaserFallbacks(scene.previews.poster);
+
+	release.entryId = (release.poster[0] || release.teaser[0])?.src?.match(/\/(\d+)/)?.[1];
+
+	console.log('upcoming', scene);
 
 	return [release];
 }
 
-async function fetchGraphqlDetails(release, channel, session) {
-	const query = `
-		query($query: String!, $site: Site!) {
-		  searchVideos(input: {
-			  query: $query
-			  site: $site
-		  }) {
-			edges {
-			  node {
-				videoId
-				title
-				slug
-				description
-				releaseDate
-				categories {
-				  name
-				}
-				chapters {
-				  video {
-					title
-					seconds
-				  }
-				}
-				models {
-				  name
-				}
-				images {
-				  poster {
-					...ImageInfo
-				  }
-				}
-			  }
-			}
-		  }
-		}
-
-		fragment ImageInfo on Image {
-		  src
-		  highdpi {
-			double
-		  }
-		}
-	`;
-
-	const variables = JSON.stringify({
-		site: channel.slug.toUpperCase(),
-		query: release.title,
-	});
-
-	const res = await http.get(`${channel.url}/graphql?query=${encodeURI(query)}&variables=${variables}`, {
-		session,
-		headers: {
-			referer: channel.url,
-			accept: '*/*',
-		},
-	});
-
-	if (res.ok) {
-		return res.body.data?.searchVideos?.edges?.find((edge) => edge.node.videoId === release.entryId)?.node || null;
-	}
-
-	return null;
-}
-
-async function scrapeScene(data, url, channel, options, session) {
+async function scrapeScene(data, url, channel, options) {
 	const release = {
 		url,
 		entryId: data.video.videoId || data.video.newId,
@@ -282,17 +251,7 @@ async function scrapeScene(data, url, channel, options, session) {
 
 	release.qualities = data.video?.downloadResolutions.map((quality) => Number(quality.width)).filter(Boolean); // width property is actually the height
 
-	const graphqlDetails = await fetchGraphqlDetails(release, channel, session);
-
-	if (graphqlDetails) {
-		release.tags = graphqlDetails.categories?.map((category) => category.name);
-		release.chapters = graphqlDetails.chapters?.video?.map((chapter) => ({
-			time: chapter.seconds,
-			tags: [chapter.title],
-		}));
-	}
-
-	release.channel = data.video?.id.split(':')[0];
+	console.log(release);
 
 	return release;
 }
@@ -346,6 +305,61 @@ async function scrapeProfile(data, origin, withReleases) {
 	return profile;
 }
 
+async function fetchLatestGraphql(channel, page = 1) {
+	const query = `
+		query($query: String!, $site: Site!) {
+		  searchVideos(input: {
+			  query: $query
+			  site: $site
+		  }) {
+			edges {
+			  node {
+				title
+				slug
+				description
+				releaseDate
+				categories {
+				  name
+				}
+				chapters {
+				  video {
+					title
+					seconds
+				  }
+				}
+				models {
+				  name
+				}
+				images {
+				  poster {
+					...ImageInfo
+				  }
+				}
+			  }
+			}
+		  }
+		}
+
+		fragment ImageInfo on Image {
+		  src
+		  highdpi {
+			double
+		  }
+		}
+	`;
+
+	const variables = JSON.stringify({
+		site: channel.slug.toUpperCase(),
+		query: 'alone at last',
+	});
+
+	const res = await http.get(`${channel.url}/graphql?query=${encodeURI(query)}&variables=${variables}`);
+
+	console.log(res.body);
+	console.log(res.body.errors);
+	console.log(res.body.data?.searchVideos?.edges.map((edge) => edge.node));
+}
+
 async function fetchLatest(site, page = 1) {
 	const url = `${site.url}/videos?page=${page}`;
 	const res = await qu.get(url);
@@ -364,85 +378,13 @@ async function fetchLatest(site, page = 1) {
 	return res.status;
 }
 
-async function fetchUpcoming(channel) {
-	const query = `
-		query getNextScene($site: Site!) {
-		  nextScene: findNextReleaseVideo(input: { site: $site }) {
-			videoId
-			slug
-			isPreReleasePeriod
-			releaseDate
-			models {
-			  name
-			  __typename
-			}
-			images {
-			  countdown {
-				...ImageInfo
-				__typename
-			  }
-			  poster {
-				...ImageInfo
-				__typename
-			  }
-			  __typename
-			}
-			previews {
-			  countdown {
-				...PreviewInfo
-				__typename
-			  }
-			  poster {
-				...PreviewInfo
-				__typename
-			  }
-			  __typename
-			}
-			__typename
-		  }
-		}
-
-		fragment ImageInfo on Image {
-		  src
-		  placeholder
-		  width
-		  height
-		  highdpi {
-			double
-			triple
-			__typename
-		  }
-		  webp {
-			src
-			placeholder
-			highdpi {
-			  double
-			  triple
-			  __typename
-			}
-			__typename
-		  }
-		}
-
-		fragment PreviewInfo on Preview {
-		  src
-		  width
-		  height
-		  type
-		}
-	`;
-
-	const res = await http.post(`${channel.url}/graphql`, {
-		operationName: 'getNextScene',
-		query,
-		variables: {
-			site: channel.slug.toUpperCase(),
-		},
-	});
+async function fetchUpcoming(site) {
+	const apiUrl = `${site.url}/api`;
+	const res = await http.get(apiUrl);
 
 	if (res.ok) {
 		if (res.body.data.nextScene) {
-			return scrapeUpcoming(res.body.data.nextScene, channel);
+			return scrapeUpcoming(res.body.data.nextScene, site);
 		}
 
 		return [];
@@ -452,14 +394,13 @@ async function fetchUpcoming(channel) {
 }
 
 async function fetchScene(url, channel, baseRelease, options) {
-	const session = qu.session();
-	const res = await qu.get(url, null, null, { session });
+	const res = await qu.get(url);
 
 	if (res.ok) {
 		const dataString = res.item.query.html('#__NEXT_DATA__');
 		const data = dataString && JSON.parse(dataString);
 
-		return scrapeScene(data.props.pageProps, url, channel, options, session);
+		return scrapeScene(data.props.pageProps, url, channel, options);
 	}
 
 	return res.status;
@@ -483,6 +424,7 @@ async function fetchProfile({ name: actorName }, { site }, include) {
 }
 
 module.exports = {
+	// fetchLatest: fetchLatestGraphql,
 	fetchLatest,
 	fetchUpcoming,
 	fetchScene,

src/store-releases.js

@@ -48,7 +48,7 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
 		curatedRelease.shoot_id = release.shootId || null;
 		curatedRelease.production_date = Number(release.productionDate) ? release.productionDate : null;
 		curatedRelease.duration = release.duration;
-		curatedRelease.qualities = Array.from(new Set(release.qualities?.map(Number).filter(Boolean))).sort((qualityA, qualityB) => qualityB - qualityA);
+		curatedRelease.qualities = Array.from(new Set(release.qualities?.map(Number).filter(Boolean)));
 	}
 
 	if (release.productionLocation) {