0.49.8

components/actors/bio.vue

@@ -105,7 +105,7 @@
 				class="bio-item residence"
 				:class="{ hideable: !!actor.origin }"
 			>
-				<dfn class="bio-label"><Icon icon="location" />Lives in</dfn>
+				<dfn class="bio-label"><Icon icon="location" />{{ actor.dateOfDeath ? 'Lived' : 'Lives' }} in</dfn>
 
 				<span>
 					<span

components/actors/tile.vue

@@ -41,7 +41,7 @@
 
 					<span
 						v-if="actor.ageAtDeath"
-						:title="`Passed ${formatDate(actor.ageAtDeath, 'MMMM d, yyyy')}`"
+						:title="`Passed ${formatDate(actor.dateOfDeath, 'MMMM d, yyyy')}`"
 						class="age age-death"
 					>{{ actor.ageAtDeath }}</span>
 

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.49.4",
+  "version": "0.49.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.49.4",
+      "version": "0.49.8",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -92,7 +92,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.49.4",
+  "version": "0.49.8",
   "imports": {
     "#/*": "./*.js"
   }

pages/entities/@entitySlug/+onBeforeRender.js

@@ -57,19 +57,23 @@ export async function onBeforeRender(pageContext) {
 		fetchReleases(pageContext, entityId),
 	]);
 
+	const entityIds = entity.isIndependent || !entity.parent
+		? [entity.id]
+		: [entity.id, entity.parent.id];
+
 	const campaigns = await getRandomCampaigns([
 		{
-			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
+			entityIds,
 			minRatio: 3,
 			allowRandomFallback: false,
 		},
 		{
-			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
+			entityIds,
 			minRatio: 3,
 			allowRandomFallback: false,
 		},
 		pageContext.routeParams.domain === 'scenes' ? {
-			entityIds: [entity.id, entity.parent?.id].filter(Boolean),
+			entityIds,
 			minRatio: 0.75,
 			maxRatio: 1.25,
 			allowRandomFallback: false,

src/actors.js

@@ -80,6 +80,8 @@ export function curateActor(actor, context = {}) {
 		ageThen: context.sceneDate && actor.date_of_birth && actor.date_of_birth.getFullYear() > 1
 			? differenceInYears(context.sceneDate, actor.date_of_birth)
 			: null,
+		dateOfBirth: actor.date_of_birth,
+		dateOfDeath: actor.date_of_death,
 		bust: actor.bust,
 		cup: actor.cup,
 		waist: actor.waist,

src/scenes.js

@@ -17,7 +17,6 @@ import initLogger from './logger.js';
 import { curateRevision } from './revisions.js';
 import { getAffiliateSceneUrl } from './affiliates.js';
 import { censor } from './censor.js';
-import initSceneRevisions from '../common/scenes-revisions.mjs';
 
 const logger = initLogger();
 const mj = new MerkleJson();
@@ -757,20 +756,6 @@ export async function fetchSceneRevisions(revisionId, filters = {}, reqUser) {
 	};
 }
 
-const { createSceneRevision, reviewSceneRevision } = initSceneRevisions({
-	config,
-	knex,
-	mj,
-	logger,
-	fetchScenesById,
-});
-
-export {
-	createSceneRevision,
-	reviewSceneRevision,
-};
-
-/*
 const keyMap = {
 	datePrecision: 'date_precision',
 	productionDate: 'production_date',
@@ -947,6 +932,10 @@ export async function reviewSceneRevision(revisionId, isApproved, { feedback },
 }
 
 export async function createSceneRevision(sceneId, { edits, comment, apply }, reqUser) {
+	if (!reqUser) {
+		throw new HttpError('Must be authenticated to create scene revision', 401);
+	}
+
 	const [
 		[scene],
 		openRevisions,
@@ -1058,4 +1047,3 @@ export async function createSceneRevision(sceneId, { edits, comment, apply }, re
 		reviewSceneRevision(revisionEntry.id, true, {}, reqUser).catch(() => {});
 	}
 }
-*/

src/stashes.js

@@ -200,6 +200,10 @@ export async function createStash(newStash, sessionUser) {
 		throw new HttpError('You are not authenthicated', 401);
 	}
 
+	if (!newStash) {
+		throw new HttpError('Missing new stash', 400);
+	}
+
 	verifyStashName(newStash);
 
 	try {
@@ -224,6 +228,14 @@ export async function updateStash(stashIdOrSlug, updatedStash, sessionUser) {
 		throw new HttpError('You are not authenthicated', 401);
 	}
 
+	if (!stashIdOrSlug) {
+		throw new HttpError('Missing stash ID or slug', 400);
+	}
+
+	if (!updatedStash) {
+		throw new HttpError('Missing updated stash', 400);
+	}
+
 	if (updatedStash.name) {
 		verifyStashName(updatedStash);
 	}
@@ -260,6 +272,10 @@ export async function removeStash(stashId, sessionUser) {
 		throw new HttpError('You are not authenthicated', 401);
 	}
 
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {
@@ -283,6 +299,14 @@ export async function removeStash(stashId, sessionUser) {
 }
 
 export async function stashActor(actorId, stashId, sessionUser) {
+	if (!actorId) {
+		throw new HttpError('Missing actor ID', 400);
+	}
+
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {
@@ -324,6 +348,14 @@ export async function stashActor(actorId, stashId, sessionUser) {
 }
 
 export async function unstashActor(actorId, stashId, sessionUser) {
+	if (!actorId) {
+		throw new HttpError('Missing actor ID', 400);
+	}
+
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {
@@ -367,6 +399,14 @@ export async function unstashActor(actorId, stashId, sessionUser) {
 }
 
 export async function stashScene(sceneId, stashId, sessionUser) {
+	if (!sceneId) {
+		throw new HttpError('Missing scene ID', 400);
+	}
+
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {
@@ -409,6 +449,14 @@ export async function stashScene(sceneId, stashId, sessionUser) {
 }
 
 export async function unstashScene(sceneId, stashId, sessionUser) {
+	if (!sceneId) {
+		throw new HttpError('Missing scene ID', 400);
+	}
+
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {
@@ -448,6 +496,14 @@ export async function unstashScene(sceneId, stashId, sessionUser) {
 }
 
 export async function stashMovie(movieId, stashId, sessionUser) {
+	if (!movieId) {
+		throw new HttpError('Missing movie ID', 400);
+	}
+
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {
@@ -489,6 +545,14 @@ export async function stashMovie(movieId, stashId, sessionUser) {
 }
 
 export async function unstashMovie(movieId, stashId, sessionUser) {
+	if (!movieId) {
+		throw new HttpError('Missing movie ID', 400);
+	}
+
+	if (!stashId) {
+		throw new HttpError('Missing stash ID', 400);
+	}
+
 	const stash = await fetchStashById(stashId, sessionUser);
 
 	if (!stash) {

src/web/consent.js

@@ -2,14 +2,14 @@ export default function consentHandler(req, res, next) {
 	const redirect = req.headers.referer && new URL(req.headers.referer).searchParams.get('redirect');
 
 	if (Object.hasOwn(req.query, 'lgbt')) {
-		const lgbtFilters = (req.tagFilter || []).filter((tag) => !['gay', 'bisexual', 'transsexual'].includes(tag));
+		const lgbtFilters = Array.from(new Set([...(req.tagFilter || []).filter((tag) => !['gay', 'bisexual', 'transsexual'].includes(tag)), 'extreme-insertion']));
 
 		req.tagFilter = lgbtFilters; // eslint-disable-line no-param-reassign
 		res.cookie('tags', JSON.stringify(lgbtFilters));
 	}
 
 	if (Object.hasOwn(req.query, 'straight')) {
-		const straightFilters = Array.from(new Set([...(req.tagFilter || []), 'gay', 'bisexual', 'transsexual']));
+		const straightFilters = Array.from(new Set([...(req.tagFilter || []), 'gay', 'bisexual', 'transsexual', 'extreme-insertion']));
 
 		req.tagFilter = straightFilters; // eslint-disable-line no-param-reassign
 		res.cookie('tags', JSON.stringify(straightFilters));