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

Compare commits

base: DebaucheryLibrarian:3f36c0ae0a8e7c495501a037351de66bdd35ab76
Branches Tags
DebaucheryLibrarian:main
..
compare: DebaucheryLibrarian:7a3fb84cf6323bacc0da9e954add797a433aa529
Branches Tags
DebaucheryLibrarian:main

No commits in common. "3f36c0ae0a8e7c495501a037351de66bdd35ab76" and "7a3fb84cf6323bacc0da9e954add797a433aa529" have entirely different histories.
3f36c0ae0a ... 7a3fb84cf6

3 changed files with 11 additions and 15 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.9.7", "version": "0.9.6",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.9.7", "version": "0.9.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

@ -70,5 +70,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.9.7" "version": "0.9.6"
} }

20
src/scenes.js
View File

@ -406,13 +406,9 @@ async function queryManticoreSql(filters, options, _reqUser) {
builder.whereRaw('match(\'@!title :query:\', scenes)', { query: filters.query }); builder.whereRaw('match(\'@!title :query:\', scenes)', { query: filters.query });
} }
filters.tagIds?.forEach((tagId) => { if (filters.tagIds?.length > 0) {
builder.where('any(tag_ids)', tagId); builder.whereIn('any(tag_ids)', filters.tagIds);
}); }
filters.actorIds?.forEach((actorId) => {
builder.where('any(actor_ids)', actorId);
});
if (filters.entityId) { if (filters.entityId) {
builder.where((whereBuilder) => { builder.where((whereBuilder) => {
@ -422,6 +418,10 @@ async function queryManticoreSql(filters, options, _reqUser) {
}); });
} }
if (filters.actorIds?.length > 0) {
builder.whereIn('any(actor_ids)', filters.actorIds);
}
if (typeof filters.isShowcased === 'boolean') { if (typeof filters.isShowcased === 'boolean') {
builder.where('is_showcased', filters.isShowcased); builder.where('is_showcased', filters.isShowcased);
} }
@ -468,15 +468,11 @@ async function queryManticoreSql(filters, options, _reqUser) {
maxQueryTime: config.database.manticore.maxQueryTime, maxQueryTime: config.database.manticore.maxQueryTime,
}).toString(); }).toString();
// manticore does not seem to accept table.column syntax if 'table' is primary (yet?), crude work-around // manticore does not seem to accept table.column syntax if 'table' is primary (yet), crude work-around
const curatedSqlQuery = filters.stashId const curatedSqlQuery = filters.stashId
? sqlQuery ? sqlQuery
: sqlQuery.replace(/scenes\./g, ''); : sqlQuery.replace(/scenes\./g, '');
if (process.env.NODE_ENV === 'development') {
console.log(curatedSqlQuery);
}
const results = await utilsApi.sql(curatedSqlQuery); const results = await utilsApi.sql(curatedSqlQuery);
// console.log(results); // console.log(results);