refactor: Update data retrieval and caching in Genshin changelog pages

dvaJi · Sep 5, 2024 · eb03355 · eb03355
1 parent 16fa1ff
commit eb03355
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/app/[lang]/(genshin)/changelog/[version]/page.tsx b/app/[lang]/(genshin)/changelog/[version]/page.tsx
@@ -14,7 +14,6 @@ import type {
 } from "@interfaces/genshin";
 import { AD_ARTICLE_SLOT } from "@lib/constants";
 import { getGenshinData } from "@lib/dataApi";
-import { getRemoteData } from "@lib/localData";
 import { getAllMaterialsMap } from "@utils/materials";
 
 import ChangelogVersion from "../view";
@@ -82,9 +81,19 @@ export default async function GenshinBannerWeapons({ params }: Props) {
     "genshin",
     "changelog"
   );
-  const changelog = await getRemoteData<Changelog[]>("genshin", "changelog");
+  const changelog = await getGenshinData<Changelog[]>({
+    resource: "changelog",
+    language: langData,
+    select: ["version"],
+  });
 
-  const cl = changelog.find((c) => c.version === params.version);
+  const cl = await getGenshinData<Changelog>({
+    resource: "changelog",
+    language: langData,
+    filter: {
+      id: params.version,
+    },
+  });
 
   if (!cl) {
     return notFound();

diff --git a/app/[lang]/(genshin)/changelog/page.tsx b/app/[lang]/(genshin)/changelog/page.tsx
@@ -14,7 +14,6 @@ import type {
 } from "@interfaces/genshin";
 import { AD_ARTICLE_SLOT } from "@lib/constants";
 import { getGenshinData } from "@lib/dataApi";
-import { getRemoteData } from "@lib/localData";
 import { getAllMaterialsMap } from "@utils/materials";
 
 import ChangelogVersion from "./view";
@@ -112,8 +111,12 @@ export default async function GenshinBannerWeapons({ params }: Props) {
   });
 
   const changelog = (
-    await getRemoteData<Changelog[]>("genshin", "changelog")
-  ).filter((c) => !c.beta);
+    await getGenshinData<Changelog[]>({
+      resource: "changelog",
+      language: langData,
+      revalidate: 0,
+    })
+  ).sort((a, b) => (b.version > a.version ? -1 : 1));
 
   const materialsMap = await getAllMaterialsMap(langData);
 
@@ -123,7 +126,8 @@ export default async function GenshinBannerWeapons({ params }: Props) {
   const foodMap: any = {};
   const tcgMap: any = {};
 
-  const cl = changelog[changelog.length - 1];
+  const cl =
+    changelog.find((c) => c.current) ?? changelog[changelog.length - 1];
 
   const item = cl.items;
   item.avatar?.forEach((a: string) => {

diff --git a/next-env.d.ts b/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.