From a6af10ee20fcf92fc68f43c45f5e7182093f7cd2 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Sat, 26 Oct 2024 01:03:30 +0200
Subject: [PATCH] Using actors avatars table for secondary profile photos.

---
 components/actors/bio.vue            |  2 ++
 components/edit/avatar.vue           |  3 ++-
 pages/actors/@actorId/+Page.vue      | 11 ++-------
 pages/actors/@actorId/edit/+Page.vue |  9 ++++----
 src/actors.js                        | 34 ++++++++++++++++++++++++----
 5 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/components/actors/bio.vue b/components/actors/bio.vue
index 3a5bd3c..4c3488b 100644
--- a/components/actors/bio.vue
+++ b/components/actors/bio.vue
@@ -333,12 +333,14 @@
 							v-if="description.entity.type === 'network' || !description.entity.parent || description.entity.isIndependent"
 							:src="`/logos/${description.entity.slug}/thumbs/network.png`"
 							class="description-logo"
+							loading="lazy"
 						>
 
 						<img
 							v-else
 							:src="`/logos/${description.entity.parent.slug}/thumbs/${description.entity.slug}.png`"
 							class="description-logo"
+							loading="lazy"
 						>
 					</a>
 				</p>
diff --git a/components/edit/avatar.vue b/components/edit/avatar.vue
index f012015..d6de9df 100644
--- a/components/edit/avatar.vue
+++ b/components/edit/avatar.vue
@@ -79,7 +79,8 @@ defineProps({
 	padding: .25rem;
 
 	.icon {
-		fill: var(--highlight);
+		fill: var(--highlight-strong-20);
+		filter: drop-shadow(0 0 1px var(--shadow));
 	}
 }
 
diff --git a/pages/actors/@actorId/+Page.vue b/pages/actors/@actorId/+Page.vue
index 939ceb3..200b81d 100644
--- a/pages/actors/@actorId/+Page.vue
+++ b/pages/actors/@actorId/+Page.vue
@@ -37,10 +37,10 @@
 
 			<div
 				class="photos nobar"
-				:class="{ 'has-avatar': actor.avatar, 'has-photos': actor.avatar ? photos.length > 1 : photos.length > 0 }"
+				:class="{ 'has-avatar': actor.avatar, 'has-photos': actor.avatar ? actor.photos.length > 1 : actor.photos.length > 0 }"
 			>
 				<div
-					v-for="photo in photos"
+					v-for="photo in actor.photos"
 					:key="`photo-${photo.id}`"
 					class="photo-container"
 					:class="{ avatar: photo.isAvatar }"
@@ -92,13 +92,6 @@ const { pageProps, routeParams } = pageContext;
 const { actor } = pageProps;
 
 const domain = routeParams.domain;
-
-const photos = Object.values(Object.fromEntries(actor.profiles
-	.filter((profile) => !!profile.avatar)
-	.map((profile) => [profile.avatar.id, {
-		...profile.avatar,
-		isAvatar: profile.avatar.id === actor.avatar.id,
-	}])));
 </script>
 
 <style scoped>
diff --git a/pages/actors/@actorId/edit/+Page.vue b/pages/actors/@actorId/edit/+Page.vue
index 949175c..b998452 100644
--- a/pages/actors/@actorId/edit/+Page.vue
+++ b/pages/actors/@actorId/edit/+Page.vue
@@ -748,14 +748,12 @@ const bustSizes = {
 bustSizes.uk = bustSizes.us;
 bustSizes.jp = bustSizes.eu;
 
-const avatars = Object.values(Object.fromEntries(actor.value.profiles.filter((profile) => !!profile.avatar).map((profile) => [profile.avatar.id, profile.avatar])));
-
 const fields = computed(() => [
-	...(avatars.length > 0 ? [{
+	...(actor.value.photos.length > 0 ? [{
 		key: 'avatar',
 		type: 'avatar',
 		value: actor.value.avatar?.id,
-		options: avatars,
+		options: actor.value.photos,
 	}] : []),
 	...(user.role === 'admin'
 		? [{
@@ -1010,6 +1008,7 @@ async function submit() {
 	align-items: center;
 	padding: .25rem 1rem;
 	margin-bottom: .25rem;
+	overflow: hidden;
 
 	&.inline {
 		display: inline-flex;
@@ -1049,6 +1048,7 @@ async function submit() {
 	display: flex;
 	align-items: center;
 	flex-grow: 1;
+	overflow: hidden;
 
 	.input {
 		flex-grow: 1;
@@ -1140,6 +1140,7 @@ async function submit() {
 }
 
 .avatars {
+	width: 100%;
 	display: flex;
 	gap: .25rem;
 	padding-bottom: .5rem;
diff --git a/src/actors.js b/src/actors.js
index cce41a1..4c8afe9 100644
--- a/src/actors.js
+++ b/src/actors.js
@@ -110,8 +110,15 @@ export function curateActor(actor, context = {}) {
 			description: profile.description,
 			descriptionHash: profile.description_hash,
 			entity: curateEntity({ ...profile.entity, parent: profile.parent_entity }),
-			avatar: curateMedia(profile.avatar),
+			// avatars: profile.avatars.map((avatar) => curateMedia(avatar)),
 		})),
+		photos: context.photos
+			?.map((photo) => ({
+				...curateMedia(photo),
+				isAvatar: photo.id === actor.avatar?.id,
+				profileIds: photo.profile_ids,
+			}))
+			.toSorted((photoA, photoB) => photoB.isAvatar - photoA.isAvatar),
 		createdAt: actor.created_at,
 		updatedAt: actor.updated_at,
 		scenes: actor.scenes,
@@ -149,7 +156,7 @@ export function sortActorsByGender(actors, context = {}) {
 }
 
 export async function fetchActorsById(actorIds, options = {}, reqUser) {
-	const [actors, profiles, stashes] = await Promise.all([
+	const [actors, profiles, photos, stashes] = await Promise.all([
 		knex('actors')
 			.select(
 				'actors.*',
@@ -171,13 +178,29 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
 				}
 			}),
 		knex('actors_profiles')
-			.select('actors_profiles.*', knex.raw('row_to_json(entities) as entity'), knex.raw('row_to_json(parents) as parent_entity'), knex.raw('row_to_json(media) as avatar'))
+			.select(
+				'actors_profiles.*',
+				knex.raw('row_to_json(entities) as entity'),
+				knex.raw('row_to_json(parents) as parent_entity'),
+				// knex.raw('coalesce(json_agg(media) filter (where media.id is not null), \'[]\') as avatars'),
+			)
 			.leftJoin('actors', 'actors.id', 'actors_profiles.actor_id')
 			.leftJoin('entities', 'entities.id', 'actors_profiles.entity_id')
 			.leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
-			.leftJoin('media', 'media.id', 'actors_profiles.avatar_media_id')
+			.leftJoin('actors_avatars', 'actors_avatars.profile_id', 'actors_profiles.id')
+			// .leftJoin('media', 'media.id', 'actors_avatars.media_id')
+			.whereIn('actors_profiles.actor_id', actorIds)
+			.groupBy('actors_profiles.id', 'entities.id', 'parents.id'),
+		knex('actors_avatars')
+			.select(
+				'media.*',
+				'actors_avatars.actor_id',
+				knex.raw('json_agg(actors_avatars.profile_id) as profile_ids'),
+			)
 			.whereIn('actor_id', actorIds)
-			.groupBy('actors_profiles.id', 'entities.id', 'parents.id', 'media.id'),
+			.leftJoin('media', 'media.id', 'actors_avatars.media_id')
+			.groupBy('media.id', 'actors_avatars.actor_id', 'actors_avatars.created_at')
+			.orderBy('actors_avatars.created_at', 'desc'),
 		reqUser
 			? knex('stashes_actors')
 				.leftJoin('stashes', 'stashes.id', 'stashes_actors.stash_id')
@@ -204,6 +227,7 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
 		return curateActor(actor, {
 			stashes: stashes.filter((stash) => stash.actor_id === actor.id),
 			profiles: profiles.filter((profile) => profile.actor_id === actor.id),
+			photos: photos.filter((photo) => photo.actor_id === actor.id),
 			append: options.append,
 		});
 	}).filter(Boolean);