Added movies overview page. Fixed channel filter duplicates.

src/web/movies.js

@@ -0,0 +1,39 @@
+import { stringify } from '@brillout/json-serializer/stringify'; /* eslint-disable-line import/extensions */
+
+import { fetchMovies } from '../movies.js';
+import { parseActorIdentifier } from '../query.js';
+import { getIdsBySlug } from '../cache.js';
+
+export async function curateMoviesQuery(query) {
+	return {
+		scope: query.scope || 'latest',
+		query: query.q,
+		actorIds: [query.actorId, ...(query.actors?.split(',') || []).map((identifier) => parseActorIdentifier(identifier)?.id)].filter(Boolean),
+		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,
+	};
+}
+
+export async function fetchMoviesApi(req, res) {
+	const {
+		movies,
+		aggActors,
+		aggTags,
+		aggChannels,
+		limit,
+		total,
+	} = await fetchMovies(await curateMoviesQuery(req.query), {
+		page: Number(req.query.page) || 1,
+		limit: Number(req.query.limit) || 30,
+	});
+
+	res.send(stringify({
+		movies,
+		aggActors,
+		aggTags,
+		aggChannels,
+		limit,
+		total,
+	}));
+}

src/web/scenes.js

@@ -2,25 +2,7 @@ import { stringify } from '@brillout/json-serializer/stringify'; /* eslint-disab
 
 import { fetchScenes } from '../scenes.js';
 import { parseActorIdentifier } from '../query.js';
-import redis from '../redis.js';
-
-async function getIdsBySlug(slugs, domain) {
-	const ids = await Promise.all(slugs.map(async (slug) => {
-		if (!slug) {
-			return null;
-		}
-
-		if (Number(slug)) {
-			return Number(slug); // already an ID or missing
-		}
-
-		const id = await redis.hGet(`traxxx:${domain}:id_by_slug`, slug);
-
-		return Number(id);
-	}));
-
-	return ids.filter(Boolean);
-}
+import { getIdsBySlug } from '../cache.js';
 
 export async function curateScenesQuery(query) {
 	return {

src/web/server.js

@@ -22,6 +22,7 @@ import { renderPage } from 'vike/server'; // eslint-disable-line import/extensio
 
 import { fetchScenesApi } from './scenes.js';
 import { fetchActorsApi } from './actors.js';
+import { fetchMoviesApi } from './movies.js';
 
 import initLogger from '../logger.js';
 
@@ -62,9 +63,11 @@ export default async function initServer() {
 		router.use(viteDevMiddleware);
 	}
 
+	router.get('/api/scenes', fetchScenesApi);
+
 	router.get('/api/actors', fetchActorsApi);
 
-	router.get('/api/scenes', fetchScenesApi);
+	router.get('/api/movies', fetchMoviesApi);
 
 	// ...
 	// Other middlewares (e.g. some RPC middleware such as Telefunc)