1.175.2

migrations/20190325001339_releases.js

@@ -1001,7 +1001,8 @@ exports.up = knex => Promise.resolve()
 		// allow vim fold
 		return knex.raw(`
 			/* We need both the release entries and their search ranking, and PostGraphile does not seem to allow virtual foreign keys on function results.
-			 * Using a view as a proxy for the search results allows us to get both a reference to the releases table, and the ranking */
+			 * Using a view as a proxy for the search results allows us to get both a reference to the releases table, and the ranking.
+			 * A composite type does not seem to be compatible with PostGraphile's @sortable. */
 			CREATE VIEW releases_search_results AS
 				SELECT NULL::integer as id, NULL::real as rank;
 

package-lock.json

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

package.json

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

src/scrapers/bang.js

@@ -83,7 +83,7 @@ async function scrapeScene(scene, entity, options) {
 	release.poster = getScreenUrl(poster, scene);
 	release.photos = remainingScreens.map(photo => getScreenUrl(photo, scene));
 
-	if (options.includePhotos) {
+	if (options?.includePhotos) {
 		const photos = await fetchPhotos(scene);
 
 		if (photos?.length > 0) {
@@ -100,11 +100,11 @@ async function scrapeScene(scene, entity, options) {
 	return release;
 }
 
-function scrapeAll(scenes) {
+function scrapeAll(scenes, entity) {
-	return scenes.map(({ _source: scene }) => scrapeScene(scene));
+	return scenes.map(({ _source: scene }) => scrapeScene(scene, entity));
 }
 
-async function fetchActorReleases(actor) {
+async function fetchActorReleases(actor, entity) {
 	const res = await http.post(`https://${clusterId}.us-east-1.aws.found.io/videos/video/_search`, {
 		size: 50,
 		query: {
@@ -158,10 +158,10 @@ async function fetchActorReleases(actor) {
 		},
 	});
 
-	return scrapeAll(res.body.hits.hits);
+	return scrapeAll(res.body.hits.hits, entity);
 }
 
-async function scrapeProfile(actor, include) {
+async function scrapeProfile(actor, entity, include) {
 	const profile = {};
 
 	profile.aliases = actor.aliases;
@@ -193,7 +193,7 @@ async function scrapeProfile(actor, include) {
 	if (actor.image) profile.avatar = `https://i.bang.com/pornstars/${actor.identifier}.jpg`;
 
 	if (include.releases) {
-		profile.releases = await fetchActorReleases(actor);
+		profile.releases = await fetchActorReleases(actor, entity);
 	}
 
 	return profile;
@@ -402,7 +402,7 @@ async function fetchProfile({ name: actorName }, context, include) {
 		const actor = res.body.hits.hits.find(hit => hit._source.name.toLowerCase() === actorName.toLowerCase());
 
 		if (actor) {
-			return scrapeProfile(actor._source, include);
+			return scrapeProfile(actor._source, context.entity, include);
 		}
 
 		return null;