From e80a83cf87eb79be4c2ac016d3c97709d41ee353 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Wed, 24 Jan 2024 20:43:41 -0800
Subject: feat(identity): use global store

---
 src/lib/Tools/ActivityHistory/Grid.svelte | 20 +++---------------
 src/lib/Tools/ActivityHistory/Tool.svelte | 20 +++---------------
 src/lib/Tools/Wrapped/Tool.svelte         | 34 +++++++++----------------------
 src/lib/Tools/Wrapped/Top/Activity.svelte |  9 ++++----
 4 files changed, 20 insertions(+), 63 deletions(-)

(limited to 'src/lib/Tools')

diff --git a/src/lib/Tools/ActivityHistory/Grid.svelte b/src/lib/Tools/ActivityHistory/Grid.svelte
index 560ed50b..7f75c104 100644
--- a/src/lib/Tools/ActivityHistory/Grid.svelte
+++ b/src/lib/Tools/ActivityHistory/Grid.svelte
@@ -5,11 +5,8 @@
 		activityHistory
 	} from '$lib/AniList/activity';
 	import { onMount } from 'svelte';
-	import userIdentity from '$stores/userIdentity';
-	import {
-		userIdentity as getUserIdentity,
-		type AniListAuthorisation
-	} from '$lib/AniList/identity';
+	import userIdentity from '$stores/identity';
+	import type { AniListAuthorisation } from '$lib/AniList/identity';
 	import { clearAllParameters } from '../../Utility/parameters';
 
 	export let user: AniListAuthorisation;
@@ -17,23 +14,12 @@
 	export let currentYear = new Date().getFullYear();
 
 	let activityHistoryData: ActivityHistoryEntry[];
-	let currentUserIdentity = {
-		name: '',
-		id: -1,
-		avatar: 'https://s4.anilist.co/file/anilistcdn/user/avatar/large/default.png'
-	};
 	let baseHue = Math.floor(Math.random() * 360);
 
 	onMount(async () => {
 		clearAllParameters();
 
-		if (user !== undefined) {
-			if ($userIdentity === '') userIdentity.set(JSON.stringify(await getUserIdentity(user)));
-
-			currentUserIdentity = JSON.parse($userIdentity);
-			currentUserIdentity.name = currentUserIdentity.name;
-			activityHistoryData = activityData || (await activityHistory(currentUserIdentity));
-		}
+		activityHistoryData = activityData || (await activityHistory($userIdentity));
 	});
 
 	const gradientColour = (amount: number, maxAmount: number, baseHue: number) => {
diff --git a/src/lib/Tools/ActivityHistory/Tool.svelte b/src/lib/Tools/ActivityHistory/Tool.svelte
index 51f2ac82..6728f9c6 100644
--- a/src/lib/Tools/ActivityHistory/Tool.svelte
+++ b/src/lib/Tools/ActivityHistory/Tool.svelte
@@ -5,11 +5,8 @@
 		type ActivityHistoryEntry
 	} from '$lib/AniList/activity';
 	import { onMount } from 'svelte';
-	import userIdentity from '$stores/userIdentity';
-	import {
-		userIdentity as getUserIdentity,
-		type AniListAuthorisation
-	} from '$lib/AniList/identity';
+	import userIdentity from '$stores/identity';
+	import type { AniListAuthorisation } from '$lib/AniList/identity';
 	import { clearAllParameters } from '../../Utility/parameters';
 	import { domToBlob } from 'modern-screenshot';
 	import ActivityHistoryGrid from './Grid.svelte';
@@ -18,23 +15,12 @@
 	export let user: AniListAuthorisation;
 
 	let activityHistoryData: Promise<ActivityHistoryEntry[]>;
-	let currentUserIdentity = {
-		name: '',
-		id: -1,
-		avatar: 'https://s4.anilist.co/file/anilistcdn/user/avatar/large/default.png'
-	};
 	let generated = false;
 
 	onMount(async () => {
 		clearAllParameters();
 
-		if (user !== undefined) {
-			if ($userIdentity === '') userIdentity.set(JSON.stringify(await getUserIdentity(user)));
-
-			currentUserIdentity = JSON.parse($userIdentity);
-			currentUserIdentity.name = currentUserIdentity.name;
-			activityHistoryData = activityHistory(currentUserIdentity);
-		}
+		if (user !== undefined) activityHistoryData = activityHistory($userIdentity);
 	});
 
 	// const incrementDate = (date: Date): Date => {
diff --git a/src/lib/Tools/Wrapped/Tool.svelte b/src/lib/Tools/Wrapped/Tool.svelte
index b2f715cb..0a88fe3d 100644
--- a/src/lib/Tools/Wrapped/Tool.svelte
+++ b/src/lib/Tools/Wrapped/Tool.svelte
@@ -1,9 +1,6 @@
 <script lang="ts">
-	import userIdentity from '$stores/userIdentity';
-	import {
-		userIdentity as getUserIdentity,
-		type AniListAuthorisation
-	} from '$lib/AniList/identity';
+	import userIdentity from '$stores/identity';
+	import type { AniListAuthorisation } from '$lib/AniList/identity';
 	import { onMount } from 'svelte';
 	import { tops, wrapped, type TopMedia, SortOptions } from '$lib/AniList/wrapped';
 	import {
@@ -35,11 +32,6 @@
 
 	const currentYear = new Date(Date.now()).getFullYear();
 	let selectedYear = new Date(Date.now()).getFullYear();
-	let currentUserIdentity = {
-		name: '',
-		id: -1,
-		avatar: 'https://s4.anilist.co/file/anilistcdn/user/avatar/large/default.png'
-	};
 	let episodes = 0;
 	let chapters = 0;
 	let minutesWatched = 0;
@@ -274,22 +266,17 @@
 			includeOVAs = $page.url.searchParams.get('includeOVAs') === 'true';
 		}
 
-		if (user !== undefined) {
-			if ($userIdentity === '') userIdentity.set(JSON.stringify(await getUserIdentity(user)));
-
-			currentUserIdentity = JSON.parse($userIdentity);
-			currentUserIdentity.name = currentUserIdentity.name;
-		} else currentUserIdentity.id = -2;
+		if (user === undefined) $userIdentity.id = -2;
 
 		await update().then(() => (mounted = true));
 	});
 
 	const update = async () => {
-		if (currentUserIdentity.id === -1) return;
+		if ($userIdentity.id === -1) return;
 
 		let rawAnimeList = await mediaListCollection(
 			user,
-			currentUserIdentity,
+			$userIdentity,
 			Type.Anime,
 			$anime,
 			$lastPruneTimes.anime,
@@ -386,7 +373,7 @@
 
 		let rawMangaList = await mediaListCollection(
 			user,
-			currentUserIdentity,
+			$userIdentity,
 			Type.Manga,
 			$manga,
 			$lastPruneTimes.manga,
@@ -577,15 +564,15 @@
 	// };
 </script>
 
-{#if currentUserIdentity.id === -2}
+{#if $userIdentity.id === -2}
 	<div class="card">Please log in to view this page.</div>
-{:else if currentUserIdentity.id !== -1}
-	{#await selectedYear !== currentYear || useFullActivityHistory || new Date().getMonth() <= 6 ? fullActivityHistory(user, currentUserIdentity, selectedYear) : getActivityHistory(currentUserIdentity)}
+{:else if $userIdentity.id !== -1}
+	{#await selectedYear !== currentYear || useFullActivityHistory || new Date().getMonth() <= 6 ? fullActivityHistory(user, $userIdentity, selectedYear) : getActivityHistory($userIdentity)}
 		<Loading>
 			{@html nbsp(`Loading${useFullActivityHistory ? ' full-year' : ''} activity history ...`)}
 		</Loading>
 	{:then activities}
-		{#await wrapped(user, currentUserIdentity, selectedYear)}
+		{#await wrapped(user, $userIdentity, selectedYear)}
 			<Loading>
 				{@html nbsp('Loading user data ...')}
 			</Loading>
@@ -604,7 +591,6 @@
 						<div class="categories-grid" style="padding-bottom: 0;">
 							<Activity
 								{wrapped}
-								identity={currentUserIdentity}
 								year={selectedYear}
 								{activities}
 								{useFullActivityHistory}
diff --git a/src/lib/Tools/Wrapped/Top/Activity.svelte b/src/lib/Tools/Wrapped/Top/Activity.svelte
index a000389c..dab431c3 100644
--- a/src/lib/Tools/Wrapped/Top/Activity.svelte
+++ b/src/lib/Tools/Wrapped/Top/Activity.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
 	import type { ActivityHistoryEntry } from '$lib/AniList/activity';
-	import type { UserIdentity } from '$lib/AniList/identity';
+	import identity from '$stores/identity';
 	import type { Wrapped } from '$lib/AniList/wrapped';
 	import proxy from '$lib/Utility/proxy';
 
 	export let wrapped: Wrapped;
-	export let identity: UserIdentity;
 	export let year: number;
 	export let activities: ActivityHistoryEntry[];
 	export let useFullActivityHistory: boolean;
@@ -15,14 +14,14 @@
 </script>
 
 <div class="grid-item image-grid avatar-grid category top-category">
-	<a href={`https://anilist.co/user/${identity.name}`} target="_blank">
+	<a href={`https://anilist.co/user/${$identity.name}`} target="_blank">
 		<img src={proxy(wrapped.avatar.large)} alt="User Avatar" on:load={updateWidth} />
 	</a>
 	<div>
 		<div>
-			<a href={`https://anilist.co/user/${identity.name}`} target="_blank">
+			<a href={`https://anilist.co/user/${$identity.name}`} target="_blank">
 				<b>
-					{identity.name}
+					{$identity.name}
 				</b>
 			</a>
 		</div>
-- 
cgit v1.2.3