package-lock.json

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

package.json

@@ -70,5 +70,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.9.7"
+  "version": "0.9.6"
 }

src/scenes.js

@@ -406,13 +406,9 @@ async function queryManticoreSql(filters, options, _reqUser) {
 					builder.whereRaw('match(\'@!title :query:\', scenes)', { query: filters.query });
 				}
 
-				filters.tagIds?.forEach((tagId) => {
-					builder.where('any(tag_ids)', tagId);
-				});
-
-				filters.actorIds?.forEach((actorId) => {
-					builder.where('any(actor_ids)', actorId);
-				});
+				if (filters.tagIds?.length > 0) {
+					builder.whereIn('any(tag_ids)', filters.tagIds);
+				}
 
 				if (filters.entityId) {
 					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') {
 					builder.where('is_showcased', filters.isShowcased);
 				}
@@ -468,15 +468,11 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		maxQueryTime: config.database.manticore.maxQueryTime,
 	}).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
 		? sqlQuery
 		: sqlQuery.replace(/scenes\./g, '');
 
-	if (process.env.NODE_ENV === 'development') {
-		console.log(curatedSqlQuery);
-	}
-
 	const results = await utilsApi.sql(curatedSqlQuery);
 
 	// console.log(results);