assets/js/entities/actions.js

@@ -22,6 +22,8 @@ function initEntitiesActions(store, router) {
                 $offset: Int = 0,
                 $after: Datetime = "1900-01-01",
                 $before: Datetime = "2100-01-01",
+                $afterTime: Datetime = "1900-01-01",
+                $beforeTime: Datetime = "2100-01-01",
                 $orderBy: [ReleasesOrderBy!]
                 $exclude: [String!]
 				$hasAuth: Boolean!
@@ -89,19 +91,20 @@ function initEntitiesActions(store, router) {
 							or: [
 								{
 									date: {
-										isNull: ${entityType === 'channel'}
+										lessThan: $before,
+										greaterThan: $after
 									}
-								}
+								},
 								{
 									date: {
-										isNull: false
+										isNull: true
+									},
+									createdAt: {
+										lessThan: $beforeTime,
+										greaterThan: $afterTime,
 									}
 								}
 							]
-							effectiveDate: {
-								lessThan: $before,
-								greaterThan: $after
-							}
 							releasesTagsConnection: {
 								none: {
 									tag: {
@@ -128,6 +131,8 @@ function initEntitiesActions(store, router) {
 			after,
 			before,
 			orderBy,
+			afterTime: store.getters.after,
+			beforeTime: store.getters.before,
 			exclude: store.state.ui.tagFilter,
 			hasAuth: !!store.state.auth.user,
 			userId: store.state.auth.user?.id,

assets/js/get-date-range.js

@@ -3,6 +3,30 @@ import dayjs from 'dayjs';
 
 dayjs.extend(utc);
 
+const dateRanges = {
+	latest: () => ({
+		after: '1900-01-01',
+		before: dayjs.utc().toDate(),
+		orderBy: ['DATE_DESC', 'CREATED_AT_DESC'],
+	}),
+	upcoming: () => ({
+		after: dayjs.utc().toDate(),
+		before: '2100-01-01',
+		orderBy: ['DATE_ASC', 'CREATED_AT_ASC'],
+	}),
+	new: () => ({
+		after: '1900-01-01 00:00:00',
+		before: '2100-01-01',
+		orderBy: ['CREATED_AT_DESC', 'DATE_ASC'],
+	}),
+	all: () => ({
+		after: '1900-01-01',
+		before: '2100-01-01',
+		orderBy: ['DATE_DESC', 'CREATED_AT_DESC'],
+	}),
+};
+
+/* requires PostgreSQL 12.x> not available in production yet
 const dateRanges = {
 	latest: () => ({
 		after: '1900-01-01',
@@ -25,6 +49,7 @@ const dateRanges = {
 		orderBy: ['EFFECTIVE_DATE_DESC'],
 	}),
 };
+*/
 
 function getDateRange(range) {
 	return (dateRanges[range] || dateRanges.all)();

package-lock.json

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

package.json

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

src/scrapers/julesjordan.js

@@ -136,15 +136,15 @@ function getEntryId(html) {
 function scrapeAll(scenes, site, entryIdFromTitle) {
 	return scenes.map(({ el, query }) => {
 		const release = {};
-		const title = query.cnt('.content_img div, .dvd_info > a, a.update_title, a[title] + a[title]') || query.cnt('a[title*=" "]');
+		const title = query.cnt('.content_img div, .dvd_info > a, a ~ a');
 
-		release.title = title?.slice(0, title.match(/starring:/i)?.index || Infinity).trim();
+		release.title = title.slice(0, title.match(/starring:/i)?.index || Infinity).trim();
-		release.url = query.url('.content_img a, .dvd_info > a, a.update_title, a[title*=" "]');
+		release.url = query.url('.content_img a, .dvd_info > a, a ~ a');
 		release.date = query.date('.update_date', 'MM/DD/YYYY');
 
 		release.entryId = (entryIdFromTitle && slugify(release.title)) || el.dataset.setid || query.q('.rating_box')?.dataset.id;
 
-		release.actors = query.all('.content_img .update_models a, .update_models a').map((actorEl) => ({
+		release.actors = query.all('.content_img .update_models a').map((actorEl) => ({
 			name: query.cnt(actorEl),
 			url: query.url(actorEl, null),
 		}));
@@ -319,7 +319,7 @@ function scrapeMovie({ el, query }, url, site) {
 		?.map((scene) => ({ ...scene, movie }))
 		.sort((sceneA, sceneB) => sceneA.date - sceneB.date);
 
-	movie.date = curatedScenes?.[0]?.date;
+	movie.date = curatedScenes?.[0].date;
 
 	return {
 		...movie,