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

Compare commits

base: DebaucheryLibrarian:768ab41ee7922b5267425012ecadbcaf29f1f03f
Branches Tags
DebaucheryLibrarian:main
...
compare: DebaucheryLibrarian:f13b6e1a03898cb970df37486eecf32300d2a084
Branches Tags
DebaucheryLibrarian:main

2 Commits
768ab41ee7 ... f13b6e1a03

Author SHA1 Message Date
DebaucheryLibrarian f13b6e1a03 0.17.6 2024-03-27 23:54:25 +01:00
DebaucheryLibrarian 22c4bb0405 Sorting aggregates by slug or lowercased name to avoid capitalization issues. Fixed slug getting interpreted as ID by cache lookup. 2024-03-27 23:54:23 +01:00
6 changed files with 12 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

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

2
package.json
View File

@ -72,5 +72,5 @@
"postcss-custom-media": "^10.0.2", "postcss-custom-media": "^10.0.2",
"postcss-nesting": "^12.0.2" "postcss-nesting": "^12.0.2"
}, },
"version": "0.17.5" "version": "0.17.6"
} }

2
pages/search/+onBeforeRender.js
View File

@ -22,7 +22,7 @@ export async function onBeforeRender(pageContext) {
return { return {
pageContext: { pageContext: {
title: `Search '${pageContext.urlParsed.search.q}'`, title: `Search '${pageContext.urlParsed.search.q || ''}'`,
pageProps: { pageProps: {
scenes, scenes,
aggActors, aggActors,

2
src/cache.js
View File

@ -6,9 +6,11 @@ export async function getIdsBySlug(slugs, domain) {
return null; return null;
} }
/* this, naturally, fails if the slug is 69 etc.
if (Number(slug)) { if (Number(slug)) {
return Number(slug); // already an ID or missing return Number(slug); // already an ID or missing
} }
*/
const id = await redis.hGet(`traxxx:${domain}:id_by_slug`, slug); const id = await redis.hGet(`traxxx:${domain}:id_by_slug`, slug);

6
src/movies.js
View File

@ -532,9 +532,9 @@ export async function fetchMovies(filters, rawOptions, reqUser) {
const channelCounts = options.aggregateChannels && countAggregations(result.aggregations?.channelIds); const channelCounts = options.aggregateChannels && countAggregations(result.aggregations?.channelIds);
const [aggActors, aggTags, aggChannels] = await Promise.all([ const [aggActors, aggTags, aggChannels] = await Promise.all([
options.aggregateActors ? fetchActorsById(result.aggregations.actorIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: actorCounts }) : [], options.aggregateActors ? fetchActorsById(result.aggregations.actorIds.map((bucket) => bucket.key), { order: ['slug', 'asc'], append: actorCounts }) : [],
options.aggregateTags ? fetchTagsById(result.aggregations.tagIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: tagCounts }) : [], options.aggregateTags ? fetchTagsById(result.aggregations.tagIds.map((bucket) => bucket.key), { order: [knex.raw('lower(name)'), 'asc'], append: tagCounts }) : [],
options.aggregateChannels ? fetchEntitiesById(result.aggregations.channelIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: channelCounts }) : [], options.aggregateChannels ? fetchEntitiesById(result.aggregations.channelIds.map((bucket) => bucket.key), { order: ['slug', 'asc'], append: channelCounts }) : [],
]); ]);
const movieIds = result.movies.map((movie) => Number(movie.id)); const movieIds = result.movies.map((movie) => Number(movie.id));

6
src/scenes.js
View File

@ -574,9 +574,9 @@ export async function fetchScenes(filters, rawOptions, reqUser) {
console.time('fetch aggregations'); console.time('fetch aggregations');
const [aggActors, aggTags, aggChannels] = await Promise.all([ const [aggActors, aggTags, aggChannels] = await Promise.all([
options.aggregateActors ? fetchActorsById(result.aggregations.actorIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: actorCounts }) : [], options.aggregateActors ? fetchActorsById(result.aggregations.actorIds.map((bucket) => bucket.key), { order: ['slug', 'asc'], append: actorCounts }) : [],
options.aggregateTags ? fetchTagsById(result.aggregations.tagIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: tagCounts }) : [], options.aggregateTags ? fetchTagsById(result.aggregations.tagIds.map((bucket) => bucket.key), { order: [knex.raw('lower(name)'), 'asc'], append: tagCounts }) : [],
options.aggregateChannels ? fetchEntitiesById(result.aggregations.channelIds.map((bucket) => bucket.key), { order: ['name', 'asc'], append: channelCounts }) : [], options.aggregateChannels ? fetchEntitiesById(result.aggregations.channelIds.map((bucket) => bucket.key), { order: ['slug', 'asc'], append: channelCounts }) : [],
]); ]);
console.timeEnd('fetch aggregations'); console.timeEnd('fetch aggregations');