From 105972b3d4dca5e5b5b74e3183cf46de147b5d06 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Wed, 27 Mar 2024 03:05:32 +0100
Subject: [PATCH] Using different icon and fixed unstash fade in secondary
 stashes.

---
 components/actors/tile.vue   |  9 +++++----
 components/movies/tile.vue   | 11 +++++++----
 components/scenes/tile.vue   |  9 +++++----
 components/stashes/heart.vue | 13 +++++++------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/components/actors/tile.vue b/components/actors/tile.vue
index ff09e03..ecd6d1a 100644
--- a/components/actors/tile.vue
+++ b/components/actors/tile.vue
@@ -2,7 +2,7 @@
 	<div
 		class="tile"
 		:class="{
-			unstashed: !favorited && pageStash && user && pageStash.id === user.primaryStash?.id
+			unstashed: !favorited && pageStash && user && pageStash.user.id === user.id,
 		}"
 	>
 		<span class="name">{{ actor.name }}</span>
@@ -33,8 +33,8 @@
 				:item="actor"
 				:show-secondary="false"
 				class="light tiled"
-				@stashed="(stash) => { favorited = stash.isPrimary ? true : favorited; }"
-				@unstashed="(stash) => { favorited = stash.isPrimary ? false : favorited; }"
+				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
+				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
 		</div>
 
@@ -88,8 +88,9 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const { user } = pageContext;
 const pageStash = pageContext.pageProps.stash;
+const currentStash = pageStash || user.primaryStash;
 
-const favorited = ref(props.actor.stashes?.some((sceneStash) => sceneStash.isPrimary) || false);
+const favorited = ref(props.actor.stashes.some((actorStash) => actorStash.id === currentStash.id));
 </script>
 
 <style scoped>
diff --git a/components/movies/tile.vue b/components/movies/tile.vue
index 3324f8b..e074a5b 100644
--- a/components/movies/tile.vue
+++ b/components/movies/tile.vue
@@ -1,7 +1,9 @@
 <template>
 	<div
 		class="movie-tile"
-		:class="{ unstashed: !favorited && pageStash && user && pageStash.id === user.primaryStash?.id }"
+		:class="{
+			unstashed: !favorited && pageStash && user && pageStash.user.id === user.id,
+		}"
 	>
 		<div
 			class="cover-container"
@@ -31,8 +33,8 @@
 				:item="movie"
 				:show-secondary="false"
 				class="light tiled"
-				@stashed="(stash) => { favorited = stash.isPrimary ? true : favorited; }"
-				@unstashed="(stash) => { favorited = stash.isPrimary ? false : favorited; }"
+				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
+				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
 		</div>
 
@@ -118,10 +120,11 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const user = pageContext.user;
 const pageStash = pageContext.pageProps.stash;
+const currentStash = pageStash || user.primaryStash;
 
 const currentYear = new Date().getFullYear();
 
-const favorited = ref(props.movie.stashes.some((sceneStash) => sceneStash.isPrimary));
+const favorited = ref(props.movie.stashes.some((movieStash) => movieStash.id === currentStash.id));
 </script>
 
 <style scoped>
diff --git a/components/scenes/tile.vue b/components/scenes/tile.vue
index 6fc08d6..53c3410 100644
--- a/components/scenes/tile.vue
+++ b/components/scenes/tile.vue
@@ -2,7 +2,7 @@
 	<div
 		class="tile"
 		:class="{
-			unstashed: !favorited && pageStash && user && pageStash.id === user.primaryStash?.id,
+			unstashed: !favorited && pageStash && user && pageStash.user.id === user.id,
 			'is-new': scene.isNew,
 		}"
 	>
@@ -32,8 +32,8 @@
 				:item="scene"
 				:show-secondary="false"
 				class="light tiled"
-				@stashed="(stash) => { favorited = stash.isPrimary ? true : favorited; }"
-				@unstashed="(stash) => { favorited = stash.isPrimary ? false : favorited; }"
+				@stashed="(stash) => { favorited = stash.id === currentStash.id ? true : favorited; }"
+				@unstashed="(stash) => { favorited = stash.id === currentStash.id ? false : favorited; }"
 			/>
 
 			<span
@@ -126,8 +126,9 @@ const props = defineProps({
 const pageContext = inject('pageContext');
 const user = pageContext.user;
 const pageStash = pageContext.pageProps.stash;
+const currentStash = pageStash || user.primaryStash;
 
-const favorited = ref(props.scene.stashes.some((sceneStash) => sceneStash.isPrimary));
+const favorited = ref(props.scene.stashes.some((sceneStash) => sceneStash.id === currentStash.id));
 </script>
 
 <style scoped>
diff --git a/components/stashes/heart.vue b/components/stashes/heart.vue
index 13b4165..e6d26ed 100644
--- a/components/stashes/heart.vue
+++ b/components/stashes/heart.vue
@@ -29,17 +29,17 @@
 		</VDropdown>
 
 		<Icon
-			v-if="itemStashes.some((itemStash) => itemStash.isPrimary)"
-			icon="heart7"
+			v-if="itemStashes.some((itemStash) => itemStash.id === currentStash.id)"
+			:icon="currentStash.isPrimary ? 'heart7' : 'folder-heart'"
 			class="heart favorited noselect"
-			@click.native.stop="unstashItem(user.primaryStash)"
+			@click.native.stop="unstashItem(currentStash)"
 		/>
 
 		<Icon
 			v-else
-			icon="heart8"
+			:icon="currentStash.isPrimary ? 'heart8' : 'folder-heart'"
 			class="heart noselect"
-			@click.native.stop="stashItem(user.primaryStash)"
+			@click.native.stop="stashItem(currentStash)"
 		/>
 	</div>
 </template>
@@ -70,7 +70,8 @@ const props = defineProps({
 
 const emit = defineEmits(['stashed', 'unstashed']);
 
-const { user } = inject('pageContext');
+const { user, pageProps } = inject('pageContext');
+const currentStash = pageProps.stash || user.primaryStash;
 
 const itemStashes = ref(props.item.stashes);