DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:5525284818e57e3973264c49d90d4d74b5bc6b7a
Branches Tags
DebaucheryLibrarian:main
...
compare: DebaucheryLibrarian:24f480d38450dd7e874bba6ab76a880a92138d10
Branches Tags
DebaucheryLibrarian:main

2 Commits
5525284818 ... 24f480d384

Author SHA1 Message Date
DebaucheryLibrarian 24f480d384 0.18.4 2024-04-03 03:31:38 +02:00
DebaucheryLibrarian 0b37d2dd1a Fixed showcase in stash. Applying tag filter to tag list. 2024-04-03 03:31:35 +02:00
6 changed files with 9 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -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",

2
package.json
View File

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

1
pages/stashes/scenes/+onBeforeRender.js
View File

@ -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,

5
pages/tags/+onBeforeRender.js
View File

@ -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,

2
src/scenes.js
View File

@ -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') {

2
src/web/scenes.js
View File

@ -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,
};
}