0.57.25

components/actors/bio.vue

@@ -135,13 +135,18 @@ const aliases = Object
 				<dfn class="bio-label"><Icon icon="cake" />Date of birth</dfn>
 
 				<span class="birthdate">
-					<span class="birthdate-long">{{ formatDate(actor.dateOfBirth, actor.dateOfBirth.getFullYear() > 1 ? 'MMMM d, yyyy' : 'MMMM d') }}</span>
-					<span class="birthdate-short">{{ formatDate(actor.dateOfBirth, actor.dateOfBirth.getFullYear() > 1 ? 'MMM d, yyyy' : 'MMM d') }}</span>
+					<template v-if="actor.dateOfBirthPrecision === 'day'">
+						<span class="birthdate-long">{{ formatDate(actor.dateOfBirth, actor.dateOfBirth.getFullYear() > 1 ? 'MMMM d, yyyy' : 'MMMM d') }}</span>
+						<span class="birthdate-short">{{ formatDate(actor.dateOfBirth, actor.dateOfBirth.getFullYear() > 1 ? 'MMM d, yyyy' : 'MMM d') }}</span>
+					</template>
+
+					<span v-else-if="actor.dateOfBirthPrecision === 'month'">{{ formatDate(actor.dateOfBirth, 'MMMM, yyyy') }}</span>
+					<span v-else-if="actor.dateOfBirth.getFullYear() > 1">{{ formatDate(actor.dateOfBirth, 'yyyy') }}</span>
 
 					<span
 						v-if="!actor.dateOfDeath && actor.dateOfBirth.getFullYear() > 1"
 						class="age"
-					>{{ actor.ageFromBirth }}</span>
+					><template v-if="actor.ageFromBirthIsApproximate">~</template>{{ actor.ageFromBirth }}</span>
 				</span>
 			</li>
 
@@ -163,10 +168,16 @@ const aliases = Object
 			>
 				<dfn class="bio-label"><Icon icon="tombstone" />Date of death</dfn>
 
-				<span class="birthdate">{{ formatDate(actor.dateOfDeath, 'MMMM d, yyyy') }}<span
-					v-if="actor.ageAtDeath"
-					class="age"
-				>{{ actor.ageAtDeath }}</span></span>
+				<span class="birthdate">
+					<span v-if="actor.dateOfDeathPrecision === 'day'">{{ formatDate(actor.dateOfDeath, 'MMMM d, yyyy') }}</span>
+					<span v-else-if="actor.dateOfDeathPrecision === 'month'">{{ formatDate(actor.dateOfDeath, 'MMMM, yyyy') }}</span>
+					<span v-else>{{ formatDate(actor.dateOfDeath, 'yyyy') }}</span>
+
+					<span
+						v-if="actor.ageAtDeath"
+						class="age"
+					><template v-if="actor.ageAtDeathIsApproximate">~</template>{{ actor.ageAtDeath }}</span>
+				</span>
 			</li>
 
 			<li

components/edit/revisions.vue

@@ -5,8 +5,10 @@ import { computed, inject, ref } from 'vue';
 import Avatar from '#/components/edit/avatar.vue';
 import Socials from '#/components/edit/revision-socials.vue';
 import Checkbox from '#/components/form/checkbox.vue';
+import Pagination from '#/components/pagination/pagination.vue';
 
 import { get, post } from '#/src/api.js';
+import navigate from '#/src/navigate.js';
 import { formatDuration } from '#/utils/format.js';
 
 defineProps({
@@ -31,10 +33,14 @@ const moviesById = computed(() => Object.fromEntries(movies.value.map((movie) =>
 const avatarsById = computed(() => Object.fromEntries(avatars.value.map((avatar) => [avatar.id, avatar])));
 
 const feedbacks = ref({});
-const showReviewed = ref(false);
+const showReviewed = ref(Object.hasOwn(pageContext.urlParsed.search, 'final'));
 const reviewedRevisions = ref(new Set());
 const expanded = ref(new Set());
 
+const total = ref(pageContext.pageProps.revisionTotal);
+const page = Number(pageContext.routeParams.page) || 1;
+const limit = Number(pageContext.urlParsed.search.limit) || 100;
+
 const mappedKeys = {
 	actors: actorsById,
 	// tags: tagsById,
@@ -163,7 +169,8 @@ const curatedRevisions = computed(() => revisions.value.map((revision) => {
 async function reloadRevisions() {
 	const updatedRevisions = await get(`/revisions/${domain}`, {
 		isFinalized: showReviewed.value ? undefined : false,
-		limit: 50,
+		page,
+		limit,
 	});
 
 	actors.value = updatedRevisions.actors;
@@ -171,6 +178,14 @@ async function reloadRevisions() {
 	movies.value = updatedRevisions.movies;
 	avatars.value = updatedRevisions.avatars;
 	revisions.value = updatedRevisions.revisions;
+	total.value = updatedRevisions.total;
+
+	navigate(pageContext.urlParsed.pathname, {
+		...pageContext.urlParsed.search,
+		final: showReviewed.value || undefined,
+	}, {
+		redirect: false,
+	});
 }
 
 async function reviewRevision(revision, isApproved) {
@@ -208,10 +223,15 @@ async function banEditor(revision) {
 <template>
 	<div class="page">
 		<div
-			v-if="context === 'admin'"
 			class="revs-header"
 		>
+			<span
+				v-if="typeof total === 'number'"
+				class="revs-total"
+			>{{ total }} revisions</span>
+
 			<Checkbox
+				v-if="context === 'admin'"
 				label="Show finalized"
 				:checked="showReviewed"
 				@change="(checked) => { showReviewed = checked; reloadRevisions(); }"
@@ -388,13 +408,12 @@ async function banEditor(revision) {
 					class="rev-compact"
 					@click="expanded.add(rev.id)"
 				>
-
 					<span class="rev-scene nolink noshrink"><template v-if="context !== 'scene' && context !== 'actor'">{{ rev.sceneId || rev.actorId }}</template>@{{ rev.hash.slice(0, 6) }}</span>
 
 					<span
 						v-if="context !== 'scene'"
 						class="rev-title nolink ellipsis"
-					>{{ rev.base.title }}</span>
+					>{{ rev.base.title || rev.base.name }}</span>
 
 					<span class="rev-summary">
 						<span class="summary-deltas ellipsis">{{ rev.deltas.map((delta) => delta.key).join(', ') }}</span>
@@ -431,6 +450,13 @@ async function banEditor(revision) {
 				</div>
 			</li>
 		</ul>
+
+		<Pagination
+			v-if="total"
+			:total="total"
+			:page="page"
+			:limit="limit"
+		/>
 	</div>
 </template>
 
@@ -443,13 +469,20 @@ async function banEditor(revision) {
 
 .revs-header {
 	display: flex;
-	margin-bottom: 1rem;
+	justify-content: space-between;
+	box-sizing: border-box;
+	padding: .5rem .5rem .75rem .5rem;
+	width: 100%;
 
 	.check-container {
 		display: inline-flex;
 	}
 }
 
+.revs-total {
+	color: var(--glass-strong-10);
+}
+
 .revs {
 	width: 100%;
 	flex-grow: 1;

components/pagination/pagination.vue

@@ -13,6 +13,10 @@ const props = defineProps({
 		type: Number,
 		default: null,
 	},
+	limit: {
+		type: Number,
+		default: null,
+	},
 	redirect: {
 		type: Boolean,
 		default: true,

components/series/tile.vue

@@ -10,7 +10,10 @@ defineProps({
 </script>
 
 <template>
-	<div class="serie-tile">
+	<div
+		class="serie-tile"
+		:class="{ noposter: !serie.poster }"
+	>
 		<a
 			v-if="serie.poster"
 			:href="`/serie/${serie.id}/${serie.slug}`"
@@ -39,8 +42,8 @@ defineProps({
 	flex-direction: column;
 	box-shadow: 0 0 3px var(--shadow-weak-30);
 	border-radius: .25rem;
-	overflow: hidden;
 	background: var(--background-base);
+	overflow: hidden;
 
 	&:hover {
 		box-shadow: 0 0 3px var(--shadow-weak-20);
@@ -53,6 +56,19 @@ defineProps({
 	&.unstashed {
 		opacity: .5;
 	}
+
+	&.noposter {
+		background: none;
+		box-shadow: none;
+
+		.title {
+			padding: 0;
+
+			&:hover {
+				color: var(--primary);
+			}
+		}
+	}
 }
 
 .poster-container {

config/default.cjs

@@ -206,6 +206,7 @@ module.exports = {
 		crontab: '*/10 * * * *', // every 10 minutes
 	},
 	alerts: {
+		enabled: true,
 		crontab: '*/10 * * * *', // every 10 minutes
 		seenExpiry: 30, // days
 		finalExpiry: 365, // days

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.57.18",
+  "version": "0.57.25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.57.18",
+      "version": "0.57.25",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.25",
         "@dicebear/collection": "7.0.5",

package.json

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

pages/actors/@actorId/revisions/+onBeforeRender.js

@@ -5,11 +5,13 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		avatars,
 	} = await fetchActorRevisions(null, {
 		actorId: actor.id,
 		isFinalized: true,
-		limit: 100,
+		limit: Number(pageContext.urlParsed.search.limit) || 100,
+		page: Number(pageContext.routeParams.page) || 1,
 	}, pageContext.user);
 
 	return {
@@ -18,6 +20,7 @@ export async function onBeforeRender(pageContext) {
 			pageProps: {
 				actor,
 				revisions,
+				revisionTotal,
 				avatars,
 			},
 		},

pages/actors/edit/+Page.vue

@@ -52,9 +52,12 @@ const fields = computed(() => [
 		key: 'dateOfBirth',
 		label: 'date of birth',
 		type: 'date',
-		value: actor.value?.dateOfBirth
-			? format(actor.value.dateOfBirth, 'yyyy-MM-dd')
-			: null,
+		value: {
+			date: actor.value?.dateOfBirth
+				? format(actor.value.dateOfBirth, 'yyyy-MM-dd')
+				: null,
+			precision: actor.value.dateOfBirthPrecision,
+		},
 		inline: true,
 	},
 	{
@@ -212,9 +215,12 @@ const fields = computed(() => [
 		key: 'dateOfDeath',
 		label: 'date of death',
 		type: 'date',
-		value: actor.value?.dateOfDeath
-			? format(actor.value.dateOfDeath, 'yyyy-MM-dd')
-			: null,
+		value: {
+			date: actor.value?.dateOfDeath
+				? format(actor.value.dateOfDeath, 'yyyy-MM-dd')
+				: null,
+			precision: actor.value.dateOfDeathPrecision,
+		},
 	},
 	{
 		key: 'allowGlobalMatch',
@@ -270,6 +276,14 @@ const keyMap = {
 		country: 'residenceCountry',
 		place: 'residencePlace',
 	},
+	dateOfBirth: {
+		date: 'dateOfBirth',
+		precision: 'dateOfBirthPrecision',
+	},
+	dateOfDeath: {
+		date: 'dateOfDeath',
+		precision: 'dateOfDeathPrecision',
+	},
 	tattoos: {
 		has: 'hasTattoos',
 		description: 'tattoos',
@@ -501,6 +515,7 @@ async function submit() {
 							>{{ item.unit }}
 						</template>
 
+						<!--
 						<input
 							v-if="item.type === 'date'"
 							v-model="edits[item.key]"
@@ -508,6 +523,30 @@ async function submit() {
 							class="date input"
 							:disabled="!editing.has(item.key)"
 						>
+						-->
+
+						<div
+							v-if="item.type === 'date'"
+							class="date"
+						>
+							<input
+								v-model="edits[item.key].date"
+								type="date"
+								class="date input"
+								:disabled="!editing.has(item.key)"
+							>
+
+							<select
+								v-if="item.value.precision"
+								v-model="edits[item.key].precision"
+								class="input"
+								:disabled="!editing.has(item.key)"
+							>
+								<option value="day">Day</option>
+								<option value="month">Month</option>
+								<option value="year">Year</option>
+							</select>
+						</div>
 
 						<select
 							v-if="item.type === 'select'"

pages/admin/revisions/actors/+onBeforeRender.js

@@ -10,10 +10,12 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		avatars,
 	} = await fetchActorRevisions(null, {
-		isFinalized: false,
-		limit: 50,
+		isFinalized: Object.hasOwn(pageContext.urlParsed.search, 'final'),
+		limit: Number(pageContext.urlParsed.search.limit) || 100,
+		page: Number(pageContext.routeParams.page) || 1,
 	}, pageContext.user);
 
 	return {
@@ -21,6 +23,7 @@ export async function onBeforeRender(pageContext) {
 			title: pageContext.routeParams.section,
 			pageProps: {
 				revisions,
+				revisionTotal,
 				avatars,
 			},
 		},

pages/admin/revisions/actors/+route.js

@@ -1,6 +1,6 @@
 import { match } from 'path-to-regexp';
 
-const path = '/admin/:section/:domain(actors)';
+const path = '/admin/:section/:domain(actors)/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -11,6 +11,8 @@ export default (pageContext) => {
 			routeParams: {
 				section: matched.params.section,
 				domain: matched.params.domain,
+				page: matched.params.page || '1',
+				path,
 			},
 		};
 	}

pages/admin/revisions/scenes/+onBeforeRender.js

@@ -10,12 +10,14 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		actors,
 		tags,
 		movies,
 	} = await fetchSceneRevisions(null, {
-		isFinalized: false,
-		limit: 50,
+		isFinalized: Object.hasOwn(pageContext.urlParsed.search, 'final'),
+		limit: Number(pageContext.urlParsed.search.limit) || 100,
+		page: Number(pageContext.routeParams.page) || 1,
 	}, pageContext.user);
 
 	return {
@@ -23,6 +25,7 @@ export async function onBeforeRender(pageContext) {
 			title: pageContext.routeParams.section,
 			pageProps: {
 				revisions,
+				revisionTotal,
 				actors,
 				tags,
 				movies,

pages/admin/revisions/scenes/+route.js

@@ -1,6 +1,6 @@
 import { match } from 'path-to-regexp';
 
-const path = '/admin/:section/:domain(scenes)';
+const path = '/admin/:section/:domain(scenes)/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -11,6 +11,8 @@ export default (pageContext) => {
 			routeParams: {
 				section: matched.params.section,
 				domain: matched.params.domain,
+				page: matched.params.page || '1',
+				path,
 			},
 		};
 	}

pages/scenes/@sceneId/revisions/+onBeforeRender.js

@@ -10,13 +10,15 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		actors,
 		tags,
 		movies,
 	} = await fetchSceneRevisions(null, {
 		sceneId: scene.id,
 		isFinalized: true,
-		limit: 100,
+		limit: Number(pageContext.urlParsed.search.limit) || 100,
+		page: Number(pageContext.routeParams.page) || 1,
 	}, pageContext.user);
 
 	return {
@@ -25,6 +27,7 @@ export async function onBeforeRender(pageContext) {
 			pageProps: {
 				scene,
 				revisions,
+				revisionTotal,
 				actors,
 				tags,
 				movies,

pages/users/@username/+onBeforeRender.js

@@ -15,14 +15,16 @@ async function fetchRevisions(pageContext) {
 	if (pageContext.routeParams.section === 'revisions' && pageContext.routeParams.domain === 'scenes') {
 		return fetchSceneRevisions(null, {
 			userId: pageContext.user.id,
-			limit: 100,
+			limit: Number(pageContext.urlParsed.search.limit) || 100,
+			page: Number(pageContext.routeParams.page) || 1,
 		}, pageContext.user);
 	}
 
 	if (pageContext.routeParams.section === 'revisions' && pageContext.routeParams.domain === 'actors') {
 		return fetchActorRevisions(null, {
 			userId: pageContext.user.id,
-			limit: 100,
+			limit: Number(pageContext.urlParsed.search.limit) || 100,
+			page: Number(pageContext.routeParams.page) || 1,
 		}, pageContext.user);
 	}
 
@@ -47,6 +49,7 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		revisions,
+		total: revisionTotal,
 		actors,
 		tags,
 		movies,
@@ -63,6 +66,7 @@ export async function onBeforeRender(pageContext) {
 				stashes,
 				alerts,
 				revisions,
+				revisionTotal,
 				keys,
 				actors,
 				tags,

pages/users/@username/+route.js

@@ -1,7 +1,7 @@
 import { match } from 'path-to-regexp';
 import { redirect } from 'vike/abort';
 
-const path = '/user/:username/:section?/:domain?';
+const path = '/user/:username/:section?/:domain?/:page?';
 const urlMatch = match(path, { decode: decodeURIComponent });
 
 export default (pageContext) => {
@@ -18,6 +18,8 @@ export default (pageContext) => {
 				username: matched.params.username,
 				section: matched.params.section || '',
 				domain: matched.params.domain || '',
+				page: matched.params.page || '1',
+				path,
 			},
 		};
 	}

src/actors.js

@@ -32,7 +32,9 @@ const mj = new MerkleJson();
 const keyMap = {
 	avatar: 'avatar_media_id',
 	dateOfBirth: 'date_of_birth',
+	dateOfBirthPrecision: 'date_of_birth_precision',
 	dateOfDeath: 'date_of_death',
+	dateOfDeathPrecision: 'date_of_death_precision',
 	originCountry: 'birth_country_alpha2',
 	originState: 'birth_state',
 	originCity: 'birth_city',
@@ -62,6 +64,24 @@ const keyMap = {
 
 const socialsOrder = ['onlyfans', 'fansly', 'twitter', 'instagram', 'loyalfans', 'manyvids', 'pornhub', 'linktree', null];
 
+// with month (but not day) precision on either side, the age is still certain unless both dates fall in the same month,
+// since only then could the unknown day(s) put the birthday on either side of the reference date
+function isAgeApproximate(baseDate, basePrecision, referenceDate, referencePrecision = 'day') {
+	if (!baseDate || !referenceDate) {
+		return false;
+	}
+
+	if (basePrecision === 'year' || referencePrecision === 'year') {
+		return true;
+	}
+
+	if (basePrecision === 'day' && referencePrecision === 'day') {
+		return false;
+	}
+
+	return baseDate.getMonth() === referenceDate.getMonth();
+}
+
 export function curateActor(actor, context = {}) {
 	if (!actor) {
 		return null;
@@ -97,14 +117,20 @@ export function curateActor(actor, context = {}) {
 		ageFromBirth: actor.date_of_birth && actor.date_of_birth.getFullYear() > 1
 			? differenceInYears(Date.now(), actor.date_of_birth)
 			: null,
+		ageFromBirthIsApproximate: actor.date_of_birth_precision !== 'day'
+			&& isAgeApproximate(actor.date_of_birth, actor.date_of_birth_precision, new Date()),
 		ageAtDeath: actor.date_of_birth && actor.date_of_death && actor.date_of_birth.getFullYear() > 1
 			? differenceInYears(actor.date_of_death, actor.date_of_birth)
 			: null,
+		ageAtDeathIsApproximate: (actor.date_of_birth_precision !== 'day' || actor.date_of_death_precision !== 'day')
+			&& isAgeApproximate(actor.date_of_birth, actor.date_of_birth_precision, actor.date_of_death, actor.date_of_death_precision),
 		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,
+		dateOfBirthPrecision: actor.date_of_birth_precision,
 		dateOfDeath: actor.date_of_death,
+		dateOfDeathPrecision: actor.date_of_death_precision,
 		bust: actor.bust,
 		cup: actor.cup,
 		waist: actor.waist,
@@ -1059,6 +1085,7 @@ export async function fetchActorRevisions(revisionId, filters = {}, reqUser) {
 			'actors_revisions.*',
 			'users.username as username',
 			'reviewers.username as reviewer_username',
+			knex.raw('count(*) over() as total'),
 		)
 		.leftJoin('users', 'users.id', 'actors_revisions.user_id')
 		.leftJoin('users as reviewers', 'reviewers.id', 'actors_revisions.reviewed_by')
@@ -1105,6 +1132,7 @@ export async function fetchActorRevisions(revisionId, filters = {}, reqUser) {
 	return {
 		revisions: curatedRevisions,
 		revision: revisionId && curatedRevisions.find((revision) => revision.id === revisionId),
+		total: Number(revisions[0]?.total) || 0,
 		avatars,
 	};
 }
@@ -1183,7 +1211,9 @@ async function applyActorRevision(revisionIds, reqUser) {
 					'gender',
 					'avatar',
 					'dateOfBirth',
+					'dateOfBirthPrecision',
 					'dateOfDeath',
+					'dateOfDeathPrecision',
 					'originCountry',
 					'originState',
 					'originCity',

src/scenes.js

@@ -127,7 +127,7 @@ function curateScene(rawScene, assets, reqUser, context) {
 			title: serie.title,
 			poster: context.restriction
 				? null
-				: (serie.serie_poster, { type: 'poster' }),
+				: curateMedia(serie.serie_poster, { type: 'poster' }),
 		})),
 		poster: curateMedia(assets.poster, { type: 'poster' }),
 		photos: assets.photos?.map((photo) => curateMedia(photo, { type: 'photo' })) || [],
@@ -766,6 +766,7 @@ export async function fetchSceneRevisions(revisionId, filters = {}, reqUser) {
 			'scenes_revisions.*',
 			'users.username as username',
 			'reviewers.username as reviewer_username',
+			knexOwner.raw('count(*) over() as total'),
 		)
 		.leftJoin('users', 'users.id', 'scenes_revisions.user_id')
 		.leftJoin('users as reviewers', 'reviewers.id', 'scenes_revisions.reviewed_by')
@@ -824,6 +825,7 @@ export async function fetchSceneRevisions(revisionId, filters = {}, reqUser) {
 	return {
 		revisions: curatedRevisions,
 		revision: revisionId && curatedRevisions.find((revision) => revision.id === revisionId),
+		total: Number(revisions[0]?.total) || 0,
 		actors,
 		tags,
 		movies,

src/web/scenes.js

@@ -164,9 +164,10 @@ export const scenesSchema = `
 
 	type Chapter {
 		id: Int!
-		time: Int!
+		time: Int
 		tags: [Tag!]!
 		date: Date
+		duration: Int
 		description: String
 		title: String
 		poster: Media