From 6b1bc162108694151e8d82450a43c1e35f826adb Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 27 Mar 2024 22:07:28 -0700 Subject: fix(birthdays): properly fix names --- src/lib/Tools/Birthdays.svelte | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Tools/Birthdays.svelte b/src/lib/Tools/Birthdays.svelte index 462b660a..e75769cb 100644 --- a/src/lib/Tools/Birthdays.svelte +++ b/src/lib/Tools/Birthdays.svelte @@ -43,7 +43,7 @@ onMount(() => clearAllParameters(['month', 'day'])); - const normalizeName = (name: string): string => name.toLowerCase().split(' ').sort().join(' '); + const normaliseName = (name: string): string => name.toLowerCase().split(' ').sort().join(' '); const fixName = (name: string): string => { const split = name.split(' '); @@ -54,6 +54,10 @@ return split.join(' '); } + const bracketIndex = name.indexOf('['); + + if (bracketIndex !== -1) return name.slice(0, bracketIndex).trim(); + return name; }; @@ -65,18 +69,20 @@ for (const entry of aniSearch.map((entry) => ({ ...entry, - normalized_name: normalizeName(entry.name) - }))) - nameMap.set(entry.normalized_name, { - name: fixName(entry.name), - image: entry.image - }); + normalisedName: normaliseName(fixName(entry.name)) + }))) { + if (!nameMap.has(entry.normalisedName)) + nameMap.set(entry.normalisedName, { + name: fixName(entry.name), + image: entry.image + }); + } for (const entry of acdb) { - const normalized_name = normalizeName(entry.name); + const normalisedName = normaliseName(fixName(entry.name)); - if (!nameMap.has(normalized_name)) - nameMap.set(normalized_name, { + if (!nameMap.has(normalisedName)) + nameMap.set(normalisedName, { name: entry.name, image: entry.character_image, origin: entry.origin -- cgit v1.2.3