Improve fallbacks when item data does not exist for a language (#164)

Universalis-FFXIV · Oct 7, 2024 · 29232bb · 29232bb
1 parent 60d22d2
commit 29232bb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/data/game/index.ts b/data/game/index.ts
@@ -128,11 +128,34 @@ export function getItemKind(id: number, lang: Language): ItemKind | undefined {
   return (itemKinds[lang] ?? itemKinds['en'])[id];
 }
 
-export function getItem(id: number, lang: Language): Item | undefined {
-  return (items[lang] ?? items['en'])[id];
+export function getItem(id: number, lang: Language): Item {
+  const itemLang = getItemCore(id, lang);
+  if (itemLang) {
+    return itemLang;
+  }
+
+  console.warn(`Missing data for item ${id} in language ${lang}, falling back to English`);
+
+  const itemEn = getItemCore(id, 'en');
+  if (itemEn) {
+    return itemEn;
+  }
+
+  console.warn(`Missing data for item ${id} in English, falling back to placeholder data`);
+
+  return getFallbackItem(id);
+}
+
+function getItemCore(id: number, lang: Language): Item | undefined {
+  const langItems = items[lang];
+  if (!langItems) {
+    return undefined;
+  }
+
+  return langItems[id];
 }
 
-export function getFallbackItem(id: number): Item {
+function getFallbackItem(id: number): Item {
   return {
     id: id,
     name: 'Failed to retrieve',

diff --git a/pages/account/alerts.tsx b/pages/account/alerts.tsx
@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 import { useSWRConfig } from 'swr';
 import AccountLayout from '../../components/AccountLayout/AccountLayout';
 import GameIcon from '../../components/GameIcon/GameIcon';
-import { getFallbackItem, getItem, getItemKind, getItemSearchCategory } from '../../data/game';
+import { getItem, getItemKind, getItemSearchCategory } from '../../data/game';
 import useAlerts from '../../hooks/useAlerts';
 import useSettings from '../../hooks/useSettings';
 import useWorlds from '../../hooks/useWorlds';
@@ -224,7 +224,7 @@ const Alerts: NextPage = () => {
           </h1>
           <div className="account-panel">
             {[...alertGroups.entries()].map(([itemId, alertGroup]) => {
-              const item = getItem(itemId, lang) ?? getFallbackItem(itemId);
+              const item = getItem(itemId, lang);
               return (
                 <div key={itemId}>
                   <div className={styles.alertPanel}>

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -14,17 +14,14 @@ import { UserList } from '../types/universalis/user';
 import HomeUserList from '../components/Home/HomeUserList/HomeUserList';
 import { useState } from 'react';
 import { Trans } from '@lingui/macro';
-import { getFallbackItem, getItem } from '../data/game';
+import { getItem } from '../data/game';
 import useSettings from '../hooks/useSettings';
-import { getServers } from '../service/servers';
 import { TaxRates } from '../types/universalis/TaxRates';
 import HomeLeastRecentlyUpdated from '../components/Home/HomeLeastRecentlyUpdated/HomeLeastRecentlyUpdated';
 import { FETCH_OPTIONS, getBaseUrl } from '../service/universalis';
 import useSWR from 'swr';
-import useSWRImmutable from 'swr/immutable';
 import { useSession } from 'next-auth/react';
 import useDataCenters from '../hooks/useDataCenters';
-import ErrorBoundary from '../components/ErrorBoundary/ErrorBoundary';
 import HomeGuides from '../components/Home/HomeGuides/HomeGuides';
 
 function sum(arr: number[], start: number, end: number) {
@@ -187,9 +184,7 @@ const Home: NextPage = () => {
           <h4>
             <Trans>Recent Updates</Trans>
           </h4>
-          <RecentUpdatesPanel
-            items={(recent ?? []).map((itemId) => getItem(itemId, lang) ?? getFallbackItem(itemId))}
-          />
+          <RecentUpdatesPanel items={(recent ?? []).map((itemId) => getItem(itemId, lang))} />
           <TaxRatesPanel data={taxes ?? zeroTaxRates()} world={world} />
           <WorldUploadCountsPanel data={worldUploads ?? []} world={world} />
           <UploadCountPanel