0.49.7

assets/consent.html

@@ -19,6 +19,9 @@
 
 		<meta name="viewport" content="width=device-width,height=device-height,initial-scale=1.0,interactive-widget=resizes-content" />
 
+		<!-- RTA restricted to adults label -->
+		<meta name="RATING" content="RTA-5042-1996-1400-1577-RTA" />
+
 		<title>traxxx - Consent</title>
 		<style>
 			:root {
@@ -156,6 +159,12 @@
 				text-decoration: underline;
 			}
 
+			.rta {
+				position: fixed;
+				bottom: .5rem;
+				right: .5rem;
+			}
+
 			@media(max-width: 800px) {
 				.heading {
 					font-size: 1.25rem;
@@ -219,5 +228,12 @@
 				</a>
 			</div>
 		</div>
+
+		<img
+			src="/img/rta.gif"
+			alt="RTA Restricted To Adults"
+			title="RTA Restricted To Adults"
+			class="rta"
+		>
 	</body>
 </html>

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
@@ -312,10 +312,10 @@
 					<a
 						v-for="social in socials"
 						:key="`social-${social.id}`"
+						v-tooltip="social.platform ? `${social.platform} ${env.socials.prefix[social.platform] || env.socials.prefix.default}${social.handle}` : social.url"
 						:href="getSocialUrl(social)"
 						target="_blank"
 						rel="noopener"
-						:title="social.platform || social.url"
 						class="social ellipsis"
 					>
 						<Icon
@@ -339,7 +339,9 @@
 							:class="`icon-social icon-${social.platform} icon-generic`"
 						/>
 
+						<!--
 						<template v-if="social.platform">{{ env.socials.prefix[social.platform] || env.socials.prefix.default }}</template>{{ social.handle }}
+						-->
 					</a>
 				</ul>
 			</div>
@@ -498,7 +500,7 @@ function getSocialUrl(social) {
 	return null;
 }
 
-const socials = props.actor.socials.map((social) => ({
+const socials = props.actor.socials.slice(0, 10).map((social) => ({
 	...social,
 	handle: social.url
 		? new URL(social.url).hostname
@@ -735,19 +737,23 @@ const socials = props.actor.socials.map((social) => ({
 }
 
 .socials {
+	display: flex;
+	flex-wrap: wrap;
+	/*
 	display: grid;
 	grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
 	grid-gap: 0 0;
 	overflow: hidden;
+	*/
 	gap: .25rem;
 	padding: 0;
 }
 
 .social {
-	display: flex;
-	height: 2rem;
+	display: inline-flex;
 	align-items: center;
-	padding: .1rem .5rem;
+	justify-content: center;
+	padding: .75rem .75rem;
 	border-radius: .25rem;
 	color: inherit;
 	text-decoration: none;
@@ -755,10 +761,6 @@ const socials = props.actor.socials.map((social) => ({
 	font-weight: normal;
 	background: var(--highlight-weak-40);
 
-	.icon {
-		margin-right: .5rem;
-	}
-
 	.icon-generic {
 		fill: var(--highlight);
 	}

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.2",
+  "version": "0.49.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.49.2",
+      "version": "0.49.7",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -92,7 +92,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.49.2",
+  "version": "0.49.7",
   "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,

renderer/+onRenderHtml.js

@@ -70,6 +70,9 @@ async function onRenderHtml(pageContext) {
 
 		<meta name="description" content="Keep track of new porn releases and re-discover classics from your favorite porn stars and sites" />
 
+		<!-- RTA restricted to adults label -->
+		<meta name="RATING" content="RTA-5042-1996-1400-1577-RTA" />
+
 		${config.analytics.enabled ? dangerouslySkipEscape(`<script src="${config.analytics.address}" data-website-id="${config.analytics.siteId}" data-exclude-hash="true" async></script>`) : ''}
 
 		<title>${title}</title>

src/actors.js

@@ -55,7 +55,7 @@ const keyMap = {
 	isCircumcised: 'circumcised',
 };
 
-const socialsOrder = ['onlyfans', 'twitter', 'fansly', 'loyalfans', 'manyvids', 'pornhub', 'linktree', null];
+const socialsOrder = ['onlyfans', 'fansly', 'twitter', 'instagram', 'loyalfans', 'manyvids', 'pornhub', 'linktree', null];
 
 export function curateActor(actor, context = {}) {
 	return {
@@ -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

@@ -932,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,

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));