Merge branch 'main' of https://github.com/rmrk-team/rmrk-js

rmrk-team · Apr 22, 2024 · cefaf95 · cefaf95
2 parents f52a1a5 + d7bf850
commit cefaf95
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/packages/ipfs-utils/src/lib/fetch-ipfs-metadata.ts b/packages/ipfs-utils/src/lib/fetch-ipfs-metadata.ts
@@ -10,14 +10,19 @@ import { isBase64Metadata } from './is-base-64-metadata.js';
 
 type Options = {
   shouldSanitizeIpfsUrls?: boolean;
-  ipfsGatewayUrl?: string
+  ipfsGatewayUrl?: string;
 };
 
 export const fetchIpfsMetadata = async (
   metadataUri?: string | null,
-  options?: Options
+  options?: Options,
 ): Promise<Metadata | null> => {
-  const { shouldSanitizeIpfsUrls = true, ipfsGatewayUrl = DEFAULT_IPFS_GATEWAY_URLS[DEFAULT_IPFS_GATEWAY_KEYS.pinata] } = options || {};
+  const {
+    shouldSanitizeIpfsUrls = true,
+    ipfsGatewayUrl = DEFAULT_IPFS_GATEWAY_URLS[
+      DEFAULT_IPFS_GATEWAY_KEYS.pinata
+    ],
+  } = options || {};
   if (metadataUri && isBase64Metadata(metadataUri)) {
     return JSON.parse(getBase64Value(metadataUri)); // TODO: validation
   }
@@ -35,8 +40,12 @@ export const fetchIpfsMetadata = async (
       if (provider) {
         return {
           ...restMetadata,
-          mediaUri: shouldSanitizeIpfsUrls ? sanitizeIpfsUrl((metadata as Metadata)?.mediaUri || '', provider) : (metadata as Metadata)?.mediaUri,
-          thumbnailUri: shouldSanitizeIpfsUrls ? sanitizeIpfsUrl(thumbnail || '', provider) : thumbnail,
+          mediaUri: shouldSanitizeIpfsUrls
+            ? sanitizeIpfsUrl((metadata as Metadata)?.mediaUri || '', provider)
+            : (metadata as Metadata)?.mediaUri,
+          thumbnailUri: shouldSanitizeIpfsUrls
+            ? sanitizeIpfsUrl(thumbnail || '', provider)
+            : thumbnail,
           externalUri: (metadata as Metadata).externalUri || external_url,
         };
       }

diff --git a/packages/rmrk-hooks/src/lib/hooks/use-fetch-ipfs-metadata.ts b/packages/rmrk-hooks/src/lib/hooks/use-fetch-ipfs-metadata.ts
@@ -8,7 +8,7 @@ import { useRMRKConfig } from '../RMRKContextProvider.js';
 
 type Props = { metadataUri: string | undefined; ipfsGatewayUrl?: string };
 
-type Options = { enabled?: boolean, shouldSanitizeIpfsUrls?: boolean; };
+type Options = { enabled?: boolean; shouldSanitizeIpfsUrls?: boolean };
 
 /**
  * Fetches IPFS metadata and returns the result using React Query's `useQuery` hook.
@@ -28,15 +28,13 @@ export const useFetchIpfsMetadata = (
   return useQuery({
     queryKey: ['fetchIpfsMetadata', metadataUri],
     queryFn: () => {
-      return fetchIpfsMetadata(
-        metadataUri,
-          {
-            ipfsGatewayUrl: ipfsGatewayUrl ||
-                rmrkConfig?.ipfsGateway ||
-                DEFAULT_IPFS_GATEWAY_URLS[DEFAULT_IPFS_GATEWAY_KEYS.cloudflare],
-            shouldSanitizeIpfsUrls
-          }
-      );
+      return fetchIpfsMetadata(metadataUri, {
+        ipfsGatewayUrl:
+          ipfsGatewayUrl ||
+          rmrkConfig?.ipfsGateway ||
+          DEFAULT_IPFS_GATEWAY_URLS[DEFAULT_IPFS_GATEWAY_KEYS.cloudflare],
+        shouldSanitizeIpfsUrls,
+      });
     },
     enabled,
   });

diff --git a/packages/rmrk-hooks/src/lib/hooks/use-fetch-ipfs-metadatas.ts b/packages/rmrk-hooks/src/lib/hooks/use-fetch-ipfs-metadatas.ts
@@ -12,7 +12,7 @@ type Props = {
   ipfsGatewayUrl?: string;
 };
 
-type Options = { enabled?: boolean, shouldSanitizeIpfsUrls?: boolean; };
+type Options = { enabled?: boolean; shouldSanitizeIpfsUrls?: boolean };
 
 /**
  * A custom hook that fetches IPFS metadata for the given URIs.
@@ -38,15 +38,13 @@ export const useFetchIpfsMetadatas = (
     queries: (metadataUris || []).map((metadataUri) => ({
       queryKey: ['fetchIpfsMetadata', metadataUri],
       queryFn: () =>
-        fetchIpfsMetadata(
-          metadataUri,
-            {
-              ipfsGatewayUrl: ipfsGatewayUrl ||
-                  rmrkConfig?.ipfsGateway ||
-                  DEFAULT_IPFS_GATEWAY_URLS[DEFAULT_IPFS_GATEWAY_KEYS.cloudflare],
-              shouldSanitizeIpfsUrls
-            }
-        ),
+        fetchIpfsMetadata(metadataUri, {
+          ipfsGatewayUrl:
+            ipfsGatewayUrl ||
+            rmrkConfig?.ipfsGateway ||
+            DEFAULT_IPFS_GATEWAY_URLS[DEFAULT_IPFS_GATEWAY_KEYS.cloudflare],
+          shouldSanitizeIpfsUrls,
+        }),
       enabled,
     })),
   });