Improved actor scraping and display.

assets/js/actors/actions.js

@@ -4,53 +4,9 @@ import {
 	releaseActorsFragment,
 	releaseTagsFragment,
 } from '../fragments';
-import { curateRelease } from '../curate';
+import { curateActor, curateRelease } from '../curate';
 import getDateRange from '../get-date-range';
 
-function curateActor(actor) {
-	if (!actor) {
-		return null;
-	}
-
-	const curatedActor = {
-		...actor,
-		height: actor.heightMetric && {
-			metric: actor.heightMetric,
-			imperial: actor.heightImperial,
-		},
-		weight: actor.weightMetric && {
-			metric: actor.weightMetric,
-			imperial: actor.weightImperial,
-		},
-		origin: actor.birthCountry && {
-			city: actor.birthCity,
-			state: actor.birthState,
-			country: actor.birthCountry,
-		},
-		residence: actor.residenceCountry && {
-			city: actor.residenceCity,
-			state: actor.residenceState,
-			country: actor.residenceCountry,
-		},
-		scrapedAt: new Date(actor.createdAt),
-		updatedAt: new Date(actor.updatedAt),
-	};
-
-	if (actor.profiles && actor.profiles.length > 0) {
-		const photos = actor.profiles
-			.map(profile => profile.avatar)
-			.filter(avatar => avatar && (!curatedActor.avatar || avatar.hash !== curatedActor.avatar.hash));
-
-		curatedActor.photos = Object.values(photos.reduce((acc, photo) => ({ ...acc, [photo.hash]: photo }), {}));
-	}
-
-	if (actor.releases) {
-		curatedActor.releases = actor.releases.map(release => curateRelease(release.release));
-	}
-
-	return curatedActor;
-}
-
 function initActorActions(store, _router) {
 	async function fetchActorBySlug({ _commit }, { actorSlug, limit = 100, range = 'latest' }) {
 		const { before, after, orderBy } = getDateRange(range);
@@ -110,6 +66,12 @@ function initActorActions(store, _router) {
 						hash
 						comment
 						copyright
+						sfw: sfwMedia {
+							id
+							thumbnail
+							path
+							comment
+						}
 					}
 					profiles: actorsProfiles {
 						description
@@ -121,6 +83,12 @@ function initActorActions(store, _router) {
 							hash
 							comment
 							copyright
+							sfw: sfwMedia {
+								id
+								thumbnail
+								path
+								comment
+							}
 						}
                     }
                     birthCity
@@ -202,7 +170,7 @@ function initActorActions(store, _router) {
 			exclude: store.state.ui.filter,
 		});
 
-		return curateActor(actor);
+		return curateActor(actor, null, curateRelease);
 	}
 
 	async function fetchActors({ _commit }, {
@@ -223,13 +191,16 @@ function initActorActions(store, _router) {
                     first:$limit,
                     orderBy: NAME_ASC,
                     filter: {
+						aliasFor: {
+							isNull: true
+						}
                         name: {
                             startsWith: $letter
-                        },
+                        }
                         gender: {
                             ${genderFilter}
-                        },
-                    },
+                        }
+                    }
                 ) {
                     id
                     name
@@ -249,17 +220,13 @@ function initActorActions(store, _router) {
 						lazy
 						comment
 						copyright
+						sfw: sfwMedia {
+							id
+							thumbnail
+							path
+							comment
+						}
 					}
-                    actorsProfiles {
-                        actorsAvatarByProfileId {
-                            media {
-								id
-                                path
-                                thumbnail
-                                copyright
-                            }
-                        }
-                    }
                     birthCountry: countryByBirthCountryAlpha2 {
                       alpha2
                       name