Added movies stash page.

components/movies/movies.vue

@@ -0,0 +1,488 @@
+<template>
+	<div class="movies-page">
+		<Filters
+			v-if="showFilters"
+			:class="{ loading }"
+		>
+			<div class="filter">
+				<input
+					v-model="filters.search"
+					type="search"
+					placeholder="Search movies"
+					class="search input"
+					@search="search"
+				>
+			</div>
+
+			<TagsFilter
+				:filters="filters"
+				:tags="aggTags"
+				@update="updateFilter"
+			/>
+
+			<ChannelsFilter
+				:filters="filters"
+				:channels="aggChannels"
+				@update="updateFilter"
+			/>
+
+			<ActorsFilter
+				:filters="filters"
+				:actors="aggActors"
+				@update="updateFilter"
+			/>
+		</Filters>
+
+		<div class="movies-container">
+			<div class="movies-header">
+				<div class="meta">{{ total }} results</div>
+
+				<select
+					v-model="scope"
+					class="input"
+					@change="search({ autoScope: false })"
+				>
+					<!-- not selected in SSR without prop -->
+					<option
+						v-if="pageStash"
+						:selected="scope === 'stashed'"
+						value="stashed"
+					>Added</option>
+
+					<option
+						v-if="filters.search"
+						:selected="scope === 'results'"
+						value="results"
+					>Relevance</option>
+
+					<option value="likes">Popular</option>
+					<option value="latest">Latest</option>
+					<option value="upcoming">Upcoming</option>
+					<option value="new">New</option>
+				</select>
+			</div>
+
+			<ul class="movies nolist">
+				<li
+					v-for="movie in movies"
+					:key="`movie-${movie.id}`"
+					class="movie"
+				>
+					<a
+						:href="`/movie/${movie.id}/${movie.slug}`"
+						:title="movie.title"
+						class="cover-container"
+					>
+						<img
+							v-if="movie.covers[0]"
+							:src="movie.covers[0].isS3 ? `https://cdndev.traxxx.me/${movie.covers[0].thumbnail}` : `/media/${movie.covers[0].thumbnail}`"
+							:style="{ 'background-image': movie.covers[0].isS3 ? `url(https://cdndev.traxxx.me/${movie.covers[0].lazy})` : `url(/media/${movie.covers[0].lazy})` }"
+							class="cover"
+							loading="lazy"
+						>
+
+						<img
+							v-else
+							src="/public/img/icons/movie.svg"
+							class="nocover"
+						>
+					</a>
+
+					<div class="tile-info">
+						<div class="tile-meta">
+							<div class="channel">
+								<Link
+									:href="movie.channel.isIndependent || !movie.network ? `/${movie.channel.type}/${movie.channel.slug}` : `/${movie.network.type}/${movie.network.slug}`"
+									class="favicon-link"
+								>
+									<img
+										:src="movie.channel.isIndependent || !movie.network ? `/logos/${movie.channel.slug}/favicon.png` : `/logos/${movie.network.slug}/favicon.png`"
+										class="favicon"
+									>
+								</Link>
+
+								<Link
+									:href="`/${movie.channel.type}/${movie.channel.slug}`"
+									class="nolink channel-link"
+								>{{ movie.channel.name }}</Link>
+							</div>
+
+							<time
+								:datetime="movie.effectiveDate.toISOString()"
+								class="date"
+								:class="{ nodate: !movie.date }"
+							>{{ format(movie.effectiveDate, movie.effectiveDate.getFullYear() === currentYear ? 'MMM d' : 'MMM d, y') }}</time>
+						</div>
+
+						<a
+							:href="`/movie/${movie.id}/${movie.slug}`"
+							:title="movie.title"
+							class="title nolink"
+						>{{ movie.title }}</a>
+
+						<ul
+							:title="movie.actors.map((actor) => actor.name).join(', ')"
+							class="actors nolist"
+						>
+							<li
+								v-for="actor in movie.actors"
+								:key="`actor-${movie.id}-${actor.slug}`"
+								class="actor-item"
+							>
+								<a
+									:href="`/actor/${actor.id}/${actor.slug}`"
+									class="actor nolink"
+								>{{ actor.name }}</a>
+							</li>
+						</ul>
+
+						<ul
+							:title="movie.tags.map((tag) => tag.name).join(', ')"
+							class="tags nolist"
+						>
+							<li
+								v-for="tag in movie.tags"
+								:key="`tag-${movie.id}-${tag.slug}`"
+							>
+								<a
+									:href="`/tag/${tag.slug}`"
+									class="tag nolink"
+								>{{ tag.name }}</a>
+							</li>
+						</ul>
+					</div>
+				</li>
+			</ul>
+
+			<Pagination
+				:total="total"
+				:page="currentPage"
+			/>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { ref, inject } from 'vue';
+import { format } from 'date-fns';
+import { parse } from 'path-to-regexp';
+
+import navigate from '#/src/navigate.js';
+import { get } from '#/src/api.js';
+import { getActorIdentifier, parseActorIdentifier } from '#/src/query.js';
+import events from '#/src/events.js';
+
+import Filters from '#/components/filters/filters.vue';
+import ActorsFilter from '#/components/filters/actors.vue';
+import TagsFilter from '#/components/filters/tags.vue';
+import ChannelsFilter from '#/components/filters/channels.vue';
+import Pagination from '#/components/pagination/pagination.vue';
+
+const pageContext = inject('pageContext');
+const { pageProps, routeParams, urlParsed } = pageContext;
+
+const {
+	actor: pageActor,
+	tag: pageTag,
+	entity: pageEntity,
+	stash: pageStash,
+} = pageProps;
+
+const movies = ref(pageProps.movies);
+const aggActors = ref(pageProps.aggActors || []);
+const aggTags = ref(pageProps.aggTags || []);
+const aggChannels = ref(pageProps.aggChannels || []);
+
+const currentPage = ref(Number(routeParams.page));
+const scope = ref(routeParams.scope);
+const total = ref(Number(pageProps.total));
+const loading = ref(false);
+
+const showFilters = ref(true);
+
+const currentYear = new Date().getFullYear();
+
+const actorIds = urlParsed.search.actors?.split(',').map((identifier) => parseActorIdentifier(identifier)?.id).filter(Boolean) || [];
+const queryActors = actorIds.map((urlActorId) => aggActors.value.find((aggActor) => aggActor.id === urlActorId)).filter(Boolean);
+
+const networks = Object.fromEntries(aggChannels.value.map((channel) => (channel.type === 'network' ? channel : channel.parent)).filter(Boolean).map((parent) => [`_${parent.slug}`, parent]));
+const channels = Object.fromEntries(aggChannels.value.filter((channel) => channel.type === 'channel').map((channel) => [channel.slug, channel]));
+
+const queryEntity = networks[urlParsed.search.e] || channels[urlParsed.search.e];
+
+const filters = ref({
+	search: urlParsed.search.q,
+	tags: urlParsed.search.tags?.split(',').filter(Boolean) || [],
+	entity: queryEntity,
+	actors: queryActors,
+});
+
+function getPath(targetScope, preserveQuery) {
+	const path = parse(routeParams.path).map((segment) => {
+		if (segment.name === 'scope') {
+			return `${segment.prefix}${targetScope}`;
+		}
+
+		if (segment.name === 'page') {
+			return `${segment.prefix}${1}`;
+		}
+
+		return `${segment.prefix || ''}${routeParams[segment.name] || segment}`;
+	}).join('');
+
+	if (preserveQuery && urlParsed.searchOriginal) {
+		return `${path}${urlParsed.searchOriginal}`;
+	}
+
+	return path;
+}
+
+async function search(options = {}) {
+	if (options.resetPage !== false) {
+		currentPage.value = 1;
+	}
+
+	if (options.autoScope !== false) {
+		if (filters.value.search) {
+			scope.value = 'results';
+		}
+
+		if (!filters.value.search && scope.value === 'results') {
+			scope.value = 'latest';
+		}
+	}
+
+	const query = {
+		q: filters.value.search || undefined,
+	};
+
+	const entity = filters.value.entity || pageEntity;
+	const entitySlug = entity?.type === 'network' ? `_${entity.slug}` : entity?.slug;
+
+	loading.value = true;
+
+	navigate(getPath(scope.value, false), {
+		...query,
+		actors: filters.value.actors.map((filterActor) => getActorIdentifier(filterActor)).join(',') || undefined, // don't include page actor ID in query, already a parameter
+		tags: filters.value.tags.join(',') || undefined,
+		e: filters.value.entity?.type === 'network' ? `_${filters.value.entity.slug}` : (filters.value.entity?.slug || undefined),
+	}, { redirect: false });
+
+	const res = await get('/movies', {
+		...query,
+		actors: [pageActor, ...filters.value.actors].filter(Boolean).map((filterActor) => getActorIdentifier(filterActor)).join(','), // if we're on an actor page, that actor ID needs to be included
+		tags: [pageTag?.slug, ...filters.value.tags].filter(Boolean).join(','),
+		e: entitySlug,
+		stashId: pageStash?.id,
+		scope: scope.value,
+		page: currentPage.value, // client uses param rather than query pagination
+	});
+
+	movies.value = res.movies;
+	aggActors.value = res.aggActors;
+	aggTags.value = res.aggTags;
+	aggChannels.value = res.aggChannels;
+
+	total.value = res.total;
+	loading.value = false;
+
+	events.emit('scrollUp');
+}
+
+function updateFilter(prop, value, reload = true) {
+	filters.value[prop] = value;
+
+	if (reload) {
+		search();
+	}
+}
+</script>
+
+<style scoped>
+.movies-page {
+	display: flex;
+	background: var(--background-base-10);
+}
+
+.movies-container {
+	display: flex;
+	flex-direction: column;
+	flex-grow: 1;
+}
+
+.movies-header {
+	display: flex;
+	align-items: center;
+	padding: .5rem 1rem .25rem 3rem;
+}
+
+.meta {
+	display: flex;
+	flex-grow: 1;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.movies {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));
+	gap: 1rem;
+	padding: .5rem 1rem 1rem 1rem;
+}
+
+.movie {
+	display: flex;
+	flex-direction: column;
+	box-shadow: 0 0 3px var(--shadow-weak-30);
+	border-radius: .25rem;
+	overflow: hidden;
+	background: var(--background-base);
+
+	&:hover {
+		box-shadow: 0 0 3px var(--shadow-weak-20);
+	}
+}
+
+.cover-container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-grow: 1;
+	background: var(--shadow-weak-30);
+	aspect-ratio: 5/7;
+}
+
+.cover {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	background-size: cover;
+	background-position: center;
+}
+
+.nocover {
+	width: 25%;
+	opacity: .1;
+}
+
+.tile-info {
+	flex-shrink: 0;
+	font-size: 0;
+}
+
+.tile-meta {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: .4rem .5rem;
+	border-radius: 0 0 .25rem .25rem;
+	margin-bottom: .5rem;
+	background: var(--shadow-strong-30);
+	color: var(--text-light);
+	font-size: .8rem;
+}
+
+.channel {
+	display: inline-flex;
+	align-items: center;
+	margin-right: .5rem;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.channel-link {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-weight: bold;
+}
+
+.favicon-link {
+	display: inline-flex;
+}
+
+.favicon {
+	width: 1rem;
+	height: 1rem;
+	margin-right: .5rem;
+	object-fit: contain;
+}
+
+.date {
+	flex-shrink: 0;
+}
+
+.nodate {
+	color: var(--highlight-strong-10);
+}
+
+.title {
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	font-weight: bold;
+	padding: 0 .5rem;
+	margin-bottom: .25rem;
+	font-size: 1rem;
+}
+
+.actors {
+	height: 2.4rem;
+	display: flex;
+	flex-wrap: wrap;
+	overflow: hidden;
+	font-size: .9rem;
+	padding: 0 .5rem;
+	margin-bottom: .35rem;
+	line-height: 1.35;
+}
+
+.actor-item:not(:last-child):after {
+	content: ',\00a0';
+}
+
+.actor {
+	&:hover {
+		color: var(--primary);
+	}
+}
+
+.tags {
+	height: 1rem;
+	display: flex;
+	flex-wrap: wrap;
+	gap: .5rem;
+	overflow: hidden;
+	padding: 0 .5rem;
+	margin-bottom: .25rem;
+	color: var(--shadow-strong-10);
+	font-size: .75rem;
+}
+
+.tag {
+	flex-shrink: 0;
+
+	&:hover {
+		color: var(--primary);
+	}
+}
+
+@media(--compact) {
+	.movies {
+		grid-template-columns: repeat(auto-fill, minmax(11rem, 1fr));
+	}
+}
+
+@media(--small-20) {
+	.movies {
+		padding: .5rem .5rem 1rem .5rem;
+		gap: .5rem .25rem;
+	}
+}
+
+@media(--small-50) {
+	.movies {
+		grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr));
+	}
+}
+</style>

components/scenes/scenes.vue

@@ -100,7 +100,7 @@
 			>
 				<li
 					v-for="scene in scenes"
-					:key="scene.id"
+					:key="`scene-${scene.id}`"
 				>
 					<Scene :scene="scene" />
 				</li>

pages/movies/+Page.vue

@@ -1,477 +1,9 @@
 <template>
-	<div class="page">
+	<div>
-		<Filters
+		<Movies />
-			v-if="showFilters"
-			:class="{ loading }"
-		>
-			<div class="filter">
-				<input
-					v-model="filters.search"
-					type="search"
-					placeholder="Search movies"
-					class="search input"
-					@search="search"
-				>
-			</div>
-
-			<TagsFilter
-				:filters="filters"
-				:tags="aggTags"
-				@update="updateFilter"
-			/>
-
-			<ChannelsFilter
-				:filters="filters"
-				:channels="aggChannels"
-				@update="updateFilter"
-			/>
-
-			<ActorsFilter
-				:filters="filters"
-				:actors="aggActors"
-				@update="updateFilter"
-			/>
-		</Filters>
-
-		<div class="movies-container">
-			<div class="movies-header">
-				<div class="meta">{{ total }} results</div>
-
-				<select
-					v-model="scope"
-					class="input"
-					@change="search({ autoScope: false })"
-				>
-					<option value="likes">Likes</option>
-					<option value="latest">Latest</option>
-					<option value="upcoming">Upcoming</option>
-					<option value="new">New</option>
-					<option
-						value="results"
-						:disabled="!filters.search"
-					>Relevance</option>
-				</select>
-			</div>
-
-			<ul class="movies nolist">
-				<li
-					v-for="movie in movies"
-					:key="`movie-${movie.id}`"
-					class="movie"
-				>
-					<a
-						:href="`/movie/${movie.id}/${movie.slug}`"
-						:title="movie.title"
-						class="cover-container"
-					>
-						<img
-							v-if="movie.covers[0]"
-							:src="movie.covers[0].isS3 ? `https://cdndev.traxxx.me/${movie.covers[0].thumbnail}` : `/media/${movie.covers[0].thumbnail}`"
-							:style="{ 'background-image': movie.covers[0].isS3 ? `url(https://cdndev.traxxx.me/${movie.covers[0].lazy})` : `url(/media/${movie.covers[0].lazy})` }"
-							class="cover"
-							loading="lazy"
-						>
-
-						<img
-							v-else
-							src="/public/img/icons/movie.svg"
-							class="nocover"
-						>
-					</a>
-
-					<div class="tile-info">
-						<div class="tile-meta">
-							<div class="channel">
-								<Link
-									:href="movie.channel.isIndependent || !movie.network ? `/${movie.channel.type}/${movie.channel.slug}` : `/${movie.network.type}/${movie.network.slug}`"
-									class="favicon-link"
-								>
-									<img
-										:src="movie.channel.isIndependent || !movie.network ? `/logos/${movie.channel.slug}/favicon.png` : `/logos/${movie.network.slug}/favicon.png`"
-										class="favicon"
-									>
-								</Link>
-
-								<Link
-									:href="`/${movie.channel.type}/${movie.channel.slug}`"
-									class="nolink channel-link"
-								>{{ movie.channel.name }}</Link>
-							</div>
-
-							<time
-								:datetime="movie.effectiveDate.toISOString()"
-								class="date"
-								:class="{ nodate: !movie.date }"
-							>{{ format(movie.effectiveDate, movie.effectiveDate.getFullYear() === currentYear ? 'MMM d' : 'MMM d, y') }}</time>
-						</div>
-
-						<a
-							:href="`/movie/${movie.id}/${movie.slug}`"
-							:title="movie.title"
-							class="title nolink"
-						>{{ movie.title }}</a>
-
-						<ul
-							:title="movie.actors.map((actor) => actor.name).join(', ')"
-							class="actors nolist"
-						>
-							<li
-								v-for="actor in movie.actors"
-								:key="`actor-${movie.id}-${actor.slug}`"
-								class="actor-item"
-							>
-								<a
-									:href="`/actor/${actor.id}/${actor.slug}`"
-									class="actor nolink"
-								>{{ actor.name }}</a>
-							</li>
-						</ul>
-
-						<ul
-							:title="movie.tags.map((tag) => tag.name).join(', ')"
-							class="tags nolist"
-						>
-							<li
-								v-for="tag in movie.tags"
-								:key="`tag-${movie.id}-${tag.slug}`"
-							>
-								<a
-									:href="`/tag/${tag.slug}`"
-									class="tag nolink"
-								>{{ tag.name }}</a>
-							</li>
-						</ul>
-					</div>
-				</li>
-			</ul>
-
-			<Pagination
-				:total="total"
-				:page="currentPage"
-			/>
-		</div>
 	</div>
 </template>
 
 <script setup>
-import { ref, inject } from 'vue';
+import Movies from '#/components/movies/movies.vue';
-import { format } from 'date-fns';
-import { parse } from 'path-to-regexp';
-
-import navigate from '#/src/navigate.js';
-import { get } from '#/src/api.js';
-import { getActorIdentifier, parseActorIdentifier } from '#/src/query.js';
-import events from '#/src/events.js';
-
-import Filters from '#/components/filters/filters.vue';
-import ActorsFilter from '#/components/filters/actors.vue';
-import TagsFilter from '#/components/filters/tags.vue';
-import ChannelsFilter from '#/components/filters/channels.vue';
-import Pagination from '#/components/pagination/pagination.vue';
-
-const pageContext = inject('pageContext');
-const { pageProps, routeParams, urlParsed } = pageContext;
-
-const {
-	actor: pageActor,
-	tag: pageTag,
-	entity: pageEntity,
-} = pageProps;
-
-const movies = ref(pageProps.movies);
-const aggActors = ref(pageProps.aggActors || []);
-const aggTags = ref(pageProps.aggTags || []);
-const aggChannels = ref(pageProps.aggChannels || []);
-
-const currentPage = ref(Number(routeParams.page));
-const scope = ref(routeParams.scope);
-const total = ref(Number(pageProps.total));
-const loading = ref(false);
-
-const showFilters = ref(true);
-
-const currentYear = new Date().getFullYear();
-
-const actorIds = urlParsed.search.actors?.split(',').map((identifier) => parseActorIdentifier(identifier)?.id).filter(Boolean) || [];
-const queryActors = actorIds.map((urlActorId) => aggActors.value.find((aggActor) => aggActor.id === urlActorId)).filter(Boolean);
-
-const networks = Object.fromEntries(aggChannels.value.map((channel) => (channel.type === 'network' ? channel : channel.parent)).filter(Boolean).map((parent) => [`_${parent.slug}`, parent]));
-const channels = Object.fromEntries(aggChannels.value.filter((channel) => channel.type === 'channel').map((channel) => [channel.slug, channel]));
-
-const queryEntity = networks[urlParsed.search.e] || channels[urlParsed.search.e];
-
-const filters = ref({
-	search: urlParsed.search.q,
-	tags: urlParsed.search.tags?.split(',').filter(Boolean) || [],
-	entity: queryEntity,
-	actors: queryActors,
-});
-
-function getPath(targetScope, preserveQuery) {
-	const path = parse(routeParams.path).map((segment) => {
-		if (segment.name === 'scope') {
-			return `${segment.prefix}${targetScope}`;
-		}
-
-		if (segment.name === 'page') {
-			return `${segment.prefix}${1}`;
-		}
-
-		return `${segment.prefix || ''}${routeParams[segment.name] || segment}`;
-	}).join('');
-
-	if (preserveQuery && urlParsed.searchOriginal) {
-		return `${path}${urlParsed.searchOriginal}`;
-	}
-
-	return path;
-}
-
-async function search(options = {}) {
-	if (options.resetPage !== false) {
-		currentPage.value = 1;
-	}
-
-	if (options.autoScope !== false) {
-		if (filters.value.search) {
-			scope.value = 'results';
-		}
-
-		if (!filters.value.search && scope.value === 'results') {
-			scope.value = 'latest';
-		}
-	}
-
-	const query = {
-		q: filters.value.search || undefined,
-	};
-
-	const entity = filters.value.entity || pageEntity;
-	const entitySlug = entity?.type === 'network' ? `_${entity.slug}` : entity?.slug;
-
-	loading.value = true;
-
-	navigate(getPath(scope.value, false), {
-		...query,
-		actors: filters.value.actors.map((filterActor) => getActorIdentifier(filterActor)).join(',') || undefined, // don't include page actor ID in query, already a parameter
-		tags: filters.value.tags.join(',') || undefined,
-		e: filters.value.entity?.type === 'network' ? `_${filters.value.entity.slug}` : (filters.value.entity?.slug || undefined),
-	}, { redirect: false });
-
-	const res = await get('/movies', {
-		...query,
-		actors: [pageActor, ...filters.value.actors].filter(Boolean).map((filterActor) => getActorIdentifier(filterActor)).join(','), // if we're on an actor page, that actor ID needs to be included
-		tags: [pageTag?.slug, ...filters.value.tags].filter(Boolean).join(','),
-		e: entitySlug,
-		scope: scope.value,
-		page: currentPage.value, // client uses param rather than query pagination
-	});
-
-	movies.value = res.movies;
-	aggActors.value = res.aggActors;
-	aggTags.value = res.aggTags;
-	aggChannels.value = res.aggChannels;
-
-	total.value = res.total;
-	loading.value = false;
-
-	events.emit('scrollUp');
-}
-
-function updateFilter(prop, value, reload = true) {
-	filters.value[prop] = value;
-
-	if (reload) {
-		search();
-	}
-}
 </script>
-
-<style scoped>
-.page {
-	display: flex;
-	background: var(--background-base-10);
-}
-
-.movies-container {
-	display: flex;
-	flex-direction: column;
-	flex-grow: 1;
-}
-
-.movies-header {
-	display: flex;
-	align-items: center;
-	padding: .5rem 1rem .25rem 3rem;
-}
-
-.meta {
-	display: flex;
-	flex-grow: 1;
-	justify-content: space-between;
-	align-items: center;
-}
-
-.movies {
-	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));
-	gap: 1rem;
-	padding: .5rem 1rem 1rem 1rem;
-}
-
-.movie {
-	display: flex;
-	flex-direction: column;
-	box-shadow: 0 0 3px var(--shadow-weak-30);
-	border-radius: .25rem;
-	overflow: hidden;
-	background: var(--background-base);
-
-	&:hover {
-		box-shadow: 0 0 3px var(--shadow-weak-20);
-	}
-}
-
-.cover-container {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-grow: 1;
-	background: var(--shadow-weak-30);
-	aspect-ratio: 5/7;
-}
-
-.cover {
-	width: 100%;
-	height: 100%;
-	object-fit: cover;
-	background-size: cover;
-	background-position: center;
-}
-
-.nocover {
-	width: 25%;
-	opacity: .1;
-}
-
-.tile-info {
-	flex-shrink: 0;
-	font-size: 0;
-}
-
-.tile-meta {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: .4rem .5rem;
-	border-radius: 0 0 .25rem .25rem;
-	margin-bottom: .5rem;
-	background: var(--shadow-strong-30);
-	color: var(--text-light);
-	font-size: .8rem;
-}
-
-.channel {
-	display: inline-flex;
-	align-items: center;
-	margin-right: .5rem;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-.channel-link {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	font-weight: bold;
-}
-
-.favicon-link {
-	display: inline-flex;
-}
-
-.favicon {
-	width: 1rem;
-	height: 1rem;
-	margin-right: .5rem;
-	object-fit: contain;
-}
-
-.date {
-	flex-shrink: 0;
-}
-
-.nodate {
-	color: var(--highlight-strong-10);
-}
-
-.title {
-	display: block;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	font-weight: bold;
-	padding: 0 .5rem;
-	margin-bottom: .25rem;
-	font-size: 1rem;
-}
-
-.actors {
-	height: 2.4rem;
-	display: flex;
-	flex-wrap: wrap;
-	overflow: hidden;
-	font-size: .9rem;
-	padding: 0 .5rem;
-	margin-bottom: .35rem;
-	line-height: 1.35;
-}
-
-.actor-item:not(:last-child):after {
-	content: ',\00a0';
-}
-
-.actor {
-	&:hover {
-		color: var(--primary);
-	}
-}
-
-.tags {
-	height: 1rem;
-	display: flex;
-	flex-wrap: wrap;
-	gap: .5rem;
-	overflow: hidden;
-	padding: 0 .5rem;
-	margin-bottom: .25rem;
-	color: var(--shadow-strong-10);
-	font-size: .75rem;
-}
-
-.tag {
-	flex-shrink: 0;
-
-	&:hover {
-		color: var(--primary);
-	}
-}
-
-@media(--compact) {
-	.movies {
-		grid-template-columns: repeat(auto-fill, minmax(11rem, 1fr));
-	}
-}
-
-@media(--small-20) {
-	.movies {
-		padding: .5rem .5rem 1rem .5rem;
-		gap: .5rem .25rem;
-	}
-}
-
-@media(--small-50) {
-	.movies {
-		grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr));
-	}
-}
-</style>

pages/movies/+onBeforeRender.js

@@ -8,7 +8,6 @@ export async function onBeforeRender(pageContext) {
 	}), {
 		page: Number(pageContext.routeParams.page) || 1,
 		limit: Number(pageContext.urlParsed.search.limit) || 50,
-		aggregate: true,
 	});
 
 	const {

pages/stashes/@username/@stashSlug/movies/+Page.vue

@@ -1,10 +1,10 @@
 <template>
 	<Stash>
-		<h2>Movies</h2>
+		<Movies />
 	</Stash>
 </template>
 
 <script setup>
 import Stash from '#/components/stashes/stash.vue';
-// import Actors from '#/components/actors/actors.vue';
+import Movies from '#/components/movies/movies.vue';
 </script>

pages/stashes/@username/@stashSlug/movies/+onBeforeRender.js

@@ -1,17 +1,43 @@
 import { render } from 'vike/abort'; /* eslint-disable-line import/extensions */
 
 import { fetchStashByUsernameAndSlug } from '#/src/stashes.js';
+import { fetchMovies } from '#/src/movies.js';
+import { curateMoviesQuery } from '#/src/web/movies.js';
 import { HttpError } from '#/src/errors.js';
 
 export async function onBeforeRender(pageContext) {
 	try {
 		const stash = await fetchStashByUsernameAndSlug(pageContext.routeParams.username, pageContext.routeParams.stashSlug, pageContext.user);
 
+		const movieResults = await fetchMovies(await curateMoviesQuery({
+			...pageContext.urlQuery,
+			scope: pageContext.routeParams.scope || 'latest',
+			stashId: stash.id,
+		}), {
+			page: Number(pageContext.routeParams.page) || 1,
+			limit: Number(pageContext.urlParsed.search.limit) || 50,
+		});
+
+		const {
+			movies,
+			aggActors,
+			aggTags,
+			aggChannels,
+			total,
+			limit,
+		} = movieResults;
+
 		return {
 			pageContext: {
 				title: `${stash.name} by ${stash.user.username}`,
 				pageProps: {
 					stash,
+					movies,
+					aggActors,
+					aggTags,
+					aggChannels,
+					total,
+					limit,
 				},
 			},
 		};

src/actors.js

@@ -442,7 +442,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 					]);
 				} else if (options.order?.[0] === 'results') {
 					builder.orderBy([
-						{ column: 'actors._score', order: options.order[1] },
+						{ column: '_score', order: options.order[1] },
 						{ column: 'actors.slug', order: 'asc' },
 					]);
 				} else if (options.order?.[0] === 'stashed' && filters.stashId) {

src/movies.js

@@ -1,7 +1,7 @@
 import config from 'config';
 
-import knex from './knex.js';
+import { knexQuery as knex, knexManticore } from './knex.js';
-import { searchApi } from './manticore.js';
+import { utilsApi } from './manticore.js';
 import { HttpError } from './errors.js';
 import { fetchActorsById, curateActor, sortActorsByGender } from './actors.js';
 import { fetchTagsById } from './tags.js';
@@ -166,6 +166,7 @@ function curateOptions(options) {
 	};
 }
 
+/*
 function buildQuery(filters = {}) {
 	const query = {
 		bool: {
@@ -257,16 +258,6 @@ function buildQuery(filters = {}) {
 		});
 	}
 
-	/* tag filter
-	must_not: [
-		{
-			in: {
-				'any(tag_ids)': [101, 180, 32],
-			},
-		},
-	],
-	*/
-
 	return { query, sort };
 }
 
@@ -304,20 +295,9 @@ function buildAggregates(options) {
 	return aggregates;
 }
 
-function countAggregations(buckets) {
+async function queryManticoreJson(filters, options) {
-	if (!buckets) {
-		return null;
-	}
-
-	return Object.fromEntries(buckets.map((bucket) => [bucket.key, { count: bucket.doc_count }]));
-}
-
-export async function fetchMovies(filters, rawOptions) {
-	const options = curateOptions(rawOptions);
 	const { query, sort } = buildQuery(filters);
 
-	console.log('filters', filters);
-	console.log('options', options);
 	console.log('query', query.bool.must);
 
 	console.time('manticore');
@@ -345,23 +325,202 @@ export async function fetchMovies(filters, rawOptions) {
 		},
 	});
 
-	console.timeEnd('manticore');
+	const movies = result.hits.hits.map((hit) => ({
+		id: hit._id,
+		...hit._source,
+		_score: hit._score,
+	}));
 
-	const actorCounts = options.aggregateActors && countAggregations(result.aggregations?.actorIds?.buckets);
+	return {
-	const tagCounts = options.aggregateTags && countAggregations(result.aggregations?.tagIds?.buckets);
+		movies,
-	const channelCounts = options.aggregateChannels && countAggregations(result.aggregations?.channelIds?.buckets);
+		total: result.hits.total,
+		aggregations: result.aggregations && Object.fromEntries(Object.entries(result.aggregations).map(([key, { buckets }]) => [key, buckets])),
+	};
+}
+*/
 
-	console.time('fetch aggregations');
+async function queryManticoreSql(filters, options) {
+	const aggSize = config.database.manticore.maxAggregateSize;
+
+	const sqlQuery = knexManticore.raw(`
+		:query:
+		OPTION
+			field_weights=(
+				title_filtered=7,
+				actors=10,
+				tags=9,
+				meta=6,
+				channel_name=2,
+				channel_slug=3,
+				network_name=1,
+				network_slug=1
+			),
+			max_matches=:maxMatches:,
+			max_query_time=:maxQueryTime:
+		:actorsFacet:
+		:tagsFacet:
+		:channelsFacet:;
+		show meta;
+	`, {
+		query: knexManticore(filters.stashId ? 'movies_stashed' : 'movies')
+			.modify((builder) => {
+				if (filters.stashId) {
+					builder.select(knex.raw(`
+						movies.id as id,
+						movies.title as title,
+						movies.actor_ids as actor_ids,
+						movies.entity_ids as entity_ids,
+						movies.tag_ids as tag_ids,
+						movies.channel_id as channel_id,
+						movies.network_id as network_id,
+						movies.effective_date as effective_date,
+						movies.stashed as stashed,
+						movies.created_at,
+						created_at as stashed_at,
+						weight() as _score
+					`));
+
+					builder
+						.innerJoin('movies', 'movies.id', 'movies_stashed.movie_id')
+						.where('stash_id', filters.stashId);
+				} else {
+					builder.select(knex.raw('*, weight() as _score'));
+				}
+
+				if (filters.query) {
+					builder.whereRaw('match(\'@!title :query:\', movies)', { query: filters.query });
+				}
+
+				filters.tagIds?.forEach((tagId) => {
+					builder.where('any(tag_ids)', tagId);
+				});
+
+				filters.actorIds?.forEach((actorId) => {
+					builder.where('any(actor_ids)', actorId);
+				});
+
+				if (filters.entityId) {
+					builder.whereRaw('any(entity_ids) = ?', filters.entityId);
+				}
+
+				if (typeof filters.isShowcased === 'boolean') {
+					builder.where('is_showcased', filters.isShowcased);
+				}
+
+				if (!filters.scope || filters.scope === 'latest') {
+					builder
+						.where('effective_date', '<=', Math.round(Date.now() / 1000))
+						.orderBy('movies.effective_date', 'desc'); // can't seem to use alias if it matches column-name? behavior not fully understand, but this works
+				} else if (filters.scope === 'upcoming') {
+					builder
+						.where('effective_date', '>', Math.round(Date.now() / 1000))
+						.orderBy('movies.effective_date', 'asc');
+				} else if (filters.scope === 'new') {
+					builder.orderBy([
+						{ column: 'movies.created_at', order: 'desc' },
+						{ column: 'movies.effective_date', order: 'asc' },
+					]);
+				} else if (filters.scope === 'likes') {
+					builder.orderBy([
+						{ column: 'movies.stashed', order: 'desc' },
+						{ column: 'movies.effective_date', order: 'desc' },
+					]);
+				} else if (filters.scope === 'results') {
+					builder.orderBy([
+						{ column: '_score', order: 'desc' },
+						{ column: 'movies.effective_date', order: 'desc' },
+					]);
+				} else if (filters.scope === 'stashed' && filters.stashId) {
+					builder.orderBy([
+						{ column: 'stashed_at', order: 'desc' },
+						{ column: 'movies.effective_date', order: 'desc' },
+					]);
+				} else {
+					builder.orderBy('movies.effective_date', 'desc');
+				}
+			})
+			.limit(options.limit)
+			.offset((options.page - 1) * options.limit)
+			.toString(),
+		// option threads=1 fixes actors, but drastically slows down performance, wait for fix
+		actorsFacet: options.aggregateActors ? knex.raw('facet movies.actor_ids order by count(*) desc limit ?', [aggSize]) : null,
+		tagsFacet: options.aggregateTags ? knex.raw('facet movies.tag_ids order by count(*) desc limit ?', [aggSize]) : null,
+		channelsFacet: options.aggregateChannels ? knex.raw('facet movies.channel_id order by count(*) desc limit ?', [aggSize]) : null,
+		maxMatches: config.database.manticore.maxMatches,
+		maxQueryTime: config.database.manticore.maxQueryTime,
+	}).toString();
+
+	// manticore does not seem to accept table.column syntax if 'table' is primary (yet?), crude work-around
+	const curatedSqlQuery = filters.stashId
+		? sqlQuery
+		: sqlQuery.replace(/movies\./g, '');
+
+	if (process.env.NODE_ENV === 'development') {
+		console.log(curatedSqlQuery);
+	}
+
+	const results = await utilsApi.sql(curatedSqlQuery);
+
+	// console.log(results[0]);
+
+	const actorIds = results
+		.find((result) => (result.columns[0].actor_ids || result.columns[0]['movies.actor_ids']) && result.columns[1]['count(*)'])
+		?.data.map((row) => ({ key: row.actor_ids || row['movies.actor_ids'], doc_count: row['count(*)'] }))
+		|| [];
+
+	const tagIds = results
+		.find((result) => (result.columns[0].tag_ids || result.columns[0]['movies.tag_ids']) && result.columns[1]['count(*)'])
+		?.data.map((row) => ({ key: row.tag_ids || row['movies.tag_ids'], doc_count: row['count(*)'] }))
+		|| [];
+
+	const channelIds = results
+		.find((result) => (result.columns[0].channel_id || result.columns[0]['movies.channel_id']) && result.columns[1]['count(*)'])
+		?.data.map((row) => ({ key: row.channel_id || row['movies.channel_id'], doc_count: row['count(*)'] }))
+		|| [];
+
+	const total = Number(results.at(-1).data.find((entry) => entry.Variable_name === 'total_found')?.Value) || 0;
+
+	return {
+		movies: results[0].data,
+		total,
+		aggregations: {
+			actorIds,
+			tagIds,
+			channelIds,
+		},
+	};
+}
+
+function countAggregations(buckets) {
+	if (!buckets) {
+		return null;
+	}
+
+	return Object.fromEntries(buckets.map((bucket) => [bucket.key, { count: bucket.doc_count }]));
+}
+
+export async function fetchMovies(filters, rawOptions) {
+	const options = curateOptions(rawOptions);
+
+	console.log(options);
+	console.log(filters);
+
+	const result = await queryManticoreSql(filters, options);
+
+	const actorCounts = options.aggregateActors && countAggregations(result.aggregations?.actorIds);
+	const tagCounts = options.aggregateTags && countAggregations(result.aggregations?.tagIds);
+	const channelCounts = options.aggregateChannels && countAggregations(result.aggregations?.channelIds);
 
 	const [aggActors, aggTags, aggChannels] = await Promise.all([
-		options.aggregateActors ? fetchActorsById(result.aggregations.actorIds.buckets.map((bucket) => bucket.key), { order: ['name', 'asc'], append: actorCounts }) : [],
+		options.aggregateActors ? fetchActorsById(result.aggregations.actorIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: actorCounts }) : [],
-		options.aggregateTags ? fetchTagsById(result.aggregations.tagIds.buckets.map((bucket) => bucket.key), { order: ['name', 'asc'], append: tagCounts }) : [],
+		options.aggregateTags ? fetchTagsById(result.aggregations.tagIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: tagCounts }) : [],
-		options.aggregateChannels ? fetchEntitiesById(result.aggregations.channelIds.buckets.map((bucket) => bucket.key), { order: ['name', 'asc'], append: channelCounts }) : [],
+		options.aggregateChannels ? fetchEntitiesById(result.aggregations.channelIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: channelCounts }) : [],
 	]);
 
-	console.timeEnd('fetch aggregations');
+	console.log(result.aggregations);
+	console.log(aggActors);
 
-	const movieIds = result.hits.hits.map((hit) => Number(hit._id));
+	const movieIds = result.movies.map((movie) => Number(movie.id));
 	const movies = await fetchMoviesById(movieIds);
 
 	return {
@@ -369,7 +528,7 @@ export async function fetchMovies(filters, rawOptions) {
 		aggActors,
 		aggTags,
 		aggChannels,
-		total: result.hits.total,
+		total: result.total,
 		limit: options.limit,
 	};
 }

src/scenes.js

@@ -190,8 +190,6 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
 		const sceneStashes = stashes.filter((stash) => stash.scene_id === sceneId);
 		const sceneActorStashes = sceneActors.map((actor) => actorStashes.find((stash) => stash.actor_id === actor.id)).filter(Boolean);
 
-		console.log(sceneActors);
-
 		return curateScene(scene, {
 			channel: sceneChannel,
 			actors: sceneActors,
@@ -411,6 +409,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 						scenes.id as id,
 						scenes.title as title,
 						scenes.actor_ids as actor_ids,
+						scenes.entity_ids as entity_ids,
 						scenes.tag_ids as tag_ids,
 						scenes.channel_id as channel_id,
 						scenes.network_id as network_id,
@@ -441,11 +440,15 @@ async function queryManticoreSql(filters, options, _reqUser) {
 				});
 
 				if (filters.entityId) {
+					builder.whereRaw('any(entity_ids) = ?', filters.entityId);
+
+					/* manticore does not support OR if both left and right table are queried https://github.com/manticoresoftware/manticoresearch/issues/1978#issuecomment-2010470068
 					builder.where((whereBuilder) => {
 						whereBuilder
 							.where('scenes.channel_id', filters.entityId)
 							.orWhere('scenes.network_id', filters.entityId);
 					});
+					*/
 				}
 
 				if (typeof filters.isShowcased === 'boolean') {
@@ -472,7 +475,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 					]);
 				} else if (filters.scope === 'results') {
 					builder.orderBy([
-						{ column: 'scenes._score', order: 'desc' },
+						{ column: '_score', order: 'desc' },
 						{ column: 'scenes.effective_date', order: 'desc' },
 					]);
 				} else if (filters.scope === 'stashed' && filters.stashId) {
@@ -523,7 +526,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		?.data.map((row) => ({ key: row.channel_id || row['scenes.channel_id'], doc_count: row['count(*)'] }))
 		|| [];
 
-	const total = Number(results.at(-1).data.find((entry) => entry.Variable_name === 'total_found').Value);
+	const total = Number(results.at(-1).data.find((entry) => entry.Variable_name === 'total_found')?.Value) || 0;
 
 	return {
 		scenes: results[0].data,

src/tools/sync-stashes.js

@@ -1,31 +1,29 @@
-import { indexApi } from '../manticore.js';
+import { indexApi, utilsApi } from '../manticore.js';
 import { knexOwner as knex } from '../knex.js';
 import chunk from '../utils/chunk.js';
 
-async function syncActorStashes() {
+async function syncStashes(domain = 'scene') {
-	const stashes = await knex('stashes_actors')
+	await utilsApi.sql(`truncate table ${domain}s_stashed`);
+
+	const stashes = await knex(`stashes_${domain}s`)
 		.select(
-			'stashes_actors.id as stashed_id',
+			`stashes_${domain}s.id as stashed_id`,
-			'stashes_actors.actor_id',
+			`stashes_${domain}s.${domain}_id`,
 			'stashes.id as stash_id',
 			'stashes.user_id as user_id',
-			'stashes_actors.created_at as created_at',
+			`stashes_${domain}s.created_at as created_at`,
 		)
-		.leftJoin('stashes', 'stashes.id', 'stashes_actors.stash_id');
+		.leftJoin('stashes', 'stashes.id', `stashes_${domain}s.stash_id`);
-
-	if (stashes.length > 0) {
-		console.log(stashes);
-	}
 
 	await chunk(stashes, 1000).reduce(async (chain, stashChunk, index) => {
 		await chain;
 
 		const stashDocs = stashChunk.map((stash) => ({
 			replace: {
-				index: 'actors_stashed',
+				index: `${domain}s_stashed`,
 				id: stash.stashed_id,
 				doc: {
-					actor_id: stash.actor_id,
+					[`${domain}_id`]: stash[`${domain}_id`],
 					stash_id: stash.stash_id,
 					user_id: stash.user_id,
 					created_at: Math.round(stash.created_at.getTime() / 1000),
@@ -33,16 +31,17 @@ async function syncActorStashes() {
 			},
 		}));
 
-		console.log(stashDocs);
-
 		await indexApi.bulk(stashDocs.map((doc) => JSON.stringify(doc)).join('\n'));
 
-		console.log(`Synced ${index * 1000 + stashChunk.length}/${stashes.length} actor stashes`);
+		console.log(`Synced ${index * 1000 + stashChunk.length}/${stashes.length} ${domain} stashes`);
 	}, Promise.resolve());
 }
 
 async function init() {
-	await syncActorStashes();
+	await syncStashes('scene');
+	await syncStashes('actor');
+	await syncStashes('movie');
+
 	console.log('Done!');
 
 	knex.destroy();

src/web/movies.js

@@ -12,6 +12,7 @@ export async function curateMoviesQuery(query) {
 		tagIds: await getIdsBySlug([query.tagSlug, ...(query.tags?.split(',') || [])], 'tags'),
 		entityId: query.e ? await getIdsBySlug([query.e], 'entities').then(([id]) => id) : query.entityId,
 		requireCover: query.cover,
+		stashId: Number(query.stashId) || null,
 	};
 }