feat(identity): use global store

2 files changed, 6 insertions, 34 deletions

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 => {