From 2471974d79595179f3d8307adaac6c26a1548af1 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 13 Dec 2023 18:57:43 -0800 Subject: style(Tools): simplify statements --- src/lib/Tools/ActivityHistory.svelte | 4 +--- src/lib/Tools/CharacterBirthdays.svelte | 7 +++---- src/lib/Tools/SequelSpy.svelte | 12 +++++------- src/lib/Tools/Wrapped.svelte | 32 +++++++++----------------------- src/lib/Tools/tool.ts | 3 +-- 5 files changed, 19 insertions(+), 39 deletions(-) (limited to 'src/lib/Tools') diff --git a/src/lib/Tools/ActivityHistory.svelte b/src/lib/Tools/ActivityHistory.svelte index e946a116..122a7513 100644 --- a/src/lib/Tools/ActivityHistory.svelte +++ b/src/lib/Tools/ActivityHistory.svelte @@ -21,9 +21,7 @@ clearAllParameters(); if (user !== undefined) { - if ($userIdentity === '') { - userIdentity.set(JSON.stringify(await getUserIdentity(user))); - } + if ($userIdentity === '') userIdentity.set(JSON.stringify(await getUserIdentity(user))); currentUserIdentity = JSON.parse($userIdentity); currentUserIdentity.name = currentUserIdentity.name; diff --git a/src/lib/Tools/CharacterBirthdays.svelte b/src/lib/Tools/CharacterBirthdays.svelte index 033b7c0a..048a6078 100644 --- a/src/lib/Tools/CharacterBirthdays.svelte +++ b/src/lib/Tools/CharacterBirthdays.svelte @@ -52,22 +52,21 @@ for (const entry of aniSearch.map((entry) => ({ ...entry, normalized_name: normalizeName(entry.name) - }))) { + }))) nameMap.set(entry.normalized_name, { name: entry.name, image: entry.image }); - } for (const entry of acdb) { const normalized_name = normalizeName(entry.name); - if (!nameMap.has(normalized_name)) { + + if (!nameMap.has(normalized_name)) nameMap.set(normalized_name, { name: entry.name, image: entry.character_image, origin: entry.origin }); - } } return Array.from(nameMap.values()); diff --git a/src/lib/Tools/SequelSpy.svelte b/src/lib/Tools/SequelSpy.svelte index 1d1fca69..441585a4 100644 --- a/src/lib/Tools/SequelSpy.svelte +++ b/src/lib/Tools/SequelSpy.svelte @@ -10,17 +10,15 @@ let currentPrequels: Promise = Promise.resolve([]) as Promise; let year = new Date().getFullYear(); let season = (() => { - if (new Date().getMonth() >= 0 && new Date().getMonth() <= 2) { + if (new Date().getMonth() >= 0 && new Date().getMonth() <= 2) return 'WINTER' as 'WINTER' | 'SPRING' | 'SUMMER' | 'FALL'; - } else if (new Date().getMonth() >= 3 && new Date().getMonth() <= 5) { + else if (new Date().getMonth() >= 3 && new Date().getMonth() <= 5) return 'SPRING' as 'WINTER' | 'SPRING' | 'SUMMER' | 'FALL'; - } else if (new Date().getMonth() >= 6 && new Date().getMonth() <= 8) { + else if (new Date().getMonth() >= 6 && new Date().getMonth() <= 8) return 'SUMMER' as 'WINTER' | 'SPRING' | 'SUMMER' | 'FALL'; - } else if (new Date().getMonth() >= 9 && new Date().getMonth() <= 11) { + else if (new Date().getMonth() >= 9 && new Date().getMonth() <= 11) return 'FALL' as 'WINTER' | 'SPRING' | 'SUMMER' | 'FALL'; - } else { - return 'WINTER' as 'WINTER' | 'SPRING' | 'SUMMER' | 'FALL'; - } + else return 'WINTER' as 'WINTER' | 'SPRING' | 'SUMMER' | 'FALL'; })(); $: currentPrequels = prequels(user, year, season); diff --git a/src/lib/Tools/Wrapped.svelte b/src/lib/Tools/Wrapped.svelte index eb04051f..9ee776f9 100644 --- a/src/lib/Tools/Wrapped.svelte +++ b/src/lib/Tools/Wrapped.svelte @@ -131,15 +131,11 @@ } if (user !== undefined) { - if ($userIdentity === '') { - userIdentity.set(JSON.stringify(await getUserIdentity(user))); - } + if ($userIdentity === '') userIdentity.set(JSON.stringify(await getUserIdentity(user))); currentUserIdentity = JSON.parse($userIdentity); currentUserIdentity.name = currentUserIdentity.name; - } else { - currentUserIdentity.id = -2; - } + } else currentUserIdentity.id = -2; await update(); @@ -169,13 +165,9 @@ item.mediaListEntry?.completedAt.year === currentYear) ) .sort((a, b) => { - if (a.mediaListEntry?.score === undefined) { - return 1; - } else if (b.mediaListEntry?.score === undefined) { - return -1; - } else { - return b.mediaListEntry?.score - a.mediaListEntry?.score; - } + if (a.mediaListEntry?.score === undefined) return 1; + else if (b.mediaListEntry?.score === undefined) return -1; + else return b.mediaListEntry?.score - a.mediaListEntry?.score; }); mangaList = ( await mediaListCollection( @@ -196,13 +188,9 @@ item.mediaListEntry?.completedAt.year === currentYear) ) .sort((a, b) => { - if (a.mediaListEntry?.score === undefined) { - return 1; - } else if (b.mediaListEntry?.score === undefined) { - return -1; - } else { - return b.mediaListEntry?.score - a.mediaListEntry?.score; - } + if (a.mediaListEntry?.score === undefined) return 1; + else if (b.mediaListEntry?.score === undefined) return -1; + else return b.mediaListEntry?.score - a.mediaListEntry?.score; }); episodes = 0; @@ -214,9 +202,7 @@ minutesWatched += (media.mediaListEntry?.progress || 0) * media.duration || 0; } - for (const media of mangaList) { - chapters += media.mediaListEntry?.progress || 0; - } + for (const media of mangaList) chapters += media.mediaListEntry?.progress || 0; }; /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/src/lib/Tools/tool.ts b/src/lib/Tools/tool.ts index 2d1a13f5..77d80418 100644 --- a/src/lib/Tools/tool.ts +++ b/src/lib/Tools/tool.ts @@ -2,7 +2,7 @@ import { browser } from '$app/environment'; import { page } from '$app/stores'; export const clearAllParameters = (saved: string[] = []) => { - if (browser) { + if (browser) page.subscribe((value) => { value.url.searchParams.forEach((_, key) => { if (!saved.includes(key) && key !== 'tool') { @@ -11,5 +11,4 @@ export const clearAllParameters = (saved: string[] = []) => { }); history.replaceState(null, '', `?${value.url.searchParams.toString()}`); }); - } }; -- cgit v1.2.3