diff --git a/src/components/note/atoms/userRepost.tsx b/src/components/note/atoms/userRepost.tsx
index 1e49009d..702e6f57 100644
--- a/src/components/note/atoms/userRepost.tsx
+++ b/src/components/note/atoms/userRepost.tsx
@@ -1,30 +1,19 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { truncate } from '@utils/truncate';
-import { useNostrEvents } from 'nostr-react';
-import { memo, useState } from 'react';
+import { memo, useEffect, useState } from 'react';
export const UserRepost = memo(function UserRepost({ pubkey }: { pubkey: string }) {
const [profile, setProfile] = useState({ picture: null, name: null });
- const { onEvent } = useNostrEvents({
- filter: {
- authors: [pubkey],
- kinds: [0],
- },
- });
-
- // #TODO: save response to DB
- onEvent((rawMetadata) => {
- try {
- const metadata: any = JSON.parse(rawMetadata.content);
- if (metadata) {
- setProfile(metadata);
- }
- } catch (err) {
- console.error(err, rawMetadata);
- }
- });
+ useEffect(() => {
+ fetch(`https://rbr.bio/${pubkey}/metadata.json`).then((res) =>
+ res.json().then((res) => {
+ // update state
+ setProfile(JSON.parse(res.content));
+ })
+ );
+ }, [pubkey]);
return (
diff --git a/src/components/note/atoms/userWithUsername.tsx b/src/components/note/atoms/userWithUsername.tsx
index a581599c..1dd2fd96 100644
--- a/src/components/note/atoms/userWithUsername.tsx
+++ b/src/components/note/atoms/userWithUsername.tsx
@@ -5,49 +5,18 @@ import { truncate } from '@utils/truncate';
import { DotsHorizontalIcon } from '@radix-ui/react-icons';
import Avatar from 'boring-avatars';
-import { useNostrEvents } from 'nostr-react';
import { memo, useEffect, useState } from 'react';
-import Database from 'tauri-plugin-sql-api';
-
-const db = typeof window !== 'undefined' ? await Database.load('sqlite:lume.db') : null;
export const UserWithUsername = memo(function UserWithUsername({ pubkey }: { pubkey: string }) {
const [profile, setProfile] = useState({ picture: null, name: null, username: null });
- const { onEvent } = useNostrEvents({
- filter: {
- authors: [pubkey],
- kinds: [0],
- },
- });
-
- onEvent(async (rawMetadata) => {
- try {
- const metadata: any = JSON.parse(rawMetadata.content);
- if (profile.picture === null || profile.name === null) {
- setProfile(metadata);
- await db.execute(`INSERT OR IGNORE INTO cache_profiles (pubkey, metadata) VALUES ("${pubkey}", '${JSON.stringify(metadata)}')`);
- } else {
- return;
- }
- } catch (err) {
- console.error(err, rawMetadata);
- }
- });
-
useEffect(() => {
- const initialProfile = async () => {
- const result: any = await db.select(`SELECT metadata FROM cache_profiles WHERE pubkey = "${pubkey}"`);
- return result;
- };
-
- initialProfile()
- .then((res) => {
- if (res[0] !== undefined) {
- setProfile(JSON.parse(res[0].metadata));
- }
+ fetch(`https://rbr.bio/${pubkey}/metadata.json`).then((res) =>
+ res.json().then((res) => {
+ // update state
+ setProfile(JSON.parse(res.content));
})
- .catch(console.error);
+ );
}, [pubkey]);
return (
diff --git a/src/components/note/modal/index.tsx b/src/components/note/modal/index.tsx
index 5665c7cb..91824bd0 100644
--- a/src/components/note/modal/index.tsx
+++ b/src/components/note/modal/index.tsx
@@ -1,18 +1,33 @@
+import { RelayContext } from '@components/contexts/relay';
import { Content } from '@components/note/content';
import NoteReply from '@components/note/modal/noteReply';
-import { useNostrEvents } from 'nostr-react';
-import { memo } from 'react';
+import useLocalStorage from '@rehooks/local-storage';
+import { memo, useContext, useState } from 'react';
/* eslint-disable @typescript-eslint/no-explicit-any */
const Modal = ({ event }: { event: any }) => {
- const { events } = useNostrEvents({
- filter: {
- '#e': [event.id],
- since: event.created_at,
- kinds: [1],
+ const relayPool: any = useContext(RelayContext);
+ const [relays]: any = useLocalStorage('relays');
+ const [events, setEvents] = useState([]);
+
+ relayPool.subscribe(
+ [
+ {
+ '#e': [event.id],
+ since: event.created_at,
+ kinds: [1],
+ },
+ ],
+ relays,
+ (event: any) => {
+ setEvents((events) => [event, ...events]);
},
- });
+ undefined,
+ (events: any, relayURL: any) => {
+ console.log(events, relayURL);
+ }
+ );
return (
diff --git a/src/components/note/repost.tsx b/src/components/note/repost.tsx
index 7d6c257b..8dbb4aec 100644
--- a/src/components/note/repost.tsx
+++ b/src/components/note/repost.tsx
@@ -1,13 +1,14 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
+import { RelayContext } from '@components/contexts/relay';
import { UserRepost } from '@components/note/atoms/userRepost';
import { Content } from '@components/note/content';
import { Placeholder } from '@components/note/placeholder';
import * as Dialog from '@radix-ui/react-dialog';
import { LoopIcon } from '@radix-ui/react-icons';
+import useLocalStorage from '@rehooks/local-storage';
import dynamic from 'next/dynamic';
-import { useNostrEvents } from 'nostr-react';
-import { memo } from 'react';
+import { memo, useContext, useState } from 'react';
const Modal = dynamic(() => import('@components/note/modal'), {
ssr: false,
@@ -15,13 +16,27 @@ const Modal = dynamic(() => import('@components/note/modal'), {
});
export const Repost = memo(function Repost({ root, user }: { root: any; user: string }) {
- const { events } = useNostrEvents({
- filter: {
- ids: [root[0][1]],
- since: 0,
- kinds: [1],
+ const relayPool: any = useContext(RelayContext);
+ const [relays]: any = useLocalStorage('relays');
+ const [events, setEvents] = useState([]);
+
+ relayPool.subscribe(
+ [
+ {
+ ids: [root[0][1]],
+ since: 0,
+ kinds: [1],
+ },
+ ],
+ relays,
+ (event: any) => {
+ setEvents((events) => [event, ...events]);
},
- });
+ undefined,
+ (events: any, relayURL: any) => {
+ console.log(events, relayURL);
+ }
+ );
if (events !== null && Object.keys(events).length > 0) {
return (
@@ -38,9 +53,7 @@ export const Repost = memo(function Repost({ root, user }: { root: any; user: st
-
- {events[0].content && }
-
+ {events[0].content && }
diff --git a/src/pages/profile/update.tsx b/src/pages/profile/update.tsx
index 37a93b57..dc7e6bda 100644
--- a/src/pages/profile/update.tsx
+++ b/src/pages/profile/update.tsx
@@ -2,11 +2,14 @@
import BaseLayout from '@layouts/baseLayout';
import UserLayout from '@layouts/userLayout';
+import { RelayContext } from '@components/contexts/relay';
+
+import { dateToUnix } from '@utils/getDate';
+
import { useLocalStorage } from '@rehooks/local-storage';
import { useRouter } from 'next/router';
-import { dateToUnix, useNostr } from 'nostr-react';
import { getEventHash, signEvent } from 'nostr-tools';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useState } from 'react';
+import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useContext, useState } from 'react';
import { useForm } from 'react-hook-form';
import Database from 'tauri-plugin-sql-api';
@@ -22,8 +25,10 @@ type FormValues = {
// TODO: update the design
export default function Page() {
+ const relayPool: any = useContext(RelayContext);
+ const [relays]: any = useLocalStorage('relays');
+
const router = useRouter();
- const { publish } = useNostr();
const [loading, setLoading] = useState(false);
const [currentUser]: any = useLocalStorage('current-user');
@@ -46,9 +51,11 @@ export default function Page() {
pubkey: currentUser.pubkey,
tags: [],
};
+
event.id = getEventHash(event);
event.sig = signEvent(event, currentUser.privkey);
- publish(event);
+
+ relayPool.publish(event, relays);
// save account to database
const db = await Database.load('sqlite:lume.db');