From 8f5b7e9c4537b3b16c8d31203ea244734dece02d Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Sun, 3 Nov 2024 01:56:51 +0100
Subject: [PATCH] Fixed bio and profile nav overflow, scene page channel name
 when no logo.

---
 common                          |  2 +-
 components/actors/bio.vue       | 18 ++++++++++++++----
 pages/scene/+Page.vue           |  7 ++++++-
 pages/users/@username/+Page.vue |  9 +++++++--
 src/actors.js                   | 17 ++++++++++++++++-
 5 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/common b/common
index 1122b41..97d7e9c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 1122b4198f2c5bc27f9f4e3f3aedea6c81f09ba1
+Subproject commit 97d7e9cfd0bbf8e507e8fdb87fb2cc78aef6a1a6
diff --git a/components/actors/bio.vue b/components/actors/bio.vue
index 4c3488b..32a26bc 100644
--- a/components/actors/bio.vue
+++ b/components/actors/bio.vue
@@ -297,8 +297,8 @@
 			<li class="bio-item updated">
 				<span
 					class="ellipsis"
-					:title="`#${actor.id} Updated ${formatDate(actor.updatedAt, 'yyyy-MM-dd hh:mm')}`"
-				>#{{ actor.id }} Updated {{ formatDate(actor.updatedAt, 'yyyy-MM-dd') }}</span>
+					:title="formatDate(actor.updatedAt, 'yyyy-MM-dd hh:mm')"
+				>{{ formatDate(actor.updatedAt, 'yyyy-MM-dd') }}</span>
 
 				<div class="actor-actions">
 					<a
@@ -514,7 +514,6 @@ const descriptions = Object.values(Object.fromEntries(props.actor.profiles
 }
 
 .bio-item {
-    width: calc(50% - 4rem);
     display: flex;
     justify-content: space-between;
     box-sizing: border-box;
@@ -646,10 +645,17 @@ const descriptions = Object.values(Object.fromEntries(props.actor.profiles
 .updated {
     color: var(--highlight-weak-10);
     font-size: .8rem;
+	text-align: left;
+
+	.ellipsis {
+		width: 0;
+		flex-grow: 1;
+	}
 }
 
 .actor-actions {
 	display: flex;
+	flex-shrink: 0;
 	justify-content: flex-start;
 	gap: 1rem;
 	margin-right: .5rem;
@@ -778,6 +784,10 @@ const descriptions = Object.values(Object.fromEntries(props.actor.profiles
     .descriptions-container {
         display: none;
     }
+
+	.bio {
+		margin-right: 1rem;
+	}
 }
 
 @media(--compact) {
@@ -797,7 +807,7 @@ const descriptions = Object.values(Object.fromEntries(props.actor.profiles
     }
 }
 
-@media(--small-15) {
+@media(--small) {
     .profile {
         height: auto;
         max-height: none;
diff --git a/pages/scene/+Page.vue b/pages/scene/+Page.vue
index 5e70460..cc58a2b 100644
--- a/pages/scene/+Page.vue
+++ b/pages/scene/+Page.vue
@@ -10,13 +10,18 @@
 					<Link
 						v-if="scene.channel"
 						:href="`/${scene.channel.type}/${scene.channel.slug}`"
-						class="channel-link entity-link"
+						class="channel-link entity-link nolink"
 					>
 						<img
 							v-if="scene.channel.hasLogo"
 							:src="scene.channel.isIndependent || !scene.network ? `/logos/${scene.channel.slug}/thumbs/network.png` : `/logos/${scene.network.slug}/thumbs/${scene.channel.slug}.png`"
 							class="channel-logo entity-logo"
 						>
+
+						<span
+							v-else
+							class="name"
+						>{{ scene.channel.name }}</span>
 					</Link>
 
 					<span
diff --git a/pages/users/@username/+Page.vue b/pages/users/@username/+Page.vue
index 88f1c94..c772a71 100644
--- a/pages/users/@username/+Page.vue
+++ b/pages/users/@username/+Page.vue
@@ -17,7 +17,8 @@
 
 			<nav
 				v-if="profile.id === user?.id"
-				class="domains"
+				class="domains nobar"
+				@wheel.prevent="scrollHorizontal"
 			>
 				<a
 					:href="`/user/${profile.username}/stashes`"
@@ -117,6 +118,10 @@ const mockupRelease = {
 		name: 'Traxxx',
 	},
 };
+
+function scrollHorizontal(event) {
+	event.currentTarget.scrollLeft += event.deltaY; // eslint-disable-line no-param-reassign
+}
 </script>
 
 <style>
@@ -213,6 +218,7 @@ const mockupRelease = {
 }
 
 .domain {
+	flex-shrink: 0;
 	color: var(--glass-strong-20);
 	background: var(--background-dark-20);
 	padding: .5rem 1rem;
@@ -257,7 +263,6 @@ const mockupRelease = {
 	}
 
 	.domains {
-		justify-content: center;
 		padding: .5rem .5rem;
 	}
 
diff --git a/src/actors.js b/src/actors.js
index f8d060f..c1f838c 100644
--- a/src/actors.js
+++ b/src/actors.js
@@ -824,6 +824,16 @@ export async function createActorRevision(actorId, {
 			return null;
 		}
 
+		if (key === 'originCountry' && edits.originPlace) {
+			// place overrides country
+			return null;
+		}
+
+		if (key === 'residenceCountry' && edits.residenceCountry) {
+			// place overrides country
+			return null;
+		}
+
 		if (['originPlace', 'residencePlace'].includes(key)) {
 			if (!value) {
 				return [
@@ -847,10 +857,15 @@ export async function createActorRevision(actorId, {
 				throw new Error(`Failed to resolve ${key} ${value}`);
 			}
 
+			const countryKey = key.includes('origin') ? 'originCountry' : 'residenceCountry';
+
 			return [
 				{
-					key: key.includes('origin') ? 'originCountry' : 'residenceCountry',
+					key: countryKey,
 					value: resolvedLocation.country,
+					comment: edits[countryKey] && edits[countryKey] !== resolvedLocation.country
+						? `${countryKey} overridden by resolved ${key}`
+						: null,
 				},
 				{
 					key: key.includes('origin') ? 'originState' : 'residenceState',