wip: ark

src/app/chats/chat.tsx

@@ -1,4 +1,4 @@
-import { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk';
+import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useCallback, useEffect, useRef } from 'react';
 import { useParams } from 'react-router-dom';
@@ -7,8 +7,7 @@ import { VList, VListHandle } from 'virtua';
 import { ChatForm } from '@app/chats/components/chatForm';
 import { ChatMessage } from '@app/chats/components/message';
 
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
 
 import { LoaderIcon } from '@shared/icons';
 import { User } from '@shared/user';
@@ -16,8 +15,7 @@ import { User } from '@shared/user';
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function ChatScreen() {
-  const { db } = useStorage();
-  const { ndk } = useNDK();
+  const { ark } = useArk();
   const { pubkey } = useParams();
   const { fetchNIP04Messages } = useNostr();
   const { status, data } = useQuery({
@@ -59,7 +57,7 @@ export function ChatScreen() {
         <ChatMessage
           key={message.id}
           message={message}
-          isSelf={message.pubkey === db.account.pubkey}
+          isSelf={message.pubkey === ark.account.pubkey}
         />
       );
     },
@@ -71,20 +69,15 @@ export function ChatScreen() {
   }, [data]);
 
   useEffect(() => {
-    const sub: NDKSubscription = ndk.subscribe(
-      {
+    const sub = ark.subscribe({
+      filter: {
         kinds: [4],
-        authors: [db.account.pubkey],
+        authors: [ark.account.pubkey],
         '#p': [pubkey],
         since: Math.floor(Date.now() / 1000),
       },
-      {
-        closeOnEose: false,
-      }
-    );
-
-    sub.addListener('event', (event) => {
-      newMessage.mutate(event);
+      closeOnEose: false,
+      cb: (event) => newMessage.mutate(event),
     });
 
     return () => {

src/app/chats/index.tsx

@@ -1,20 +1,15 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { useQuery } from '@tanstack/react-query';
-import { useCallback, useEffect } from 'react';
-import { Outlet, useNavigate } from 'react-router-dom';
+import { useCallback } from 'react';
+import { Outlet } from 'react-router-dom';
 
 import { ChatListItem } from '@app/chats/components/chatListItem';
 
-import { useNDK } from '@libs/ndk/provider';
-
 import { LoaderIcon } from '@shared/icons';
 
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function ChatsScreen() {
-  const navigate = useNavigate();
-
-  const { ndk } = useNDK();
   const { getAllNIP04Chats } = useNostr();
   const { status, data } = useQuery({
     queryKey: ['nip04-chats'],
@@ -34,10 +29,6 @@ export function ChatsScreen() {
     [data]
   );
 
-  useEffect(() => {
-    if (!ndk.signer) navigate('/new/privkey');
-  }, []);
-
   return (
     <div className="grid h-full w-full grid-cols-3">
       <div className="col-span-1 h-full overflow-y-auto border-r border-neutral-200 scrollbar-none dark:border-neutral-800">