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;
+	display: inline-flex;
-	height: 2rem;
 	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>
 

components/edit/revisions.vue

@@ -266,7 +266,7 @@ const expanded = ref(new Set());
 
 const mappedKeys = {
 	actors: actorsById,
-	tags: tagsById,
+	// tags: tagsById,
 	movies: moviesById,
 };
 
@@ -292,6 +292,16 @@ const curatedRevisions = computed(() => revisions.value.map((revision) => {
 			}))];
 		}
 
+		if (key === 'tags') {
+			return [key, value.map((tag) => ({
+				id: tag.id,
+				name: tag.actorId
+					? `${actorsById.value[tag.actorId]?.name}: ${tagsById.value[tag.id]?.name}`
+					: tagsById.value[tag.id]?.name,
+				modified: revision.deltas.some((delta) => delta.key === key && !delta.value.some((deltaTag) => deltaTag.id === tag.id && (!Object.hasOwn(tag, 'actorId') || deltaTag.actorId === tag.actorId))),
+			}))];
+		}
+
 		if (key === 'socials') {
 			// new socials don't have IDs yet, so we need to compare the values
 			return [key, value.map((item) => ({
@@ -323,6 +333,19 @@ const curatedRevisions = computed(() => revisions.value.map((revision) => {
 			};
 		}
 
+		if (delta.key === 'tags') {
+			return {
+				...delta,
+				value: delta.value.map((tag) => ({
+					id: tag.id,
+					name: tag.actorId
+						? `${actorsById.value[tag.actorId]?.name}: ${tagsById.value[tag.id]?.name}`
+						: tagsById.value[tag.id]?.name,
+					modified: !revision.base[delta.key].some((baseTag) => baseTag.id === tag.id && (!Object.hasOwn(baseTag, 'actorId') || baseTag.actorId === tag.actorId)),
+				})),
+			};
+		}
+
 		if (delta.key === 'socials') {
 			// new socials don't have IDs yet, so we need to compare the values
 			return {

components/filters/tags.vue

@@ -12,25 +12,25 @@
 				<Icon icon="search" />
 			</label>
 
-			<!--
+			<template v-if="isActorTagsAvailable">
-			<div
+				<div
-				v-show="showActorTags"
+					v-show="showActorTags"
-				v-tooltip="'Tags relevant to the selected actors'"
+					v-tooltip="'Tags relevant to the selected actors'"
-				class="filter-sort order noselect"
+					class="filter-sort order noselect"
-				@click="showActorTags = false"
+					@click="showActorTags = false"
-			>
+				>
-				<Icon icon="user-tags" />
+					<Icon icon="user-tags" />
-			</div>
+				</div>
 
-			<div
+				<div
-				v-show="!showActorTags"
+					v-show="!showActorTags"
-				v-tooltip="'All tags'"
+					v-tooltip="'All tags'"
-				class="filter-sort order noselect"
+					class="filter-sort order noselect"
-				@click="showActorTags = true"
+					@click="showActorTags = true"
-			>
+				>
-				<Icon icon="price-tags" />
+					<Icon icon="price-tags" />
-			</div>
+				</div>
-			-->
+			</template>
 
 			<div
 				v-show="order === 'priority'"
@@ -142,13 +142,17 @@ const props = defineProps({
 const emit = defineEmits(['update']);
 
 const { pageProps } = inject('pageContext');
-// const { tag: pageTag, actor: pageActor } = pageProps;
+
-const { tag: pageTag } = pageProps;
+const {
+	tag: pageTag,
+	actor: pageActor,
+	stash: pageStash,
+} = pageProps;
 
 const search = ref('');
 const searchRegexp = computed(() => new RegExp(search.value, 'i'));
 const order = ref('priority');
-// const showActorTags = ref(true);
+const showActorTags = ref(!!pageActor);
 
 const priorityTags = [
 	'anal',
@@ -173,13 +177,13 @@ const priorityTags = [
 	'lesbian',
 ];
 
+const isActorTagsAvailable = computed(() => props.actorTags && (props.filters.actors.length > 0 || pageActor) && !pageStash);
+
 const groupedTags = computed(() => {
-	/*
+	// can't show actor tags inside stash, because both require a join, and manticore currently only supports one
-	const tags = showActorTags.value && props.actorTags && (props.filters.actors.length > 0 || pageActor)
+	const tags = showActorTags.value && isActorTagsAvailable.value
 		? props.actorTags
 		: props.tags;
-	*/
-	const tags = props.tags;
 
 	const selected = tags.filter((tag) => props.filters.tags.includes(tag.slug));
 	const filtered = tags.filter((tag) => !props.filters.tags.includes(tag.slug)

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.48.0",
+  "version": "0.49.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.48.0",
+      "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.48.0",
+  "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/affiliates.js

@@ -6,7 +6,7 @@ function getWatchUrl(scene) {
 			return new URL(scene.url).href;
 		}
 
-		if (scene.channel && (scene.channel.isIndependent || scene.channel.type === 'network')) {
+		if (scene.channel && (scene.channel.isIndependent || scene.channel.type === 'network' || !scene.network)) {
 			return new URL(scene.channel.url).href;
 		}
 

src/scenes.js

@@ -45,6 +45,7 @@ function curateScene(rawScene, assets, reqUser, context) {
 			slug: assets.channel.slug,
 			name: censor(assets.channel.name, context.restriction),
 			type: assets.channel.type,
+			url: assets.channel.url,
 			isIndependent: assets.channel.independent,
 			hasLogo: assets.channel.has_logo,
 		},
@@ -52,6 +53,7 @@ function curateScene(rawScene, assets, reqUser, context) {
 			id: assets.channel.network_id,
 			slug: assets.channel.network_slug,
 			name: censor(assets.channel.network_name, context.restriction),
+			url: assets.network_url,
 			type: assets.channel.network_type,
 			hasLogo: assets.channel.network_has_logo,
 		} : null,
@@ -179,6 +181,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
 				'networks.slug as network_slug',
 				'networks.name as network_name',
 				'networks.type as network_type',
+				'networks.url as network_url',
 				'networks.has_logo as network_has_logo',
 				knex.raw('row_to_json(affiliates) as affiliate'),
 			)
@@ -402,10 +405,11 @@ function curateOptions(options) {
 	};
 }
 
-function curateFacet(results, field, count = 'count(distinct id)') {
+// function curateFacet(results, field, count = 'count(distinct id)') {
+function curateFacet(results, field) {
 	return results
-		.find((result) => result.columns[0][field] && result.columns[1][count])
+		.find((result) => result.columns[0][field] && (result.columns[1]['count(distinct id)'] || result.columns[1]['count(*)']))
-		?.data.map((row) => ({ key: row[field], doc_count: row[count] }))
+		?.data.map((row) => ({ key: row[field], doc_count: row['count(distinct id)'] || row['count(*)'] }))
 		.filter((row) => !!row.key)
 		|| [];
 }
@@ -432,6 +436,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		:yearsFacet:
 		:actorsFacet:
 		:tagsFacet:
+		:actorTagsFacet:
 		:channelsFacet:
 		:studiosFacet:;
 		show meta;
@@ -465,15 +470,14 @@ async function queryManticoreSql(filters, options, _reqUser) {
 						weight() as _score
 					`));
 
-					/*
+					// manticore only supports one joined table, so we can't use it inside stashes
-					// manticore only supports one joined table, so we can't use it inside stashes; probably not needed anyway (stashes only need global tags?)
 					builder
 						.leftJoin('scenes_tags', 'scenes_tags.scene_id', 'scenes_.id')
 						.groupBy('scenes.id');
-					*/
 				}
 
 				if (filters.query) {
+					// we exclude title because we have a curated title_filtered field for more effective results
 					builder.whereRaw('match(\'@!title :query:\', scenes)', { query: escape(filters.query) });
 				}
 
@@ -574,16 +578,14 @@ async function queryManticoreSql(filters, options, _reqUser) {
 			.offset((options.page - 1) * options.limit),
 		// option threads=1 fixes actors, but drastically slows down performance, wait for fix
 		yearsFacet: options.aggregateYears ? knex.raw('facet effective_year as years_facet order by effective_year desc limit ?', [aggSize]) : null,
-		actorsFacet: options.aggregateActors ? knex.raw('facet scenes.actor_ids as actors_facet distinct id order by count(distinct id) desc limit ?', [aggSize]) : null,
+		actorsFacet: options.aggregateActors ? knex.raw('facet scenes.actor_ids as actors_facet distinct id order by count(*) desc limit ?', [aggSize]) : null,
 		// don't facet tags associated to other actors, actor ID 0 means global
-		tagsFacet: options.aggregateTags ? knex.raw('facet scenes.tag_ids as tags_facet order by count(distinct id) desc limit ?', [aggSize]) : null,
+		tagsFacet: options.aggregateTags ? knex.raw('facet scenes.tag_ids as tags_facet distinct id order by count(*) desc limit ?', [aggSize]) : null,
-		/*
 		actorTagsFacet: options.aggregateTags && !filters.stashId // eslint-disable-line no-nested-ternary
-			? knex.raw(`facet IF(IN(scenes_tags.actor_id, ${[0, ...filters?.actorIds || []]}), scenes_tags.tag_id, 0) as actor_tags_facet distinct id order by count(distinct id) desc limit ?`, [aggSize])
+			? knex.raw(`facet IF(IN(scenes_tags.actor_id, ${[0, ...filters?.actorIds || []]}), scenes_tags.tag_id, 0) as actor_tags_facet distinct id order by count(*) desc limit ?`, [aggSize])
 			: null,
-		*/
+		channelsFacet: options.aggregateChannels ? knex.raw('facet scenes.channel_id as channels_facet distinct id order by count(*) desc limit ?', [aggSize]) : null,
-		channelsFacet: options.aggregateChannels ? knex.raw('facet scenes.channel_id as channels_facet distinct id order by count(distinct id) desc limit ?', [aggSize]) : null,
+		studiosFacet: options.aggregateChannels ? knex.raw('facet scenes.studio_id as studios_facet distinct id order by count(*) desc limit ?', [aggSize]) : null,
-		studiosFacet: options.aggregateChannels ? knex.raw('facet scenes.studio_id as studios_facet distinct id order by count(distinct id) desc limit ?', [aggSize]) : null,
 		maxMatches: config.database.manticore.maxMatches,
 		maxQueryTime: config.database.manticore.maxQueryTime,
 	}).toString();
@@ -601,9 +603,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 
 	const results = await utilsApi.sql(curatedSqlQuery);
 
-	// console.log(util.inspect(results, null, Infinity));
+	const years = curateFacet(results, 'years_facet');
-
-	const years = curateFacet(results, 'years_facet', 'count(*)');
 	const actorIds = curateFacet(results, 'actors_facet');
 	const tagIds = curateFacet(results, 'tags_facet');
 	const actorTagIds = curateFacet(results, 'actor_tags_facet');
@@ -729,8 +729,14 @@ export async function fetchSceneRevisions(revisionId, filters = {}, reqUser) {
 		.limit(limit)
 		.offset((page - 1) * limit);
 
-	const actorIds = Array.from(new Set(revisions.flatMap((revision) => [...revision.base.actors, ...(revision.deltas.find((delta) => delta.key === 'actors')?.value || [])])));
+	const actorIds = Array.from(new Set(revisions.flatMap((revision) => [
-	const tagIds = Array.from(new Set(revisions.flatMap((revision) => [...revision.base.tags, ...(revision.deltas.find((delta) => delta.key === 'tags')?.value || [])])));
+		...revision.base.actors,
+		...(revision.deltas.find((delta) => delta.key === 'actors')?.value || []),
+		...revision.base.tags.map((tag) => tag.actorId),
+		...revision.deltas.find((delta) => delta.key === 'tags')?.value.map((tag) => tag.actorId) || [],
+	].filter(Boolean))));
+
+	const tagIds = Array.from(new Set(revisions.flatMap((revision) => [...revision.base.tags, ...(revision.deltas.find((delta) => delta.key === 'tags')?.value || [])].map((tag) => tag.id))));
 	const movieIds = Array.from(new Set(revisions.flatMap((revision) => [...revision.base.movies, ...(revision.deltas.find((delta) => delta.key === 'movies')?.value || [])])));
 
 	const [actors, tags, movies] = await Promise.all([
@@ -926,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,
@@ -967,6 +977,13 @@ export async function createSceneRevision(sceneId, { edits, comment, apply }, re
 			return [key, values.id];
 		}
 
+		if (key === 'tags') {
+			return [key, values.map((tag) => ({
+				id: tag.id,
+				actorId: tag.actorId,
+			}))];
+		}
+
 		if (Array.isArray(values)) {
 			return [key, values.map((value) => value?.hash || value?.id || value)];
 		}
@@ -983,6 +1000,16 @@ export async function createSceneRevision(sceneId, { edits, comment, apply }, re
 			return null;
 		}
 
+		if (key === 'tags') {
+			return {
+				key,
+				value: value.map((tag) => ({
+					id: tag.id,
+					actorId: tag.actorId,
+				})),
+			};
+		}
+
 		if (Array.isArray(value)) {
 			const valueSet = new Set(value);
 			const baseSet = new Set(baseScene[key]);

src/tools/scene_tag_revision_fix.js

@@ -0,0 +1,80 @@
+import { MerkleJson } from 'merkle-json';
+
+import knex from '../knex.js';
+
+const mj = new MerkleJson();
+
+function curateTag(tag) {
+	if (Object.hasOwn(tag, 'actorId')) {
+		return {
+			id: tag.id,
+			actorId: tag.actorId,
+		};
+	}
+
+	if (typeof tag === 'number') {
+		return {
+			id: tag,
+			// can't restore actorId, don't set to null to hint at missing data
+		};
+	}
+
+	throw new Error(`Unrecognized tag delta: ${JSON.stringify(tag)}`);
+}
+
+async function init() {
+	const revisions = await knex('scenes_revisions');
+
+	// console.log(revisions);
+
+	const fixedRevisions = revisions.map((revision) => {
+		if (revision.base.tags.length === 0 && !revision.deltas.some((delta) => delta.key === 'tags')) {
+			return null;
+		}
+
+		const newDeltas = revision.deltas.map((delta) => {
+			if (delta.key !== 'tags') {
+				return delta;
+			}
+
+			return {
+				...delta,
+				value: delta.value.map((tag) => curateTag(tag)),
+			};
+		});
+
+		const newBase = {
+			...revision.base,
+			tags: revision.base.tags.map((tag) => curateTag(tag)),
+		};
+
+		return {
+			...revision,
+			deltas: newDeltas,
+			base: newBase,
+		};
+	}).filter(Boolean);
+
+	const entries = fixedRevisions.map((revision) => ({
+		id: revision.id,
+		base: JSON.stringify(revision.base),
+		deltas: JSON.stringify(revision.deltas),
+		hash: mj.hash({
+			base: revision.base,
+			deltas: revision.deltas,
+		}),
+	}));
+
+	console.log(entries);
+
+	await knex('scenes_revisions')
+		.insert(entries)
+		.onConflict('id')
+		.merge(['base', 'deltas', 'hash']);
+
+	console.log(`Fixed ${entries.length} revisions`);
+
+	await knex.destroy();
+}
+
+init();

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