package-lock.json

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

package.json

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

seeds/00_tags.js

@@ -855,10 +855,6 @@ const tags = [
 		name: 'pissing',
 		slug: 'pissing',
 	},
-	{
-		name: 'pole dancing',
-		slug: 'pole-dancing',
-	},
 	{
 		name: 'POV',
 		slug: 'pov',
@@ -2427,10 +2423,6 @@ const aliases = [
 		name: 'coroas',
 		for: 'milf',
 	},
-	{
-		name: 'strip pole dancing',
-		for: 'strip-pole-dancing',
-	},
 ];
 
 const priorities = [ // higher index is higher priority

seeds/01_networks.js

@@ -323,11 +323,6 @@ const networks = [
 		name: 'First Anal Quest',
 		url: 'http://www.firstanalquest.com',
 	},
-	{
-		slug: 'theflourish',
-		name: 'The Flourish',
-		url: 'https://theflourish.io',
-	},
 	{
 		slug: 'forbondage',
 		name: 'ForBondage',

seeds/02_sites.js

@@ -717,9 +717,6 @@ const sites = [
 		slug: 'archangel',
 		name: 'ArchAngel',
 		url: 'https://www.archangelvideo.com',
-		parameters: {
-			path: '/tour',
-		},
 	},
 	// ASSYLUM
 	{
@@ -3845,39 +3842,6 @@ const sites = [
 			layout: 'c',
 		},
 	},
-	// FLOURISH
-	{
-		slug: 'theflourishxxx',
-		name: 'The Flourish XXX',
-		url: 'https://tour.theflourishxxx.com',
-		parent: 'theflourish',
-	},
-	{
-		slug: 'theflourishamateurs',
-		name: 'The Flourish Amateurs',
-		url: 'https://tour.theflourishamateurs.com',
-		parent: 'theflourish',
-	},
-	{
-		slug: 'theflourishfetish',
-		name: 'The Flourish Fetish',
-		url: 'https://tour.theflourishfetish.com',
-		parent: 'theflourish',
-	},
-	{
-		slug: 'theflourishpov',
-		name: 'The Flourish POV',
-		url: 'https://tour.theflourishxxx.com',
-		tags: ['pov'],
-		parent: 'theflourish',
-	},
-	{
-		slug: 'milfcandy',
-		name: 'MILF Candy',
-		url: 'https://tour.milfcandy.com',
-		tags: ['milf'],
-		parent: 'theflourish',
-	},
 	// FOR BONDAGE
 	{
 		name: 'Crowd Bondage',

src/scrapers/archangel.js

@@ -1,7 +1,5 @@
 'use strict';
 
-// ALSO USED BY THE FLOURISH
-
 const unprint = require('unprint');
 
 const slugify = require('../utils/slugify');
@@ -31,27 +29,12 @@ function scrapeAll(scenes) {
 		}));
 
 		const poster = query.img('img.mainThumb');
-		const previewCount = query.number('img.mainThumb', { attribute: 'cnt' });
 
 		if (poster && !placeholder.test(poster)) {
-			const posterFallbacks = [
+			release.poster = poster;
-				poster.replace('-1x', '-3x'),
-				poster.replace('-1x', '-2x'),
-				poster.replace('-1x', '-4x'),
-				poster,
-			];
-
-			release.poster = posterFallbacks;
 		}
 
-		if (previewCount) {
+		release.photoCount = query.number('.timeDate');
-			release.photos = Array.from(
-				{ length: previewCount - 1 },
-				(value, index) => [3, 2, 4, 1].map((scale) => unprint.prefixUrl(query.img('img.mainThumb', { attribute: `src${index + 1}_${scale}x` }))).filter(Boolean), // 4x is unnecessarily big and possibly upscaled
-			).filter(Boolean);
-		}
-
-		release.photoCount = query.number('.timeDate', { match: /(\d+) photos/i, matchIndex: 1 });
 
 		release.entryId = getEntryId(release);
 
@@ -59,7 +42,7 @@ function scrapeAll(scenes) {
 	});
 }
 
-function scrapeScene({ query, html }, { url, entity, baseRelease }) {
+function scrapeScene({ query, html }, { url }) {
 	const release = { url };
 
 	release.title = query.content('.title h2');
@@ -73,35 +56,18 @@ function scrapeScene({ query, html }, { url, entity, baseRelease }) {
 		url: unprint.query.url(actorEl, null),
 	}));
 
-	const poster = unprint.prefixUrl(query.img('.update_thumb') || html.match(/poster="(.*\.jpg)"/)?.[1], entity.url);
+	const poster = query.img('.update_thumb') || html.match(/poster="(.*\.jpg)"/)?.[1];
 
 	if (poster && !placeholder.test(poster)) {
-		const posterFallbacks = [
+		release.poster = poster;
-			poster.replace('-1x', '-3x'),
-			poster.replace('-1x', '-2x'),
-			poster.replace('-1x', '-4x'),
-			poster,
-		];
-
-		// scene page poster usually different from overview page, don't replace
-		if (baseRelease?.poster && baseRelease.poster !== poster) {
-			release.photos = baseRelease.photos
-				? [posterFallbacks, ...baseRelease.photos]
-				: [posterFallbacks];
-		} else {
-			release.poster = posterFallbacks;
-		}
 	}
 
-	const trailer = html.match(/src="(.*\.mp4)"/)?.[1];
+	release.trailer = html.match(/src="(.*\.mp4)"/)?.[1];
 
-	if (trailer) {
+	release.photoCount = query.number('.info', { match: /(\d+) photos/i, matchIndex: 1 });
-		release.trailer = unprint.prefixUrl(encodeURI(trailer), entity.url);
-	}
 
 	release.tags = query.contents('.info .tags a');
 
-	release.photoCount = query.number('.info', { match: /(\d+) photos/i, matchIndex: 1 });
 	release.entryId = getEntryId(release);
 
 	return release;
@@ -163,8 +129,8 @@ function scrapeProfile({ query, element }, { url, entity }) {
 	return profile;
 }
 
-async function fetchLatest(channel, page = 1, context) {
+async function fetchLatest(channel, page = 1) {
-	const url = `${channel.url}${context.parameters.path || ''}/categories/movies_${page}_d.html`;
+	const url = `${channel.url}/tour/categories/movies_${page}_d.html`;
 	const res = await unprint.get(url, { selectAll: '.item-video' });
 
 	if (res.ok) {
@@ -174,11 +140,11 @@ async function fetchLatest(channel, page = 1, context) {
 	return res.status;
 }
 
-async function fetchProfile({ name: actorName, url: actorUrl }, { entity, include, parameters }) {
+async function fetchProfile({ name: actorName, url: actorUrl }, { entity, include }) {
 	const res = await [
 		actorUrl,
-		`${entity.url}${parameters.path || ''}/models/${slugify(actorName, '-')}.html`,
+		`${entity.url}/tour/models/${slugify(actorName, '-')}.html`,
-		`${entity.url}${parameters.path || ''}/models/${slugify(actorName, '')}.html`,
+		`${entity.url}/tour/models/${slugify(actorName, '')}.html`,
 	].reduce(async (chain, url) => {
 		const prevRes = await chain;
 

src/scrapers/scrapers.js

@@ -153,7 +153,6 @@ const scrapers = {
 		sexyhub: mindgeek,
 		spizoo,
 		swallowsalon: julesjordan,
-		theflourish: archangel,
 		teencoreclub,
 		teenmegaworld,
 		teamskeet,
@@ -295,11 +294,6 @@ const scrapers = {
 		silviasaint: famedigital,
 		spizoo,
 		swallowed: mikeadriano,
-		milfcandy: archangel,
-		theflourishamateurs: archangel,
-		theflourishpov: archangel,
-		theflourishfetish: archangel,
-		theflourishxxx: archangel,
 		teamskeet,
 		teencoreclub,
 		teenmegaworld,

src/scrapers/teenmegaworld.js

@@ -90,6 +90,9 @@ function scrapeProfile({ query }, url, entity) {
 	profile.avatar = query.img('.model-profile-image-picture source', { origin: entity.url, attribute: 'srcset' }) || query.img('.model-profile-image-picture img', { origin: entity.url });
 	profile.scenes = scrapeAll(unprint.initAll(query.all('.video-list .thumb')), entity);
 
+	console.log(bio);
+	console.log(profile);
+
 	return profile;
 }