0.18.4

package-lock.json

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

package.json

@@ -74,5 +74,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.18.3"
+  "version": "0.18.4"
 }

pages/stashes/scenes/+onBeforeRender.js

@@ -14,6 +14,7 @@ export async function onBeforeRender(pageContext) {
 			scope: pageContext.routeParams.scope || 'stashed',
 			stashId: stash.id,
 			tagFilter: pageContext.tagFilter,
+			isShowcased: null,
 		}), {
 			page: Number(pageContext.routeParams.page) || 1,
 			limit: Number(pageContext.urlParsed.search.limit) || 30,

pages/tags/+onBeforeRender.js

@@ -116,9 +116,10 @@ const tagSlugs = {
 	],
 };
 
-export async function onBeforeRender(_pageContext) {
+export async function onBeforeRender(pageContext) {
 	const tags = await fetchTagsById(Object.values(tagSlugs).flat());
-	const tagsBySlug = Object.fromEntries(tags.map((tag) => [tag.slug, tag]));
+	const filteredTags = tags.filter((tag) => !pageContext.tagFilter.includes(tag.name) && !pageContext.tagFilter.includes(tag.slug));
+	const tagsBySlug = Object.fromEntries(filteredTags.map((tag) => [tag.slug, tag]));
 
 	const tagShowcase = Object.fromEntries(Object.entries(tagSlugs).map(([category, categorySlugs]) => [
 		category,

src/scenes.js

@@ -472,7 +472,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 				}
 
 				if (typeof filters.isShowcased === 'boolean') {
-					builder.where('is_showcased', filters.isShowcased);
+					builder.where('scenes.is_showcased', filters.isShowcased);
 				}
 
 				if (!filters.scope || filters.scope === 'latest') {

src/web/scenes.js

@@ -35,7 +35,7 @@ export async function curateScenesQuery(query) {
 		notEntityIds,
 		movieId: Number(query.movieId) || null,
 		stashId: Number(query.stashId) || null,
-		isShowcased: query.isShowcased ?? true,
+		isShowcased: typeof query.isShowcased === 'boolean' ? query.isShowcased : null,
 	};
 }