From 0f052a0631e66fdd62967333210e28c4352bb130 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Tue, 29 Dec 2020 04:20:13 +0100
Subject: [PATCH] Fixed actor boolean logic, addressing missing boob, tattoo
 and piercing info. Removed scroll background, fixed actor photo load event
 and padding.

---
 assets/components/actors/actor.vue  |  8 +++-----
 assets/components/actors/photos.vue | 12 ++++++++----
 assets/components/scroll/scroll.vue | 16 ++++++----------
 src/actors.js                       | 24 ++++++++++++------------
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue
index 99d58045..67fbf7f7 100644
--- a/assets/components/actors/actor.vue
+++ b/assets/components/actors/actor.vue
@@ -318,13 +318,14 @@
 			<div class="actor-content">
 				<Scroll
 					v-if="actor.avatar || (actor.photos && actor.photos.length > 0)"
+					v-slot="scroll"
 					:expanded="photosExpanded"
-					class="scroll-light"
 					@expand="(state) => photosExpanded = state"
 				>
 					<Photos
 						:actor="actor"
 						:class="{ expanded: photosExpanded }"
+						@load="scroll.loaded"
 					/>
 				</Scroll>
 
@@ -683,10 +684,6 @@ export default {
     margin: 0 0 1rem 0;
 }
 
-.photos {
-	background: var(--background-dim);
-}
-
 .profile-social {
     display: none;
 }
@@ -696,6 +693,7 @@ export default {
 }
 
 .scroll {
+	background: var(--background-dim);
 	border-bottom: solid 1px var(--shadow-hint);
 }
 
diff --git a/assets/components/actors/photos.vue b/assets/components/actors/photos.vue
index 0b680c29..6feddcde 100644
--- a/assets/components/actors/photos.vue
+++ b/assets/components/actors/photos.vue
@@ -19,7 +19,7 @@
 				:title="actor.avatar.credit && `© ${actor.avatar.credit}`"
 				loading="lazy"
 				class="avatar photo"
-				@load="$parent.$emit('load')"
+				@load="$emit('load', $event)"
 			>
 		</a>
 
@@ -37,7 +37,7 @@
 				:title="`© ${photo.credit || photo.entity.name}`"
 				loading="lazy"
 				class="photo"
-				@load="$parent.$emit('load')"
+				@load="$emit('load', $event)"
 			>
 		</a>
 	</div>
@@ -59,6 +59,7 @@ export default {
 			default: null,
 		},
 	},
+	emits: ['load'],
 	computed: {
 		sfw,
 		photos,
@@ -73,7 +74,6 @@ export default {
     display: flex;
 	box-sizing: border-box;
 	padding: .5rem 1rem;
-	margin: 0 1rem 0 0;
     font-size: 0;
 
 	&.expanded {
@@ -100,7 +100,11 @@ export default {
 }
 
 .photo-link {
-	margin: 0 .5rem 0 0;
+	padding: 0 .5rem 0 0;
+
+	&:last-child {
+		padding: 0 1rem 0 0;
+	}
 }
 
 .photo {
diff --git a/assets/components/scroll/scroll.vue b/assets/components/scroll/scroll.vue
index 0baaf4b8..91a6e583 100644
--- a/assets/components/scroll/scroll.vue
+++ b/assets/components/scroll/scroll.vue
@@ -84,7 +84,7 @@ function mounted() {
 	this.updateScroll();
 }
 
-function beforeDestroy() {
+function beforeUnmount() {
 	this.$refs.content.removeEventListener('scroll', this.updateScroll);
 
 	window.removeEventListener('resize', this.updateScroll);
@@ -121,7 +121,7 @@ export default {
 	},
 	mounted,
 	updated,
-	beforeDestroy,
+	beforeUnmount,
 	methods: {
 		scroll,
 		loaded,
@@ -133,15 +133,11 @@ export default {
 <style lang="scss" scoped>
 @import 'theme';
 
-.scroll {
-	background: var(--profile);
+.scroll.expanded {
+	padding: 0;
 
-	&.expanded {
-		padding: 0;
-
-		.scroll {
-			display: none;
-		}
+	.scroll {
+		display: none;
 	}
 }
 
diff --git a/src/actors.js b/src/actors.js
index aafc2077..3310107c 100644
--- a/src/actors.js
+++ b/src/actors.js
@@ -348,24 +348,24 @@ async function curateProfile(profile, actor) {
 		curatedProfile.penisGirth = Number(profile.penisGirth) || profile.penisGirth?.match?.(/\d+/)?.[0] || null;
 
 		curatedProfile.circumcised = (typeof profile.circumcised === 'boolean' && profile.circumcised)
-			|| (/yes/i.test(profile.circumcised) && true)
-			|| (/no/i.test(profile.circumcised) && false)
-			|| null;
+			?? (/yes/i.test(profile.circumcised) && true)
+			?? (/no/i.test(profile.circumcised) && false)
+			?? null;
 
 		curatedProfile.naturalBoobs = (typeof profile.naturalBoobs === 'boolean' && profile.naturalBoobs)
-			|| (/yes/i.test(profile.naturalBoobs) && true)
-			|| (/no/i.test(profile.naturalBoobs) && false)
-			|| null;
+			?? (/yes/i.test(profile.naturalBoobs) && true)
+			?? (/no/i.test(profile.naturalBoobs) && false)
+			?? null;
 
 		curatedProfile.hasTattoos = (typeof profile.hasTattoos === 'boolean' && profile.hasTattoos)
-			|| (/yes/i.test(profile.hasTattoos) && true)
-			|| (/no/i.test(profile.hasTattoos) && true)
-			|| null;
+			?? (/yes/i.test(profile.hasTattoos) && true)
+			?? (/no/i.test(profile.hasTattoos) && true)
+			?? null;
 
 		curatedProfile.hasPiercings = (typeof profile.hasPiercings === 'boolean' && profile.hasPiercings)
-			|| (/yes/i.test(profile.hasPiercings) && true)
-			|| (/no/i.test(profile.hasPiercings) && true)
-			|| null;
+			?? (/yes/i.test(profile.hasPiercings) && true)
+			?? (/no/i.test(profile.hasPiercings) && true)
+			?? null;
 
 		if (argv.resolvePlace) {
 			const [placeOfBirth, placeOfResidence] = await Promise.all([