assets/js/entities/actions.js

@@ -89,6 +89,18 @@ function initEntitiesActions(store, router) {
 						offset: $offset
 						orderBy: $orderBy
 						filter: {
+							or: [
+								{
+									date: {
+										isNull: ${entityType !== 'network'}
+									}
+								}
+								{
+									date: {
+										isNull: false
+									}
+								}
+							]
 							effectiveDate: {
 								lessThan: $before,
 								greaterThan: $after

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.225.10",
+    "version": "1.225.9",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.225.10",
+            "version": "1.225.9",
             "license": "ISC",
             "dependencies": {
                 "@casl/ability": "^5.2.2",
@@ -79,7 +79,7 @@
                 "tunnel": "0.0.6",
                 "ua-parser-js": "^1.0.32",
                 "undici": "^4.13.0",
-                "unprint": "^0.8.2",
+                "unprint": "^0.8.1",
                 "url-pattern": "^1.0.3",
                 "v-tooltip": "^2.0.3",
                 "video.js": "^7.11.4",
@@ -17025,9 +17025,9 @@
             }
         },
         "node_modules/unprint": {
-            "version": "0.8.2",
-            "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.2.tgz",
-            "integrity": "sha512-mCKPDPwtuECbXJJLQbDn2FFbydr6fLKytyS3pymbxcTh2dkk7NFypMjR7qjU2Uv9Fl91hSE48SjYMsWHNKpp4w==",
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.1.tgz",
+            "integrity": "sha512-6cF2LgIpc7JEBBXWs/CmJgFBAPmvM5NuD3tDvmnnmZR+wrEF03TNR5kv08iPTV/GhT8EHPhZM3LSd8eRipkWdA==",
             "dependencies": {
                 "axios": "^0.27.2",
                 "bottleneck": "^2.19.5",
@@ -31483,9 +31483,9 @@
             "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
         },
         "unprint": {
-            "version": "0.8.2",
-            "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.2.tgz",
-            "integrity": "sha512-mCKPDPwtuECbXJJLQbDn2FFbydr6fLKytyS3pymbxcTh2dkk7NFypMjR7qjU2Uv9Fl91hSE48SjYMsWHNKpp4w==",
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.8.1.tgz",
+            "integrity": "sha512-6cF2LgIpc7JEBBXWs/CmJgFBAPmvM5NuD3tDvmnnmZR+wrEF03TNR5kv08iPTV/GhT8EHPhZM3LSd8eRipkWdA==",
             "requires": {
                 "axios": "^0.27.2",
                 "bottleneck": "^2.19.5",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.225.10",
+    "version": "1.225.9",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {
@@ -138,7 +138,7 @@
         "tunnel": "0.0.6",
         "ua-parser-js": "^1.0.32",
         "undici": "^4.13.0",
-        "unprint": "^0.8.2",
+        "unprint": "^0.8.1",
         "url-pattern": "^1.0.3",
         "v-tooltip": "^2.0.3",
         "video.js": "^7.11.4",

seeds/01_networks.js

@@ -250,12 +250,6 @@ const networks = [
 		url: 'https://dogfartnetwork.com',
 		description: 'The world famous Dogfart Interracial series. Online since 1996, we have the largest collection of Interracial videos, pictures and content on the web.',
 	},
-	{
-		slug: 'fabulouscash',
-		name: 'Fabulous Cash',
-		hasLogo: false,
-		url: 'https://fabulouscash.com',
-	},
 	{
 		slug: 'fantasymassage',
 		name: 'Fantasy Massage',
@@ -685,7 +679,6 @@ exports.seed = (knex) => Promise.resolve()
 			alias: network.alias,
 			url: network.url,
 			description: network.description,
-			has_logo: network.hasLogo,
 			parameters: network.parameters,
 			parent_id: grandParentNetworksBySlug[network.parent] || null,
 		}));
@@ -700,7 +693,6 @@ exports.seed = (knex) => Promise.resolve()
 			alias: network.alias,
 			url: network.url,
 			description: network.description,
-			has_logo: network.hasLogo,
 			parameters: network.parameters,
 			parent_id: parentNetworksBySlug[network.parent] || grandParentNetworksBySlug[network.parent] || null,
 		}));

seeds/02_sites.js

@@ -3345,57 +3345,6 @@ const sites = [
 			scene: 'https://www.evilangel.com/en/video',
 		},
 	},
-	// FABULOUS CASH
-	{
-		slug: 'manojob',
-		name: 'Mano Job',
-		url: 'https://www.manojob.com',
-		tags: ['handjob'],
-		alias: ['maj'],
-		independent: true,
-		parent: 'fabulouscash',
-	},
-	{
-		slug: 'thedicksuckers',
-		name: 'The Dick Suckers',
-		url: 'https://www.thedicksuckers.com',
-		alias: ['tds'],
-		independent: true,
-		parent: 'fabulouscash',
-	},
-	{
-		slug: 'finishesthejob',
-		name: 'Finishes The Job',
-		url: 'https://www.finishesthejob.com',
-		independent: true,
-		parent: 'fabulouscash',
-	},
-	{
-		slug: 'mrpov',
-		name: 'Mr. POV',
-		url: 'https://www.mrpov.com',
-		tags: ['pov'],
-		independent: true,
-		parent: 'fabulouscash',
-	},
-	{
-		slug: 'nowayamigay',
-		name: 'No Way Am I Gay',
-		url: 'http://www.nowayamigay.com',
-		parent: 'fabulouscash',
-		parameters: {
-			layout: 'legacy',
-		},
-	},
-	{
-		slug: 'chelcifox',
-		name: 'Chelci Fox',
-		url: 'http://www.chelcifox.com',
-		parent: 'fabulouscash',
-		parameters: {
-			layout: 'legacy',
-		},
-	},
 	// FAKE HUB
 	{
 		slug: 'fakeagentuk',

src/scrapers/fabulouscash.js

@@ -1,79 +0,0 @@
-'use strict';
-
-const unprint = require('unprint');
-
-function scrapeAll(scenes) {
-	return scenes.map(({ query, element }, channel) => {
-		const release = {};
-
-		release.url = query.url('a');
-		release.entryId = new URL(release.url).pathname.match(/\/scene\/\w+\/([\w-]+)/)[1];
-
-		release.title = query.content('.name');
-
-		release.actors = query.all('.performers a').map((actorEl) => ({
-			name: unprint.query.content(actorEl, null).trim(),
-			url: unprint.query.url(actorEl, null, 'href'),
-		}));
-
-		const poster = query.img('img[itemprop="thumbnailUrl"]');
-		const photo = poster.replace('featured.jpg', 'trailer.jpg');
-
-		release.poster = [
-			poster,
-			photo,
-		];
-
-		release.photos = [photo];
-		release.teaser = unprint.prefixUrl(element.dataset.video, channel.url);
-
-		release.stars = query.number('.rating span');
-
-		return release;
-	});
-}
-
-function scrapeScene({ query }, { url, entity }) {
-	const release = {};
-
-	release.entryId = new URL(url).pathname.match(/\/scene\/\w+\/([\w-]+)/)[1];
-
-	release.title = query.content('.container h1');
-	release.description = query.content('//p[contains(text(), "Categories")]/following-sibling::p');
-
-	release.actors = query.all('//h3[contains(text(), "Starring")]/a').map((actorEl) => ({
-		name: unprint.query.content(actorEl, null).trim(),
-		url: unprint.query.url(actorEl, null, 'href'),
-	}));
-
-	const photo = query.poster('.container video', { origin: entity.url });
-
-	release.poster = [
-		photo.replace('trailer.jpg', 'featured.jpg'),
-		photo,
-	];
-
-	release.photos = [photo];
-	release.trailer = query.video();
-
-	release.tags = query.contents('//p[contains(text(), "Categories")]/a');
-
-	return release;
-}
-
-async function fetchLatest(channel, page = 1) {
-	const url = `${channel.url}/updates/${page}`;
-	const res = await unprint.get(url, { selectAll: '.card.scene' });
-
-	if (res.ok) {
-		return scrapeAll(res.context, channel);
-	}
-
-	return res.status;
-}
-
-module.exports = {
-	fetchLatest,
-	scrapeScene,
-	useUnprint: true,
-};

src/scrapers/scrapers.js

@@ -17,7 +17,6 @@ const czechav = require('./czechav');
 const ddfnetwork = require('./ddfnetwork');
 const dogfart = require('./dogfart');
 const dorcel = require('./dorcel');
-const fabulouscash = require('./fabulouscash');
 const famedigital = require('./famedigital');
 const firstanalquest = require('./firstanalquest');
 const elevatedx = require('./elevatedx');
@@ -98,7 +97,6 @@ const scrapers = {
 		elegantangel: adultempire,
 		famedigital,
 		exploitedx: elevatedx,
-		fabulouscash,
 		firstanalquest,
 		forbondage: porndoe,
 		fullpornnetwork,

src/web/postgraphile.js

@@ -21,7 +21,6 @@ async function pgSettings(req) {
 
 // console.log(PgAggregatesPlugin);
 
-/*
 const TagsAggregatePlugin = (builder) => {
 	builder.hook('build', (build) => {
 		const pgAggregateSpecs = [
@@ -30,8 +29,8 @@ const TagsAggregatePlugin = (builder) => {
 				humanLabel: 'tags',
 				HumanLabel: 'Tags',
 				sqlAggregateWrap: (sqlFrag) => {
-					// console.log('sql frag', sqlFrag);
-					return build.pgSql.fragment`select tag_id from tags where release_id = ${sqlFrag}`;
+					console.log('sql frag', sqlFrag);
+					return build.pgSql.fragment`sum(${sqlFrag})`;
 				},
 				isSuitableType: (pgType) => {
 					// console.log('pg type', pgType);
@@ -40,12 +39,9 @@ const TagsAggregatePlugin = (builder) => {
 			},
 		];
 
-		build.pgAggregateGroupBySpecs = pgAggregateSpecs; // eslint-disable-line no-param-reassign
-
-		return build;
+		build.pgAggregateSpecs = pgAggregateSpecs; // eslint-disable-line no-param-reassign
 	});
 };
-*/
 
 module.exports = postgraphile(
 	connectionString,
@@ -73,7 +69,7 @@ module.exports = postgraphile(
 			...SitePlugins,
 			...ReleasePlugins,
 			...MediaPlugins,
-			// TagsAggregatePlugin,
+			TagsAggregatePlugin,
 		],
 		pgSettings,
 	},