assets/components/releases/banner.vue

@@ -164,8 +164,8 @@ function poster() {
 function photos() {
 	const clips = this.release.clips || [];
 	const clipPostersById = clips.reduce((acc, clip) => ({ ...acc, [clip.poster.id]: clip.poster }), {});
-	const uniqueClipPosters = Array.from(new Set(clips.map((clip) => clip.poster.id) || [])).map((posterId) => clipPostersById[posterId]);
+	const uniqueClipPosters = Array.from(new Set(clips.map(clip => clip.poster.id) || [])).map(posterId => clipPostersById[posterId]);
-	const photosWithClipPosters = (this.release.photos || []).concat(this.release.scenesPhotos || []).concat(uniqueClipPosters);
+	const photosWithClipPosters = (this.release.photos || []).concat(uniqueClipPosters);
 
 	if (this.release.trailer || (this.release.teaser && this.release.teaser.mime !== 'image/gif')) {
 		// poster will be on trailer video

assets/components/releases/release.vue

@@ -28,7 +28,7 @@
 
 		<Album
 			v-if="showAlbum"
-			:items="[release.poster, ...release.photos, ...release.scenesPhotos]"
+			:items="[release.poster, ...release.photos]"
 			:title="release.title"
 			:path="config.media.mediaPath"
 			@close="$router.replace({ hash: undefined })"

assets/js/curate.js

@@ -79,7 +79,6 @@ function curateRelease(release, type = 'scene') {
 	if (release.series) curatedRelease.series = release.series.filter(Boolean).map(({ serie }) => curateRelease(serie, 'serie'));
 	if (release.chapters) curatedRelease.chapters = release.chapters.filter(Boolean).map((chapter) => curateRelease(chapter));
 	if (release.photos) curatedRelease.photos = release.photos.filter(Boolean).map((photo) => photo.media || photo);
-	if (release.scenesPhotos) curatedRelease.scenesPhotos = release.scenesPhotos.filter(Boolean).map((photo) => photo.media || photo);
 	if (release.covers) curatedRelease.covers = release.covers.filter(Boolean).map(({ media }) => media);
 	if (release.trailer) curatedRelease.trailer = release.trailer.media;
 	if (release.teaser) curatedRelease.teaser = release.teaser.media;

assets/js/fragments.js

@@ -442,26 +442,22 @@ const releasesFragment = `
     }
 `;
 
-const mediaFields = `
-	id
-	index
-	path
-	thumbnail
-	lazy
-	isS3
-	comment
-	sfw: sfwMedia {
-		id
-		thumbnail
-		lazy
-		path
-		comment
-	}
-`;
-
 const mediaFragment = `
 	media {
-		${mediaFields}
+		id
+		index
+		path
+		thumbnail
+		lazy
+		isS3
+		comment
+		sfw: sfwMedia {
+			id
+			thumbnail
+			lazy
+			path
+			comment
+		}
 	}
 `;
 
@@ -660,8 +656,6 @@ export {
 	actorFields,
 	actorStashesFields,
 	campaignsFragment,
-	mediaFields,
-	mediaFragment,
 	movieFields,
 	releaseActorsFragment,
 	releaseFields,

assets/js/releases/actions.js

@@ -4,8 +4,6 @@ import {
 	releaseFragment,
 	releaseFields,
 	movieFields,
-	mediaFragment,
-	mediaFields,
 } from '../fragments';
 import { curateRelease } from '../curate';
 import getDateRange from '../get-date-range';
@@ -227,11 +225,25 @@ function initReleasesActions(store, router) {
 						slug
 						name
 					}
-					photos: moviesPhotos {
+					photos {
-						${mediaFragment}
+						id
-					}
+						index
-					scenesPhotos {
+						path
-						${mediaFields}
+						thumbnail
+						lazy
+						width
+						height
+						thumbnailWidth
+						thumbnailHeight
+						isS3
+						comment
+						sfw: sfwMedia {
+							id
+							thumbnail
+							lazy
+							path
+							comment
+						}
 					}
 					entity {
 						id

migrations/20220304233846_series.js

@@ -183,6 +183,8 @@ exports.up = async (knex) => Promise.resolve()
 			ORDER BY media.index ASC
 		$$ LANGUAGE SQL STABLE;
 
+		COMMENT ON FUNCTION search_movies IS E'@sortable';
+
 		GRANT ALL ON ALL TABLES IN SCHEMA public TO :visitor;
 		GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO :visitor;
 

migrations/20220327230125_movie_photos.js

@@ -1,31 +0,0 @@
-const config = require('config');
-
-exports.up = async (knex) => Promise.resolve()
-	.then(() => knex.raw(`
-		ALTER FUNCTION movies_photos(movie movies) RENAME TO movies_scenes_photos;
-	`))
-	.then(() => knex.schema.createTable('movies_photos', (table) => {
-		table.integer('movie_id', 16)
-			.notNullable()
-			.references('id')
-			.inTable('movies')
-			.onDelete('cascade');
-
-		table.text('media_id', 21)
-			.notNullable()
-			.references('id')
-			.inTable('media');
-
-		table.unique(['movie_id', 'media_id']);
-	}))
-	.then(() => knex.raw(`
-		GRANT ALL ON ALL TABLES IN SCHEMA public TO :visitor;
-		GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO :visitor;
-	`, {
-		visitor: knex.raw(config.database.query.user),
-	}));
-
-exports.down = async (knex) => knex.raw(`
-	DROP TABLE IF EXISTS movies_photos CASCADE;
-	ALTER FUNCTION movies_scenes_photos(movie movies) RENAME TO movies_photos;
-`);

package-lock.json

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

package.json

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

src/argv.js

@@ -238,7 +238,6 @@ const { argv } = yargs
 		default: false,
 	})
 	.option('level', {
-		alias: 'log-level',
 		describe: 'Log level',
 		type: 'string',
 		default: process.env.NODE_ENV === 'development' ? 'silly' : 'info',