Merge branch 'main' into parallel-tests

kodadot · Sep 27, 2022 · c982015 · c982015
2 parents 76641bb + 01126c5
commit c982015
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/components/rmrk/utils.ts b/components/rmrk/utils.ts
@@ -150,7 +150,7 @@ export const getSanitizer = (
  ipfsProvider?: ProviderKeyType,
  arProvider?: ArweaveProviders
 ): SanitizerFunc => {
- if (isIpfsUrl(url)) {
+ if (url && (isIpfsUrl(url) || url.includes('https://gateway.pinata.cloud'))) {
  return (link) => sanitizeIpfsUrl(link, ipfsProvider)
  }
 
@@ -176,6 +176,13 @@ export const sanitizeIpfsUrl = (
  ipfsUrl: string,
  provider?: ProviderKeyType
 ): string => {
+ if (ipfsUrl.includes('https://gateway.pinata.cloud')) {
+ return ipfsUrl.replace(
+ 'https://gateway.pinata.cloud/',
+ resolveProvider(provider)
+ )
+ }
+
  if (isIpfsCid(ipfsUrl)) {
  return sanitizeIpfsCid(ipfsUrl, provider)
  }

diff --git a/components/shared/view/BasicImage.vue b/components/shared/view/BasicImage.vue
@@ -34,7 +34,7 @@ const placeholder = computed(() => {
 })
 
 function onImageError(ev: Event, src: string) {
- $consola.log('[BasicImage] to load:', src, ev)
+ $consola.error('[BasicImage] to load:', src, ev)
 }
 </script>
 

diff --git a/utils/cachingStrategy.ts b/utils/cachingStrategy.ts
@@ -49,7 +49,7 @@ export const cacheOrFetchMetadata = async <T>(
 
  try {
  const meta = await fetchMetadata<T>({ metadata })
- update(metadata, () => meta) // DEV: think how does it behave in
+ metadata && update(metadata, () => meta) // DEV: think how does it behave in
  return meta
  } catch (e) {
  console.warn('[ERR] unable to get metadata', e)
@@ -64,17 +64,18 @@ export const getSingleCloudflareImage = async (
 }
 
 export const processSingleMetadata = async <T>(metadata: string): P<T> => {
- const meta = await get(metadata)
+ const meta = metadata ? await get(metadata) : undefined
  return cacheOrFetchMetadata(meta, metadata)
 }
 
 export const processMetadata = async <T>(
  metadataList: string[],
  cb?: (meta: T, index: number) => void
 ): P<void> => {
- const storedMetadata = await getMany<T>(metadataList)
+ const metadata = metadataList.map((meta) => meta || '')
+ const storedMetadata = await getMany<T>(metadata)
  storedMetadata.forEach(async (m, i) => {
- const meta = await cacheOrFetchMetadata(m, metadataList[i])
+ const meta = await cacheOrFetchMetadata(m, metadata[i])
  if (cb) {
  cb(meta, i)
  }