migrations/20190325001339_releases.js

@@ -1012,7 +1012,7 @@ exports.up = knex => Promise.resolve()
 				SELECT releases.id, ranks.rank FROM (
 					SELECT
 						releases_search.release_id,
-						ts_rank(releases_search.document, to_tsquery('english', array_to_string(array(SELECT * FROM regexp_matches(query, '\\w+', 'g')), '|'))) AS rank
+						ts_rank(releases_search.document, to_tsquery('english', regexp_replace(query, '[\\s._-]+', '|', 'gi'))) AS rank
 					FROM releases_search
 					) ranks
 				LEFT JOIN releases ON releases.id = ranks.release_id

package-lock.json

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

package.json

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

seeds/00_tags.js

@@ -799,11 +799,6 @@ const tags = [
 		slug: 'short-hair',
 		group: 'hair',
 	},
-	{
-		name: 'sideways',
-		slug: 'sideways',
-		group: 'position',
-	},
 	{
 		name: 'skirt',
 		slug: 'skirt',
@@ -1752,10 +1747,6 @@ const aliases = [
 		name: 'shoes',
 		for: 'shoes-on',
 	},
-	{
-		name: 'side fuck',
-		for: 'sideways',
-	},
 	{
 		name: 'slave',
 		for: 'bdsm',

src/actors.js

@@ -24,7 +24,7 @@ const logger = require('./logger')(__filename);
 
 const { toBaseReleases } = require('./deep');
 const { associateAvatars, flushOrphanedMedia } = require('./media');
-const { fetchEntitiesBySlug } = require('./entities');
+const { fetchEntitiesBySlug, getRecursiveParent } = require('./entities');
 const { deleteScenes } = require('./releases');
 
 const slugify = require('./utils/slugify');
@@ -159,11 +159,7 @@ function toBaseActors(actorsOrNames, release) {
 			const name = capitalize(baseName);
 			const slug = slugify(name);
 
-			// using top level parent widens the scope too much, e.g. different Gamma sites may not use the same actor database
-			// const entity = getRecursiveParent(release?.entity);
-			const entity = (release?.entity?.indepdendent && release?.entity)
-				|| release?.entity?.parent
-				|| release?.entity;
+			const entity = getRecursiveParent(release?.entity);
 
 			const baseActor = {
 				name,