1.128.7

assets/js/get-date-range.js

@@ -5,23 +5,23 @@ dayjs.extend(utc);
 
 const dateRanges = {
 	latest: () => ({
-		after: '1900-01-01 00:00:00',
+		after: '1900-01-01',
-		before: dayjs.utc().format('YYYY-MM-DD HH:mm:ss'),
+		before: dayjs.utc().toDate(),
 		orderBy: 'DATE_DESC',
 	}),
 	upcoming: () => ({
-		after: dayjs.utc().format('YYYY-MM-DD HH:mm:ss'),
+		after: dayjs.utc().toDate(),
-		before: '2100-01-01 00:00:00',
+		before: '2100-01-01',
 		orderBy: 'DATE_ASC',
 	}),
 	new: () => ({
 		after: '1900-01-01 00:00:00',
-		before: '2100-01-01 00:00:00',
+		before: '2100-01-01',
 		orderBy: ['CREATED_AT_DESC', 'DATE_ASC'],
 	}),
 	all: () => ({
-		after: '1900-01-01 00:00:00',
+		after: '1900-01-01',
-		before: '2100-01-01 00:00:00',
+		before: '2100-01-01',
 		orderBy: 'DATE_DESC',
 	}),
 };

migrations/20190325001339_releases.js

@@ -1004,6 +1004,8 @@ exports.up = knex => Promise.resolve()
 				GROUP BY entities.id;
 			$$ LANGUAGE SQL STABLE;
 
+			/* GraphQL/Postgraphile 'every' applies to the data, will only include scenes for which every assigned tag is selected,
+			   instead of what we want; scenes with every selected tag, but possibly also some others */
 			CREATE FUNCTION actors_scenes(actor actors, selected_tags text[], mode text DEFAULT 'all') RETURNS SETOF releases AS $$
 				SELECT releases.*
 				FROM releases
@@ -1015,18 +1017,22 @@ exports.up = knex => Promise.resolve()
 					tags ON tags.id = releases_tags.tag_id
 				WHERE releases_actors.actor_id = actor.id
 				AND CASE
-					WHEN mode = 'any' AND array_length(selected_tags, 1) > 0
+					/* match at least one of the selected tags */
+					WHEN mode = 'any'
+					AND array_length(selected_tags, 1) > 0
 					THEN tags.slug = ANY(selected_tags)
 					ELSE true
 					END
 				GROUP BY releases.id
 				HAVING CASE
-					WHEN mode = 'all' AND array_length(selected_tags, 1) > 0
+					/* match all of the selected tags */
-						THEN COUNT(
+					WHEN mode = 'all'
-							CASE WHEN tags.slug = ANY(selected_tags)
+					AND array_length(selected_tags, 1) > 0
-							THEN true
+					THEN COUNT(
-							END
+						CASE WHEN tags.slug = ANY(selected_tags)
-						) = array_length(selected_tags, 1)
+						THEN true
+						END
+					) = array_length(selected_tags, 1)
 					ELSE true
 				END;
 			$$ LANGUAGE SQL STABLE;

package-lock.json

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

package.json

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

seeds/03_studios.js

@@ -110,6 +110,12 @@ const studios = [
 		url: 'https://www.legalporno.com/studios/omar-galanti-productions',
 		parent: 'legalporno',
 	},
+	{
+		slug: 'marywet',
+		name: 'Marywet',
+		url: 'https://www.legalporno.com/studios/marywet',
+		parent: 'legalporno',
+	},
 	{
 		slug: 'norestfortheass',
 		name: 'No Rest For The Ass',

src/scrapers/julesjordan.js

@@ -186,48 +186,41 @@ function scrapeUpcoming(html, site) {
 	const scenesElements = $('#coming_soon_carousel').find('.table').toArray();
 
 	return scenesElements.map((element) => {
-		const entryId = $(element).find('.upcoming_updates_thumb').attr('id').match(/\d+/)[0];
+		const release = {};
+
+		release.entryId = $(element).find('.upcoming_updates_thumb').attr('id').match(/\d+/)[0];
 
 		const details = $(element).find('.update_details_comingsoon')
 			.eq(1)
 			.children()
 			.remove();
 
-		const title = details
+		release.title = details
 			.end()
 			.text()
 			.trim();
 
-		const actors = details
+		release.actors = details
 			.text()
 			.trim()
 			.split(', ');
 
-		const date = moment
+		release.date = moment
 			.utc($(element).find('.update_date_comingsoon').text().slice(7), 'MM/DD/YYYY')
 			.toDate();
 
 		const photoElement = $(element).find('a img.thumbs');
 		const posterPath = photoElement.attr('src');
-		const poster = posterPath.match(/^http/) ? posterPath : `${site.url}${posterPath}`;
+		release.poster = posterPath.match(/^http/) ? posterPath : `${site.url}${posterPath}`;
 
 		const videoClass = $(element).find('.update_thumbnail div').attr('class');
 		const videoScript = $(element).find(`script:contains(${videoClass})`).html();
-		const teaser = videoScript.slice(videoScript.indexOf('https://'), videoScript.indexOf('.mp4') + 4);
 
-		return {
+		if (videoScript) {
-			url: null,
+			release.teaser = videoScript.slice(videoScript.indexOf('https://'), videoScript.indexOf('.mp4') + 4);
-			entryId,
+		}
-			title,
+
-			date,
+		return release;
-			actors,
-			poster,
-			teaser: {
-				src: teaser,
-			},
-			rating: null,
-			site,
-		};
 	});
 }