components/filters/channels.vue

@@ -47,7 +47,7 @@
 							:title="entity.name"
 						>
 							<img
-								v-if="entity.isIndependent || entity.type === 'network' || !entity.parent"
+								v-if="entity.isIndependent || entity.type === 'network'"
 								:src="`/logos/${entity.slug}/favicon_dark.png`"
 								class="favicon"
 							>

components/movies/movies.vue

@@ -228,7 +228,6 @@ function updateFilter(prop, value, reload = true) {
 <style scoped>
 .movies-page {
 	display: flex;
-	flex-grow: 1;
 	background: var(--background-base-10);
 }
 

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.27.2",
+  "version": "0.27.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.27.2",
+      "version": "0.27.1",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -78,5 +78,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.27.2"
+  "version": "0.27.1"
 }

pages/movies/+Page.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="page">
+	<div>
 		<Movies />
 	</div>
 </template>
@@ -7,10 +7,3 @@
 <script setup>
 import Movies from '#/components/movies/movies.vue';
 </script>
-
-<style scoped>
-.page {
-	display: flex;
-	flex-grow: 1;
-}
-</style>

pages/movies/@movieId/+Page.vue

@@ -249,7 +249,6 @@ const scenes = pageContext.pageProps.scenes;
 <style scoped>
 .page {
 	display: flex;
-	flex-grow: 1;
 	justify-content: center;
 	background: var(--background-base-10);
 }

pages/stashes/movies/+onBeforeRender.js

@@ -19,12 +19,26 @@ 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: `${stash.name} by ${stash.user.username}`,
 				pageProps: {
 					stash,
-					...movieResults,
+					movies,
+					aggActors,
+					aggTags,
+					aggChannels,
+					total,
+					limit,
 				},
 			},
 		};

pages/stashes/scenes/+onBeforeRender.js

@@ -20,12 +20,26 @@ export async function onBeforeRender(pageContext) {
 			limit: Number(pageContext.urlParsed.search.limit) || 30,
 		}, pageContext.user);
 
+		const {
+			scenes,
+			aggActors,
+			aggTags,
+			aggChannels,
+			total,
+			limit,
+		} = stashScenes;
+
 		return {
 			pageContext: {
 				title: `${stash.name} by ${stash.user.username}`,
 				pageProps: {
 					stash,
-					...stashScenes,
+					scenes,
+					aggActors,
+					aggTags,
+					aggChannels,
+					total,
+					limit,
 				},
 			},
 		};

src/movies.js

@@ -227,7 +227,7 @@ async function queryManticoreSql(filters, options) {
 						movies.stashed as stashed,
 						movies.created_at,
 						created_at as stashed_at,
-						year(movies.effective_date) as effective_year,
+						year(effective_date) as effective_year,
 						weight() as _score
 					`));
 
@@ -237,7 +237,7 @@ async function queryManticoreSql(filters, options) {
 				} else {
 					builder.select(knex.raw(`
 						*,
-						year(movies.effective_date) as effective_year,
+						year(effective_date) as effective_year,
 						weight() as _score
 					`));
 				}
@@ -303,7 +303,7 @@ async function queryManticoreSql(filters, options) {
 			.offset((options.page - 1) * options.limit)
 			.toString(),
 		// option threads=1 fixes actors, but drastically slows down performance, wait for fix
-		yearsFacet: options.aggregateYears ? knex.raw('facet effective_year as years order by effective_year desc limit ?', [aggSize]) : null,
+		yearsFacet: options.aggregateYears ? knex.raw('facet year(effective_date) as years order by years desc limit ?', [aggSize]) : null,
 		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,

src/scenes.js

@@ -354,7 +354,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 						scenes.stashed as stashed,
 						scenes.created_at,
 						created_at as stashed_at,
-						year(scenes.effective_date) as effective_year,
+						year(effective_date) as effective_year,
 						weight() as _score
 					`));
 
@@ -364,7 +364,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 				} else {
 					builder.select(knex.raw(`
 						*,
-						year(scenes.effective_date) as effective_year,
+						year(effective_date) as effective_year,
 						weight() as _score
 					`));
 				}
@@ -463,7 +463,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 			.limit(options.limit)
 			.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 order by effective_year desc limit ?', [aggSize]) : null,
+		yearsFacet: options.aggregateYears ? knex.raw('facet year(effective_date) as years order by years desc limit ?', [aggSize]) : null,
 		actorsFacet: options.aggregateActors ? knex.raw('facet scenes.actor_ids order by count(*) desc limit ?', [aggSize]) : null,
 		tagsFacet: options.aggregateTags ? knex.raw('facet scenes.tag_ids order by count(*) desc limit ?', [aggSize]) : null,
 		channelsFacet: options.aggregateChannels ? knex.raw('facet scenes.channel_id order by count(*) desc limit ?', [aggSize]) : null,