Added screen caps separate from photos. Added Tokyo Hot. Added hair type, shoe size and blood type actor fields.

assets/js/curate.js

@@ -80,6 +80,7 @@ function curateRelease(release, type = 'scene', context = {}) {
 	curatedRelease.series = release.series?.filter(Boolean).map(({ serie }) => curateRelease(serie, 'serie', context)) || [];
 	curatedRelease.chapters = release.chapters?.filter(Boolean).map((chapter) => curateRelease(chapter, 'chapter', context)) || [];
 	curatedRelease.photos = release.photos?.filter(Boolean).map((photo) => photo.media || photo) || [];
+	curatedRelease.caps = release.caps?.filter(Boolean).map((cap) => cap.media || cap) || [];
 	curatedRelease.scenesPhotos = release.scenesPhotos?.filter(Boolean).map((photo) => photo.media || photo) || [];
 	curatedRelease.covers = release.covers?.filter(Boolean).map(({ media }) => media) || [];
 

assets/js/entities/actions.js

@@ -89,21 +89,34 @@ function initEntitiesActions(store, router) {
 					offset: $offset
 					orderBy: $orderBy
 					filter: {
-					    not: { tags: { overlaps: $exclude } }
 					    effectiveDate: { lessThan: $before, greaterThan: $after }
 					    showcased: { equalTo: true }
-						or: [
+						and: [
 							{
-								channelSlug: { equalTo: $entitySlug }
-								channelType: { equalTo: $entityType }
+								or: [
+									{
+										not: { tags: { overlaps: $exclude } }
+									}
+									{
+										tags: { isNull: true }
+									}
+								]
 							}
 							{
-								networkSlug: { equalTo: $entitySlug }
-								networkType: { equalTo: $entityType }
-							}
-							{
-								parentNetworkSlug: { equalTo: $entitySlug }
-								parentNetworkType: { equalTo: $entityType }
+								or: [
+									{
+										channelSlug: { equalTo: $entitySlug }
+										channelType: { equalTo: $entityType }
+									}
+									{
+										networkSlug: { equalTo: $entitySlug }
+										networkType: { equalTo: $entityType }
+									}
+									{
+										parentNetworkSlug: { equalTo: $entitySlug }
+										parentNetworkType: { equalTo: $entityType }
+									}
+								]
 							}
 						]
 					}

assets/js/fragments.js

@@ -354,6 +354,31 @@ const releasePhotosFragment = `
     }
 `;
 
+const releaseCapsFragment = `
+    caps: releasesCaps(orderBy: MEDIA_BY_MEDIA_ID__INDEX_ASC) {
+        media {
+			id
+            index
+            path
+            thumbnail
+			width
+			height
+			thumbnailWidth
+			thumbnailHeight
+            lazy
+			isS3
+            comment
+            sfw: sfwMedia {
+                id
+                thumbnail
+                lazy
+                path
+                comment
+            }
+        }
+    }
+`;
+
 const releaseTrailerFragment = `
     trailer: releasesTrailer {
         media {
@@ -398,6 +423,7 @@ const releaseFields = `
     ${releaseTagsFragment}
     ${releasePosterFragment}
     ${releasePhotosFragment}
+    ${releaseCapsFragment}
     ${siteFragment}
     studio {
         id
@@ -470,7 +496,14 @@ const releasesFragment = `
 		offset: $offset
         orderBy: $orderBy
 		filter: {
-		  not: { tags: { overlaps: $exclude } }
+		  or: [
+			{
+			  not: { tags: { overlaps: $exclude } }
+			}
+			{
+			  tags: { isNull: true }
+			}
+		  ]
 		  effectiveDate: { lessThan: $before, greaterThan: $after }
 		  showcased: { equalTo: true }
 		}
@@ -535,6 +568,7 @@ const releaseFragment = `
     ${releaseTagsFragment}
     ${releasePosterFragment}
     ${releasePhotosFragment}
+    ${releaseCapsFragment}
     ${releaseCoversFragment}
     ${releaseTrailerFragment}
     ${releaseTeaserFragment}

assets/js/tags/actions.js

@@ -161,7 +161,14 @@ function initTagsActions(store, _router) {
 					offset: $offset
 					orderBy: $orderBy
 					filter: {
-					    not: { tags: { overlaps: $exclude } }
+					    or: [
+					      {
+					        not: { tags: { overlaps: $exclude } }
+					      }
+					      {
+					        tags: { isNull: true }
+					      }
+					    ]
 					    tags: { anyEqualTo: $tagSlug }
 					    effectiveDate: { lessThan: $before, greaterThan: $after }
 					    showcased: { equalTo: true }