assets/js/actors/actions.js

@@ -37,6 +37,8 @@ function initActorActions(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!]
 				$selectableTags: [String],
 				$includedTags: [String!],
@@ -204,10 +206,23 @@ function initActorActions(store, router) {
 					}
                     scenesConnection(
                         filter: {
-							effectiveDate: {
+							or: [
+								{
+									date: {
 										lessThan: $before,
 										greaterThan: $after
 									}
+								},
+								{
+									date: {
+										isNull: true
+									},
+									createdAt: {
+										lessThan: $beforeTime,
+										greaterThan: $afterTime,
+									}
+								}
+							]
 							and: [
 								{
 									or: $includedEntities
@@ -249,6 +264,8 @@ function initActorActions(store, router) {
 			offset: Math.max(0, (pageNumber - 1)) * limit,
 			after,
 			before,
+			afterTime: store.getters.after,
+			beforeTime: store.getters.before,
 			selectableTags: config.selectableTags,
 			orderBy,
 			exclude: store.state.ui.tagFilter,

assets/js/fragments.js

@@ -419,7 +419,7 @@ const releasesFragment = `
     connection: releasesConnection(
         filter: {
 			releasesNotShowcasedsConnectionExist: false
-			effectiveDate: {
+			date: {
 				lessThan: $before,
 				greaterThan: $after
 			}
@@ -444,6 +444,40 @@ const releasesFragment = `
     }
 `;
 
+// unused due performance
+const releasesShowcasedFragment = `
+    connection: releasesShowcasedsConnection(
+        filter: {
+			release: {
+				date: {
+					lessThan: $before,
+					greaterThan: $after
+				}
+				releasesTagsConnection: {
+					none: {
+						tag: {
+							or: [
+								{ slug: { in: $exclude } }
+								{ name: { in: $exclude } }
+							]
+						}
+					}
+				}
+			}
+        },
+        first: $limit,
+		offset: $offset,
+        orderBy: $orderBy
+    ) {
+		releases: nodes {
+			release {
+				${releaseFields}
+			}
+		}
+		totalCount
+    }
+`;
+
 const mediaFields = `
 	id
 	index
@@ -681,6 +715,7 @@ export {
 	releasePhotosFragment,
 	releaseTrailerFragment,
 	releasesFragment,
+	releasesShowcasedFragment,
 	releaseFragment,
 	siteFragment,
 	sitesFragment,

assets/js/networks/actions.js

@@ -1,7 +1,7 @@
 import { graphql } from '../api';
 // import { sitesFragment, releaseFields } from '../fragments';
 import { releaseFields } from '../fragments';
-import { curateEntity } from '../curate';
+import { curateNetwork } from '../curate';
 import getDateRange from '../get-date-range';
 
 function initNetworksActions(store, _router) {
@@ -59,10 +59,23 @@ function initNetworksActions(store, _router) {
 								{ parent: { parent: { slug: { equalTo: $networkSlug } } } }
 							]
 						}
-						effectiveDate: {
+						or: [
+							{
+								date: {
 									lessThan: $before,
 									greaterThan: $after
 								}
+							},
+							{
+								date: {
+									isNull: true
+								},
+								createdAt: {
+									lessThan: $beforeTime,
+									greaterThan: $afterTime,
+								}
+							}
+						]
 						releasesTagsConnection: {
 							none: {
 								tag: {
@@ -93,7 +106,7 @@ function initNetworksActions(store, _router) {
 		});
 
 		return {
-			network: curateEntity(network, releases),
+			network: curateNetwork(network, releases),
 			totalCount,
 		};
 	}
@@ -118,7 +131,7 @@ function initNetworksActions(store, _router) {
             }
         `);
 
-		return networks.map((network) => curateEntity(network));
+		return networks.map(network => curateNetwork(network));
 	}
 
 	return {

assets/js/sites/actions.js

@@ -1,6 +1,6 @@
 import { graphql } from '../api';
 import { releaseFields } from '../fragments';
-import { curateEntity, curateRelease } from '../curate';
+import { curateSite, curateRelease } from '../curate';
 import getDateRange from '../get-date-range';
 
 function initSitesActions(store, _router) {
@@ -41,7 +41,7 @@ function initSitesActions(store, _router) {
                     }
                     releasesConnection(
                         filter: {
-							effectiveDate: {
+							date: {
 								lessThan: $before,
 								greaterThan: $after,
 							},
@@ -75,7 +75,7 @@ function initSitesActions(store, _router) {
 								equalTo: $siteSlug
 							}
 						}
-						effectiveDate: {
+						date: {
 							lessThan: $before,
 							greaterThan: $after
 						}
@@ -107,8 +107,8 @@ function initSitesActions(store, _router) {
 		});
 
 		return {
-			site: curateEntity(site),
-			releases: releases.map((release) => curateRelease(release)),
+			site: curateSite(site),
+			releases: releases.map(release => curateRelease(release)),
 			totalCount,
 		};
 	}

assets/js/tags/actions.js

@@ -157,7 +157,7 @@ function initTagsActions(store, _router) {
 					}
                     scenesConnection(
                         filter: {
-							effectiveDate: {
+							date: {
 								lessThan: $before,
 								greaterThan: $after,
 							},

package-lock.json

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

package.json

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