Added years filter. Changed default DMCA to generic content e-mail.

pages/actors/@actorId/+onBeforeRender.js

@@ -23,26 +23,12 @@ export async function onBeforeRender(pageContext) {
 		throw render(404, `Cannot find actor '${pageContext.routeParams.actorId}'.`);
 	}
 
-	const {
-		scenes,
-		aggActors,
-		aggTags,
-		aggChannels,
-		total,
-		limit,
-	} = actorScenes;
-
 	return {
 		pageContext: {
 			title: actor.name,
 			pageProps: {
 				actor,
-				scenes,
-				aggActors,
-				aggTags,
-				aggChannels,
-				total,
-				limit,
+				...actorScenes,
 			},
 		},
 	};

pages/entities/@entitySlug/+onBeforeRender.js

@@ -51,11 +51,6 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		scenes,
-		aggActors,
-		aggTags,
-		aggChannels,
-		total,
-		limit,
 	} = entityScenes;
 
 	const campaignIndex = Math.floor((Math.random() * (0.5 - 0.2) + 0.2) * scenes.length);
@@ -66,12 +61,7 @@ export async function onBeforeRender(pageContext) {
 			title: entity.name,
 			pageProps: {
 				entity,
-				scenes,
-				aggActors,
-				aggTags,
-				aggChannels,
-				total,
-				limit,
+				...entityScenes,
 			},
 			campaigns: {
 				index: campaignIndex,

pages/movies/+onBeforeRender.js

@@ -10,25 +10,11 @@ export async function onBeforeRender(pageContext) {
 		limit: Number(pageContext.urlParsed.search.limit) || 50,
 	}, pageContext.user);
 
-	const {
-		movies,
-		aggActors,
-		aggTags,
-		aggChannels,
-		total,
-		limit,
-	} = movieResults;
-
 	return {
 		pageContext: {
 			title: 'Movies',
 			pageProps: {
-				movies,
-				aggActors,
-				aggTags,
-				aggChannels,
-				limit,
-				total,
+				...movieResults,
 			},
 		},
 	};

pages/search/+onBeforeRender.js

@@ -32,6 +32,7 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		scenes,
+		aggYears,
 		aggActors,
 		aggTags,
 		aggChannels,
@@ -55,6 +56,7 @@ export async function onBeforeRender(pageContext) {
 				actors,
 				scenes,
 				movies,
+				aggYears,
 				aggActors,
 				aggTags,
 				aggChannels,

pages/tags/@tagId/+onBeforeRender.js

@@ -32,11 +32,6 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		scenes,
-		aggActors,
-		aggTags,
-		aggChannels,
-		total,
-		limit,
 	} = tagScenes;
 
 	const description = tag.description && md.renderInline(tag.description);
@@ -50,12 +45,7 @@ export async function onBeforeRender(pageContext) {
 			pageProps: {
 				tag,
 				description,
-				scenes,
-				aggActors,
-				aggTags,
-				aggChannels,
-				total,
-				limit,
+				...tagScenes,
 			},
 			campaigns: {
 				index: campaignIndex,

pages/updates/+onBeforeRender.js

@@ -28,11 +28,6 @@ export async function onBeforeRender(pageContext) {
 
 	const {
 		scenes,
-		aggTags,
-		aggChannels,
-		aggActors,
-		limit,
-		total,
 	} = sceneResults;
 
 	const campaignIndex = getCampaignIndex(scenes.length);
@@ -42,12 +37,7 @@ export async function onBeforeRender(pageContext) {
 		pageContext: {
 			title: pageContext.routeParams.scope,
 			pageProps: {
-				scenes,
-				aggTags,
-				aggChannels,
-				aggActors,
-				limit,
-				total,
+				...sceneResults,
 			},
 			campaigns: {
 				index: campaignIndex,