Merge pull request #113 from storyprotocol/soyoung/ip-metadata-from-ipfs

fix: merge `ipMetadata` with ipfs data
storyprotocol · Jan 19, 2025 · f533a3f · f533a3f
2 parents e993b51 + 5ca50af
commit f533a3f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/packages/storykit/package.json b/packages/storykit/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@storyprotocol/storykit",
   "author": "storyprotocol engineering <[email protected]>",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "type": "module",
   "exports": {
     ".": {

diff --git a/packages/storykit/src/lib/api.ts b/packages/storykit/src/lib/api.ts
@@ -61,3 +61,9 @@ export async function listResource<T>(
     console.error(error)
   }
 }
+
+export async function getMetadataFromIpfs(ipfsUrl: string) {
+  const metadata = await fetch(ipfsUrl).then((res) => res.json())
+  console.log("@@ metadata", metadata)
+  return metadata
+}
diff --git a/packages/storykit/src/providers/IpProvider/IpProvider.tsx b/packages/storykit/src/providers/IpProvider/IpProvider.tsx
@@ -6,7 +6,7 @@ import { useInfiniteQuery, useQuery } from "@tanstack/react-query"
 import React from "react"
 import { Address, Hash } from "viem"
 
-import { getResource, listResource } from "../../lib/api"
+import { getMetadataFromIpfs, getResource, listResource } from "../../lib/api"
 import { getNFTByTokenId } from "../../lib/simplehash"
 import { RESOURCE_TYPE } from "../../types/api"
 import {
@@ -111,12 +111,24 @@ export const IpProvider = ({
   })
 
   // Fetch IP metadata
-  const { isLoading: isIpaMetadataLoading, data: ipaMetadata } = useQuery({
+  const { isLoading: isIpaMetadataLoading, data: ipaMetadataRaw } = useQuery({
     queryKey: [RESOURCE_TYPE.ASSET, `${ipId}/metadata`],
     queryFn: () => getResource(RESOURCE_TYPE.ASSET, `${ipId}/metadata`, chain.name as STORYKIT_SUPPORTED_CHAIN),
     enabled: queryOptions.ipaMetadata,
   })
 
+  // Fetch IP Metadata from IPFS
+  const { isLoading: isLoadingFromIpfs, data: metadaFromIpfs } = useQuery({
+    queryKey: ["getMetadataFromIpfs", ipId, ipaMetadataRaw?.metadataUri ?? ""],
+    queryFn: () => getMetadataFromIpfs(ipaMetadataRaw?.metadataUri ?? ""),
+    enabled: queryOptions.ipaMetadata && ipaMetadataRaw != null,
+  })
+
+  const ipaMetadata = {
+    ...ipaMetadataRaw,
+    metadataJson: metadaFromIpfs,
+  }
+
   const fetchParentEdgeOptions = {
     pagination: {
       limit: 500,
@@ -346,7 +358,7 @@ export const IpProvider = ({
         loadMoreAssetChildren,
         isAssetChildrenDataLoading,
         ipaMetadata,
-        isIpaMetadataLoading,
+        isIpaMetadataLoading: isIpaMetadataLoading || isLoadingFromIpfs,
         ipLicenseData: ipLicenseData?.data,
         isipLicenseDataLoading,
         licenseTermsData,