components/pagination/pagination.vue

@@ -1,88 +1,81 @@
 <template>
-	<div class="pagination-container">
+	<nav class="pagination">
-		<div
+		<ul class="pages nolist">
-			v-if="currentPage === pageTotal && total > env.maxMatches"
+			<li>
-			class="more"
+				<Link
-		>Results are truncated, apply a filter to find more.</div>
+					:href="getPath(1)"
+					:class="{ disabled: !hasPrevPage }"
+					class="page first nolink"
+					@click="(event) => go(1, event)"
+				><Icon icon="first2" /></Link>
+			</li>
 
-		<nav class="pagination">
+			<li>
-			<ul class="pages nolist">
+				<Link
-				<li>
+					:href="hasPrevPage ? getPath(currentPage - 1) : null"
-					<Link
+					:class="{ disabled: !hasPrevPage }"
-						:href="getPath(1)"
+					class="page prev nolink"
-						:class="{ disabled: !hasPrevPage }"
+					@click="(event) => hasPrevPage && go(currentPage - 1, event)"
-						class="page first nolink"
+				><Icon icon="arrow-left" /></Link>
-						@click="(event) => go(1, event)"
+			</li>
-					><Icon icon="first2" /></Link>
+		</ul>
-				</li>
 
-				<li>
+		<div class="index">
+			<ul class="pages before wrap nolist">
+				<li
+					v-for="prevPage in prevPages"
+					:key="`page-${prevPage}`"
+				>
 					<Link
-						:href="hasPrevPage ? getPath(currentPage - 1) : null"
+						:href="getPath(prevPage)"
-						:class="{ disabled: !hasPrevPage }"
+						:class="{ active: prevPage === currentPage }"
-						class="page prev nolink"
+						class="page nolink"
-						@click="(event) => hasPrevPage && go(currentPage - 1, event)"
+						@click="(event) => go(prevPage, event)"
-					><Icon icon="arrow-left" /></Link>
+					>{{ prevPage }}</Link>
 				</li>
 			</ul>
 
-			<div class="index">
-				<ul class="pages before wrap nolist">
-					<li
-						v-for="prevPage in prevPages"
-						:key="`page-${prevPage}`"
-					>
-						<Link
-							:href="getPath(prevPage)"
-							:class="{ active: prevPage === currentPage }"
-							class="page nolink"
-							@click="(event) => go(prevPage, event)"
-						>{{ prevPage }}</Link>
-					</li>
-				</ul>
-
-				<ul class="pages nolist">
-					<li>
-						<div class="page active">{{ currentPage }}</div>
-					</li>
-				</ul>
-
-				<ul class="pages after wrap nolist">
-					<li
-						v-for="nextPage in nextPages"
-						:key="`page-${nextPage}`"
-					>
-						<Link
-							:href="getPath(nextPage)"
-							:class="{ active: nextPage === currentPage }"
-							class="page nolink"
-							@click="(event) => go(nextPage, event)"
-						>{{ nextPage }}</Link>
-					</li>
-				</ul>
-			</div>
-
 			<ul class="pages nolist">
 				<li>
-					<Link
+					<div class="page active">{{ currentPage }}</div>
-						:href="hasNextPage ? getPath(currentPage + 1) : null"
-						:class="{ disabled: !hasNextPage }"
-						class="page next nolink"
-						@click="(event) => hasNextPage && go(currentPage + 1, event)"
-					><Icon icon="arrow-right" /></Link>
-				</li>
-
-				<li>
-					<Link
-						:href="getPath(pageTotal)"
-						:class="{ disabled: !hasNextPage }"
-						class="page last nolink"
-						@click="(event) => go(pageTotal, event)"
-					><Icon icon="last2" /></Link>
 				</li>
 			</ul>
-		</nav>
+
-	</div>
+			<ul class="pages after wrap nolist">
+				<li
+					v-for="nextPage in nextPages"
+					:key="`page-${nextPage}`"
+				>
+					<Link
+						:href="getPath(nextPage)"
+						:class="{ active: nextPage === currentPage }"
+						class="page nolink"
+						@click="(event) => go(nextPage, event)"
+					>{{ nextPage }}</Link>
+				</li>
+			</ul>
+		</div>
+
+		<ul class="pages nolist">
+			<li>
+				<Link
+					:href="hasNextPage ? getPath(currentPage + 1) : null"
+					:class="{ disabled: !hasNextPage }"
+					class="page next nolink"
+					@click="(event) => hasNextPage && go(currentPage + 1, event)"
+				><Icon icon="arrow-right" /></Link>
+			</li>
+
+			<li>
+				<Link
+					:href="getPath(pageTotal)"
+					:class="{ disabled: !hasNextPage }"
+					class="page last nolink"
+					@click="(event) => go(pageTotal, event)"
+				><Icon icon="last2" /></Link>
+			</li>
+		</ul>
+	</nav>
 </template>
 
 <script setup>
@@ -110,28 +103,18 @@ const props = defineProps({
 		type: Boolean,
 		default: true,
 	},
-	useMaxMatches: {
-		type: Boolean,
-		default: true,
-	},
 });
 
 const emit = defineEmits(['navigation']);
 
 const pageContext = inject('pageContext');
-
+const { routeParams, urlParsed, pageProps } = pageContext;
-const {
-	routeParams,
-	urlParsed,
-	pageProps,
-	env,
-} = pageContext;
 
 const currentPage = computed(() => props.page || Number(routeParams?.page));
 
 const limit = computed(() => props.limit || Number(pageProps.limit) || 30);
 const total = computed(() => props.total || Number(pageProps.total));
-const pageTotal = computed(() => Math.ceil((props.useMaxMatches ? Math.min(total.value, env.maxMatches) : total.value) / limit.value));
+const pageTotal = computed(() => Math.ceil(total.value / limit.value));
 
 const hasNextPage = computed(() => currentPage.value + 1 <= pageTotal.value);
 const hasPrevPage = computed(() => currentPage.value - 1 >= 1);
@@ -196,12 +179,6 @@ function getPath(page) {
 </script>
 
 <style scoped>
-.pagination-container {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-}
-
 .pagination {
 	height: 5rem;
 	display: flex;
@@ -265,11 +242,4 @@ function getPath(page) {
 .next {
 	margin-left: .5rem;
 }
-
-.more {
-	padding: 2rem;
-	text-align: center;
-	color: var(--shadow-strong-10);
-	font-size: 1.1rem;
-}
 </style>

components/scenes/scenes.vue

@@ -169,6 +169,8 @@ const scope = ref(routeParams.scope || props.defaultScope);
 const total = ref(Number(pageProps.total));
 const loading = ref(false);
 
+console.log('SCOPE', routeParams.scope, scope.value);
+
 const actorIds = urlParsed.search.actors?.split(',').map((identifier) => parseActorIdentifier(identifier)?.id).filter(Boolean) || [];
 const queryActors = actorIds.map((urlActorId) => aggActors.value.find((aggActor) => aggActor.id === urlActorId)).filter(Boolean);
 

components/scenes/tile.vue

@@ -28,7 +28,7 @@
 			/>
 
 			<Icon
-				v-show="!favorited && user"
+				v-show="!favorited"
 				icon="heart8"
 				class="heart"
 				@click.native.stop="stash"

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.9.8",
+  "version": "0.9.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.9.8",
+      "version": "0.9.7",
       "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.8"
+  "version": "0.9.7"
 }

src/actors.js

@@ -1,4 +1,3 @@
-import config from 'config';
 import { differenceInYears } from 'date-fns';
 import { unit } from 'mathjs';
 
@@ -273,10 +272,6 @@ 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,8 +377,7 @@ 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) => {
@@ -460,7 +459,6 @@ 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,
@@ -498,11 +496,9 @@ 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,
+		total: results[0].total,
 		aggregations: {
 			actorIds,
 			tagIds,
@@ -550,8 +546,6 @@ 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,7 +148,6 @@ export default async function initServer() {
 			env: {
 				allowLogin: config.auth.login,
 				allowSignup: config.auth.signup,
-				maxMatches: config.database.manticore.maxMatches,
 				maxAggregateSize: config.database.manticore.maxAggregateSize,
 			},
 		};