diff --git a/src/components/note/metadata.tsx b/src/components/note/metadata.tsx index 15cbc5a5..c7bf6784 100644 --- a/src/components/note/metadata.tsx +++ b/src/components/note/metadata.tsx @@ -26,7 +26,7 @@ export default function NoteMetadata({ { '#e': [eventID], since: parseInt(eventTime), - kinds: [1, 7], + kinds: [7], limit: 50, }, ], @@ -48,11 +48,7 @@ export default function NoteMetadata({ break; } }, - 1000, - undefined, - { - unsubscribeOnEose: true, - } + 1000 ); return () => { diff --git a/src/components/relaysProvider.tsx b/src/components/relaysProvider.tsx index 777030cf..be0f323c 100644 --- a/src/components/relaysProvider.tsx +++ b/src/components/relaysProvider.tsx @@ -6,7 +6,7 @@ export const RelayContext = createContext({}); const relays = [ 'wss://relay.damus.io', 'wss://nostr-pub.wellorder.net', - 'wss://nostr.bongbong.com', + //'wss://nostr.bongbong.com', 'wss://nostr.zebedee.cloud', 'wss://nostr.fmt.wiz.biz', 'wss://relay.snort.social', diff --git a/src/utils/metadata.tsx b/src/utils/metadata.tsx index 2a599ffb..af2e5f3a 100644 --- a/src/utils/metadata.tsx +++ b/src/utils/metadata.tsx @@ -1,15 +1,15 @@ -import { RelayContext } from '@components/relaysProvider'; +import { fetch } from '@tauri-apps/api/http'; +import { useCallback, useEffect, useState } from 'react'; -import { Author } from 'nostr-relaypool'; -import { useCallback, useContext, useEffect, useState } from 'react'; - -export const fetchMetadata = (pubkey: string, pool: any, relays: any) => { - const author = new Author(pool, relays, pubkey); - return new Promise((resolve) => author.metaData(resolve, 0)); +export const fetchMetadata = async (pubkey: string) => { + const result = await fetch(`https://rbr.bio/${pubkey}/metadata.json`, { + method: 'GET', + timeout: 5, + }); + return await result.data; }; export const useMetadata = (pubkey) => { - const [pool, relays]: any = useContext(RelayContext); const [profile, setProfile] = useState(null); const getCachedMetadata = useCallback(async () => { @@ -20,7 +20,7 @@ export const useMetadata = (pubkey) => { const metadata = JSON.parse(res.metadata); setProfile(metadata); } else { - fetchMetadata(pubkey, pool, relays).then((res: any) => { + fetchMetadata(pubkey).then((res: any) => { if (res.content) { const metadata = JSON.parse(res.content); setProfile(metadata); @@ -29,7 +29,7 @@ export const useMetadata = (pubkey) => { } }) .catch(console.error); - }, [pool, relays, pubkey]); + }, [pubkey]); useEffect(() => { getCachedMetadata().catch(console.error);