assets/components/header/filters.vue

@@ -18,7 +18,7 @@
 			<select
 				v-model="mode"
 				class="mode"
-				@change="$router.push({ query: { ...$route.query, mode }, params: { pageNumber: 1 } })"
+				@change="$router.push({ query: { ...$route.query, mode } })"
 			>
 				<option
 					value="all"
@@ -37,7 +37,7 @@
 					class="tag"
 					:class="{ selected: selectedTags.includes(tag.slug) }"
 				>
-					<router-link :to="{ query: { ...getNewRange(tag.slug), mode }, params: { pageNumber: 1 } }">
+					<router-link :to="{ query: { ...getNewRange(tag.slug), mode } }">
 						<Icon
 							icon="checkmark"
 							class="include"
@@ -88,7 +88,7 @@ export default {
 	},
 	data() {
 		return {
-			mode: this.$route.query.mode || 'all',
+			mode: 'all',
 		};
 	},
 	computed: {

assets/js/actors/actions.js

@@ -25,7 +25,6 @@ function initActorActions(store, router) {
                 $orderBy:[ReleasesOrderBy!]
 				$selectableTags: [String],
 				$includeTags: [String!],
-				$mode: String!,
             ) {
                 actor(id: $actorId) {
                     id
@@ -152,9 +151,19 @@ function initActorActions(store, router) {
 								lessThan: $before,
 								greaterThan: $after,
 							}
+							${mode === 'any' ? `
+								releasesTagsConnection: {
+									some: {
+										tag: {
+											slug: {
+												in: $includeTags
 											}
-						selectedTags: $includeTags
-						mode: $mode
+										}
+									}
+								}
+							` : ''}
+                        }
+						${mode === 'all' ? 'selectedTags: $includeTags' : ''}
                         first: $limit
 						offset: $offset
                         orderBy: $orderBy
@@ -176,7 +185,6 @@ function initActorActions(store, router) {
 			orderBy,
 			excludeTags: store.state.ui.filter,
 			includeTags,
-			mode,
 		});
 
 		return {

migrations/20190325001339_releases.js

@@ -857,7 +857,7 @@ exports.up = knex => Promise.resolve()
 				ORDER BY tags.name;
 			$$ LANGUAGE SQL STABLE;
 
-			CREATE FUNCTION actors_scenes(actor actors, selected_tags text[], mode text DEFAULT 'all') RETURNS SETOF releases AS $$
+			CREATE FUNCTION actors_scenes(actor actors, selected_tags text[]) RETURNS SETOF releases AS $$
 				SELECT releases.*
 				FROM releases
 				LEFT JOIN
@@ -869,14 +869,9 @@ exports.up = knex => Promise.resolve()
 				LEFT JOIN
 					tags ON tags.id = releases_tags.tag_id
 				WHERE actors.id = actor.id
-				AND CASE
-					WHEN mode = 'any' AND array_length(selected_tags, 1) > 0
-					THEN tags.slug = ANY(selected_tags)
-					ELSE true
-					END
 				GROUP BY releases.id
 				HAVING CASE
-					WHEN mode = 'all' AND array_length(selected_tags, 1) > 0
+					WHEN array_length(selected_tags, 1) > 0
 					THEN COUNT(
 							CASE WHEN tags.slug = ANY(selected_tags)
 							THEN true

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.121.1",
+    "version": "1.121.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.121.1",
+    "version": "1.121.0",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {