config/default.js

@@ -175,11 +175,6 @@ module.exports = {
 		'pornhub',
 		'freeones',
 	],
-	options: {
-		traxxx: {
-			// source: 'http://nsfw.unknown.name/random',
-		},
-	},
 	proxy: {
 		enable: false,
 		host: '',

package-lock.json

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

package.json

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

src/media.js

@@ -757,7 +757,6 @@ async function flushOrphanedMedia() {
 							knex('tags_photos').select('media_id'),
 							knex('releases_posters').select('media_id'),
 							knex('releases_photos').select('media_id'),
-							knex('releases_covers').select('media_id'),
 							knex('releases_trailers').select('media_id'),
 							knex('releases_teasers').select('media_id'),
 							knex('movies_covers').select('media_id'),

src/scrapers/scrapers.js

@@ -78,7 +78,7 @@ const boobpedia = require('./boobpedia');
 const freeones = require('./freeones');
 // const freeoneslegacy = require('./freeones_legacy');
 
-const scrapers = {
+module.exports = {
 	releases: {
 		'21naturals': naturals,
 		'21sextreme': sextreme,
@@ -269,9 +269,3 @@ const scrapers = {
 		xempire,
 	},
 };
-
-module.exports = {
-	// add slug for easy internal reference
-	releases: Object.entries(scrapers.releases).reduce((acc, [slug, scraper]) => ({ ...acc, [slug]: { ...scraper, slug } })),
-	actors: Object.entries(scrapers.actors).reduce((acc, [slug, scraper]) => ({ ...acc, [slug]: { ...scraper, slug } })),
-};

src/scrapers/traxxx.js

@@ -97,7 +97,7 @@ function maleNoun() {
 	return random([
 		'guy',
 		'stud',
-		'lad',
+		'man',
 		'boyfriend',
 		'stranger',
 		'stepbrother',
@@ -227,29 +227,22 @@ function actors(release) {
 	}));
 }
 
-async function fetchLatest(entity, page, options) {
+async function fetchLatest(entity) {
 	return Promise.all(Array.from({ length: 100 }, async (value, index) => {
 		const release = {};
 
 		release.entryId = nanoid();
 		release.date = moment().subtract(Math.floor(Math.random() * index), 'days').toDate();
 
-		if (options.source) {
+		const [poster, ...photos] = await knex('media')
-			// select from configured random image source
+			.select('path')
-			release.poster = `${options.source}?id=${nanoid()}`; // ensure source is unique
+			.where('is_sfw', true)
-			release.photos = Array.from({ length: Math.floor(Math.random() * 10) + 1 }, () => `${options.source}?id=${nanoid()}`); // ensure source is unique
+			.pluck('path')
-		} else {
+			.orderByRaw('random()')
-			// select from local SFW database
+			.limit(Math.floor(Math.random() * 10) + 1);
-			const [poster, ...photos] = await knex('media')
-				.select('path')
-				.where('is_sfw', true)
-				.pluck('path')
-				.orderByRaw('random()')
-				.limit(Math.floor(Math.random() * 10) + 1);
 
-			release.poster = `http://${config.web.host}:${config.web.port}/img/${poster}?id=${nanoid()}`; // ensure source is unique
+		release.poster = `http://${config.web.host}:${config.web.port}/img/${poster}?id=${nanoid()}`; // ensure source is unique
-			release.photos = photos.map(photo => `http://${config.web.host}:${config.web.port}/img/${photo}?id=${nanoid()}`);
+		release.photos = photos.map(photo => `http://${config.web.host}:${config.web.port}/img/${photo}?id=${nanoid()}`);
-		}
 
 		release.tags = await knex('tags')
 			.select('name')

src/updates.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const config = require('config');
 const Promise = require('bluebird');
 const moment = require('moment');
 
@@ -94,14 +93,9 @@ function needNextPage(pageReleases, accReleases, isUpcoming) {
 
 async function scrapeReleases(scraper, entity, preData, isUpcoming) {
 	async function scrapeReleasesPage(page, accReleases) {
-		const options = {
-			...config.options[scraper.slug],
-			...include,
-		};
-
 		const pageReleases = isUpcoming
-			? await scraper.fetchUpcoming(entity, page, options, preData)
+			? await scraper.fetchUpcoming(entity, page, include, preData)
-			: await scraper.fetchLatest(entity, page, options, preData);
+			: await scraper.fetchLatest(entity, page, include, preData);
 
 		if (!Array.isArray(pageReleases)) {
 			// scraper is unable to fetch the releases and returned a HTTP code or null