Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/mask/src/plugins/Collectible/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export const OpenSeaTestnetURL = 'https://testnets.opensea.io'

export const RaribleURL = 'https://api.rarible.com/'
export const RaribleChainURL = 'https://ethereum-api.rarible.org/'
export const RaribleIPFSURL = 'https://ipfs.rarible.com/ipfs/'
export const RaribleUserURL = 'https://rarible.com/user/'
export const RaribleRopstenUserURL = 'https://ropsten.rarible.com/user/'
export const RaribleRinkebyUserURL = 'https://rinkeby.rarible.com/user/'
Expand Down
4 changes: 3 additions & 1 deletion packages/mask/src/plugins/Pets/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { mediaViewerUrl } from '@masknet/shared'
import urlcat from 'urlcat'
import { ImageType } from './types'
import { resolveIPFSLink } from '@masknet/web3-shared-evm'

export const PetsPluginID = 'com.maskbook.pets'
export const TWITTER = 'twitter.com'
Expand Down Expand Up @@ -30,7 +31,8 @@ export const Punk3D = {
contract: '0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb',
tokenId: '6128',
url: urlcat(mediaViewerUrl, {
url: 'https://gateway.pinata.cloud/ipfs/QmZjfo1zKTfQZjqs4CaZJ7pQDZHrUBaozre8Z71c7ZXGMc',
/* cspell:disable-next-line */
url: resolveIPFSLink('QmZjfo1zKTfQZjqs4CaZJ7pQDZHrUBaozre8Z71c7ZXGMc'),
type: 'model/gltf-binary',
}),
}
Expand Down
4 changes: 2 additions & 2 deletions packages/mask/src/plugins/Pets/hooks/useNfts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import {
isSameAddress,
ERC721ContractDetailed,
SocketState,
resolveIPFSLink,
} from '@masknet/web3-shared-evm'
import { Constant, transform } from '@masknet/web3-shared-evm/constants/utils'
import { cloneDeep, findLastIndex } from 'lodash-unified'
import { delay } from '@masknet/shared-base'
import type { User, FilterContract } from '../types'
import { Punk3D } from '../constants'
import { RaribleIPFSURL } from '../../Collectible/constants'

function useInitNFTs(config: Record<string, Constant> | undefined) {
return useMemo(() => {
Expand Down Expand Up @@ -49,7 +49,7 @@ export function useNFTs(user: User | undefined, configNFTs: Record<string, Const
}
const glbSupport = NFT.info.mediaUrl?.endsWith('.glb') || isPunk
if (NFT.info.mediaUrl?.includes('ipfs://')) {
NFT.info.mediaUrl = NFT.info.mediaUrl.replace('ipfs://', RaribleIPFSURL)
NFT.info.mediaUrl = resolveIPFSLink(NFT.info.mediaUrl.replace('ipfs://', ''))
}
const item = { ...NFT.info, tokenId: NFT.tokenId, glbSupport }
const sameTokenIndex = findLastIndex(sameNFT.tokens, (v) => v.tokenId === NFT.tokenId)
Expand Down
4 changes: 3 additions & 1 deletion packages/plugins/RSS3/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { PluginId } from '@masknet/plugin-infra'
import { resolveIPFSLink } from '@masknet/web3-shared-evm'

export const PLUGIN_ID = PluginId.RSS3
export const PLUGIN_META_KEY = `${PluginId.RSS3}:1`
export const PLUGIN_DESCRIPTION =
'Derived from the best out of RSS, RSS3 is an open protocol designed for all our cyber existence in the era of Web 3.0.'
export const PLUGIN_NAME = 'RSS3'

export const RSS3_DEFAULT_IMAGE = 'https://rss3.mypinata.cloud/ipfs/QmVFq9qimnudPcs6QkQv8ZVEsvwD3aqETHWtS5yXgdbYY5'
/* cspell:disable-next-line */
export const RSS3_DEFAULT_IMAGE = resolveIPFSLink('QmVFq9qimnudPcs6QkQv8ZVEsvwD3aqETHWtS5yXgdbYY5')
1 change: 0 additions & 1 deletion packages/web3-providers/src/rarible/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export const RaribleURL = 'https://api.rarible.com/'
export const RaribleChainURL = 'https://ethereum-api.rarible.org/'
export const RaribleIPFSURL = 'https://ipfs.rarible.com/ipfs/'
export const RaribleUserURL = 'https://rarible.com/user/'
export const RaribleRopstenUserURL = 'https://ropsten.rarible.com/user/'
export const RaribleMainnetURL = 'https://api-mainnet.rarible.com/marketplace/api/v4/'
Expand Down
5 changes: 2 additions & 3 deletions packages/web3-providers/src/rarible/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { RaribleIPFSURL } from './constants'

import { resolveIPFSLink } from '@masknet/web3-shared-evm'
export function toRaribleImage(url?: string) {
if (!url) return ''
if (url.startsWith('ipfs://ipfs/')) return url.replace(/^ipfs:\/\/ipfs\//, RaribleIPFSURL)
if (url.startsWith('ipfs://ipfs/')) return resolveIPFSLink(url.replace(/^ipfs:\/\/ipfs\//, ''))
return url
}
2 changes: 1 addition & 1 deletion packages/web3-shared/evm/pipes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export function resolveBlockLinkOnExplorer(chainId: ChainId, block: string): str
}

export function resolveIPFSLink(ipfs: string): string {
return urlcat('https://ipfs.fleek.co/ipfs/:ipfs', { ipfs })
return urlcat('https://coldcdn.com/api/cdn/mipfseoyvi/ipfs/:ipfs', { ipfs })
}

export function resolveDomainLink(domain?: string) {
Expand Down