1.174.0

assets/components/search/search.vue

@@ -108,7 +108,6 @@ export default {
     display: grid;
     grid-template-columns: repeat(auto-fill, minmax(11rem, 1fr));
     grid-gap: 0 .5rem;
-    flex-grow: 1;
 	margin: 0 0 1rem 0;
 }
 

assets/js/ui/actions.js

@@ -37,6 +37,7 @@ function initUiActions(_store, _router) {
                 releases: searchReleases(
                     query: $query
                     first: $limit
+					minimalRank: "0.025"
                 ) {
                     id
                     title

migrations/20190325001339_releases.js

@@ -1012,7 +1012,7 @@ exports.up = knex => Promise.resolve()
 	.then(() => { // eslint-disable-line arrow-body-style
 		// allow vim fold
 		return knex.raw(`
-			CREATE FUNCTION search_releases(query text) RETURNS SETOF releases AS $$
+			CREATE FUNCTION search_releases_legacy(query text) RETURNS SETOF releases AS $$
 				SELECT * FROM releases WHERE releases.id IN (
 					SELECT release_id FROM releases_search AS search
 					WHERE search.document @@ plainto_tsquery('traxxx', regexp_replace(query, '\\.|-|(XXX\\.[\\d+|hd|sd].*$)', ' ', 'ig'))
@@ -1020,6 +1020,18 @@ exports.up = knex => Promise.resolve()
 				);
 			$$ LANGUAGE SQL STABLE;
 
+			CREATE FUNCTION search_releases(query text, minimum_rank numeric DEFAULT 0) RETURNS SETOF releases AS $$
+				SELECT releases.* FROM (
+					SELECT
+						releases_search.release_id,
+						ts_rank(releases_search.document, to_tsquery('english', array_to_string(regexp_split_to_array(query, E'\\s+'), '|'))) AS rank
+					FROM releases_search
+					) ranks
+				LEFT JOIN releases ON releases.id = ranks.release_id
+				WHERE ranks.rank > minimum_rank
+				ORDER BY ranks.rank DESC;
+			$$ LANGUAGE SQL STABLE;
+
 			CREATE FUNCTION search_entities(search text) RETURNS SETOF entities AS $$
 				SELECT * FROM entities
 				WHERE

package-lock.json

@@ -1,11 +1,11 @@
 {
     "name": "traxxx",
-    "version": "1.173.6",
+    "version": "1.174.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
-            "version": "1.173.6",
+            "version": "1.174.0",
             "license": "ISC",
             "dependencies": {
                 "@graphile-contrib/pg-order-by-related": "^1.0.0-beta.6",

package.json

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

seeds/00_tags.js

@@ -1416,6 +1416,7 @@ const aliases = [
 	{
 		name: 'dp',
 		for: 'dp',
+		secondary: true,
 	},
 	{
 		name: 'double dildo deepthroat',

src/store-releases.js

@@ -218,7 +218,7 @@ async function updateReleasesSearch(releaseIds) {
         SELECT
             releases.id AS release_id,
             TO_TSVECTOR(
-                'traxxx',
+                'english',
                 COALESCE(releases.title, '') || ' ' ||
                 entities.name || ' ' ||
                 entities.slug || ' ' ||
@@ -238,7 +238,7 @@ async function updateReleasesSearch(releaseIds) {
         LEFT JOIN releases_actors AS local_actors ON local_actors.release_id = releases.id
         LEFT JOIN releases_tags AS local_tags ON local_tags.release_id = releases.id
         LEFT JOIN actors ON local_actors.actor_id = actors.id
-        LEFT JOIN tags ON local_tags.tag_id = tags.id AND tags.priority >= 7
+        LEFT JOIN tags ON local_tags.tag_id = tags.id AND tags.priority >= 6
         LEFT JOIN tags as tags_aliases ON local_tags.tag_id = tags_aliases.alias_for AND tags_aliases.secondary = true
         ${releaseIds ? 'WHERE releases.id = ANY(?)' : ''}
         GROUP BY releases.id, entities.name, entities.slug, entities.alias, parents.name, parents.slug, parents.alias;