Fixed SQL total and pagination, showing end of result info. Hiding heart from scene tiles when not logged in.

src/actors.js

@@ -1,3 +1,4 @@
+import config from 'config';
 import { differenceInYears } from 'date-fns';
 import { unit } from 'mathjs';
 
@@ -272,6 +273,10 @@ export async function fetchActors(filters, rawOptions) {
 				sort: [{ country: { order: 'asc' } }],
 			},
 		},
+		options: {
+			max_matches: config.database.manticore.maxMatches,
+			max_query_time: config.database.manticore.maxQueryTime,
+		},
 	});
 
 	const actorIds = result.hits.hits.map((hit) => Number(hit._id));

src/scenes.js

@@ -377,7 +377,8 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		max_query_time=:maxQueryTime:
 		:actorsFacet:
 		:tagsFacet:
-		:channelsFacet:
+		:channelsFacet:;
+		show meta;
 	`, {
 		query: knexManticore(filters.stashId ? 'scenes_stashed' : 'scenes')
 			.modify((builder) => {
@@ -459,6 +460,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
 				}
 			})
 			.limit(options.limit)
+			.offset((options.page - 1) * options.limit)
 			.toString(),
 		// option threads=1 fixes actors, but drastically slows down performance, wait for fix
 		actorsFacet: options.aggregateActors ? knex.raw('facet scenes.actor_ids order by count(*) desc limit ?', [aggSize]) : null,
@@ -496,9 +498,11 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		?.data.map((row) => ({ key: row.channel_id || row['scenes.channel_id'], doc_count: row['count(*)'] }))
 		|| [];
 
+	const total = results.at(-1).data.find((entry) => entry.Variable_name === 'total_found').Value;
+
 	return {
 		scenes: results[0].data,
-		total: results[0].total,
+		total,
 		aggregations: {
 			actorIds,
 			tagIds,
@@ -546,6 +550,8 @@ export async function fetchScenes(filters, rawOptions, reqUser) {
 	const scenes = await fetchScenesById(sceneIds, reqUser);
 	console.timeEnd('fetch full');
 
+	console.log('total', result.total);
+
 	return {
 		scenes,
 		aggActors,

src/web/server.js

@@ -148,6 +148,7 @@ export default async function initServer() {
 			env: {
 				allowLogin: config.auth.login,
 				allowSignup: config.auth.signup,
+				maxMatches: config.database.manticore.maxMatches,
 				maxAggregateSize: config.database.manticore.maxAggregateSize,
 			},
 		};