state.setWidget);
+
const [open, setOpen] = useState(false);
const [loading, setLoading] = useState(false);
const [selected, setSelected] = useState([]);
const [query, setQuery] = useState('');
- const { status, account } = useAccount();
-
- const setWidget = useWidgets((state) => state.setWidget);
-
- useHotkeys(ADD_FEEDBLOCK_SHORTCUT, () => setOpen(true));
-
+ const { db } = useStorage();
const {
register,
handleSubmit,
@@ -43,8 +38,8 @@ export function FeedModal() {
}
});
- // insert to database
- setWidget({
+ // update state
+ setWidget(db, {
kind: BLOCK_KINDS.feed,
title: data.title,
content: JSON.stringify(selected),
@@ -155,26 +150,22 @@ export function FeedModal() {
)}
)}
- {status === 'loading' ? (
-
Loading...
- ) : (
- account?.follows?.map((follow) => (
-
- {({ selected }) => (
- <>
-
- {selected && (
-
- )}
-
- )}
-
- ))
- )}
+ {db.account?.follows?.map((follow) => (
+
+ {({ selected }) => (
+ <>
+
+ {selected && (
+
+ )}
+
+ )}
+
+ ))}
diff --git a/src/app/space/components/modals/hashtag.tsx b/src/app/space/components/modals/hashtag.tsx
index 96e7ebfa..cf2c7d01 100644
--- a/src/app/space/components/modals/hashtag.tsx
+++ b/src/app/space/components/modals/hashtag.tsx
@@ -1,22 +1,21 @@
import * as Dialog from '@radix-ui/react-dialog';
import { useState } from 'react';
import { useForm } from 'react-hook-form';
-import { useHotkeys } from 'react-hotkeys-hook';
+
+import { useStorage } from '@libs/storage/provider';
import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
import { BLOCK_KINDS } from '@stores/constants';
-import { ADD_HASHTAGBLOCK_SHORTCUT } from '@stores/shortcuts';
import { useWidgets } from '@stores/widgets';
export function HashtagModal() {
+ const setWidget = useWidgets((state) => state.setWidget);
+
const [loading, setLoading] = useState(false);
const [open, setOpen] = useState(false);
- const setWidget = useWidgets((state) => state.setWidget);
-
- useHotkeys(ADD_HASHTAGBLOCK_SHORTCUT, () => setOpen(false));
-
+ const { db } = useStorage();
const {
register,
handleSubmit,
@@ -27,8 +26,8 @@ export function HashtagModal() {
const onSubmit = async (data: { hashtag: string }) => {
setLoading(true);
- // mutate
- setWidget({
+ // update state
+ setWidget(db, {
kind: BLOCK_KINDS.hashtag,
title: data.hashtag,
content: data.hashtag.replace('#', ''),
diff --git a/src/app/space/components/modals/image.tsx b/src/app/space/components/modals/image.tsx
index e51cbdc3..7b25adac 100644
--- a/src/app/space/components/modals/image.tsx
+++ b/src/app/space/components/modals/image.tsx
@@ -1,13 +1,13 @@
import * as Dialog from '@radix-ui/react-dialog';
import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form';
-import { useHotkeys } from 'react-hotkeys-hook';
+
+import { useStorage } from '@libs/storage/provider';
import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
import { Image } from '@shared/image';
import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
-import { ADD_IMAGEBLOCK_SHORTCUT } from '@stores/shortcuts';
import { useWidgets } from '@stores/widgets';
import { useImageUploader } from '@utils/hooks/useUploader';
@@ -20,8 +20,7 @@ export function ImageModal() {
const [loading, setLoading] = useState(false);
const [image, setImage] = useState('');
- useHotkeys(ADD_IMAGEBLOCK_SHORTCUT, () => setOpen(false));
-
+ const { db } = useStorage();
const {
register,
handleSubmit,
@@ -41,7 +40,7 @@ export function ImageModal() {
setLoading(true);
// mutate
- setWidget({ kind: BLOCK_KINDS.image, title: data.title, content: data.content });
+ setWidget(db, { kind: BLOCK_KINDS.image, title: data.title, content: data.content });
setLoading(false);
// reset form
diff --git a/src/app/space/components/widgets/feed.tsx b/src/app/space/components/widgets/feed.tsx
index e529fdaf..50b91ebf 100644
--- a/src/app/space/components/widgets/feed.tsx
+++ b/src/app/space/components/widgets/feed.tsx
@@ -58,21 +58,13 @@ export function FeedBlock({ params }: { params: Widget }) {
const reply = note.tags.find((el) => el[3] === 'reply')?.[1];
if (root || reply) {
return (
-
+
);
} else {
return (
-
+
);
@@ -80,32 +72,20 @@ export function FeedBlock({ params }: { params: Widget }) {
}
case 6:
return (
-
-
+
+
);
case 1063:
return (
-
-
+
+
);
default:
return (
-
-
+
+
);
}
diff --git a/src/app/space/components/widgets/network.tsx b/src/app/space/components/widgets/network.tsx
index 5b3d429c..0c8bd0f4 100644
--- a/src/app/space/components/widgets/network.tsx
+++ b/src/app/space/components/widgets/network.tsx
@@ -1,7 +1,7 @@
import { useInfiniteQuery } from '@tanstack/react-query';
import { useVirtualizer } from '@tanstack/react-virtual';
import { NostrEvent } from 'nostr-fetch';
-import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
import { Link } from 'react-router-dom';
import { NoteKind_1, NoteKind_1063, NoteThread, Repost } from '@shared/notes';
@@ -14,14 +14,15 @@ import { LumeEvent } from '@utils/types';
export function NetworkBlock() {
const { fetchNotes } = useNostr();
- const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
- useInfiniteQuery({
- queryKey: ['network-widget'],
- queryFn: async ({ pageParam = 24 }) => {
- return await fetchNotes(pageParam);
- },
- getNextPageParam: (lastPage) => lastPage.nextCursor,
- });
+ const { status, data, hasNextPage, isFetchingNextPage } = useInfiniteQuery({
+ queryKey: ['network-widget'],
+ queryFn: async ({ pageParam = 24 }) => {
+ return await fetchNotes(pageParam);
+ },
+ getNextPageParam: (lastPage) => lastPage.nextCursor,
+ refetchOnWindowFocus: false,
+ refetchOnReconnect: false,
+ });
const parentRef = useRef();
const notes = useMemo(
@@ -40,18 +41,6 @@ export function NetworkBlock() {
const itemsVirtualizer = rowVirtualizer.getVirtualItems();
const totalSize = rowVirtualizer.getTotalSize();
- useEffect(() => {
- const [lastItem] = [...itemsVirtualizer].reverse();
-
- if (!lastItem) {
- return;
- }
-
- if (lastItem.index >= notes.length - 1 && hasNextPage && !isFetchingNextPage) {
- fetchNextPage();
- }
- }, [notes.length, fetchNextPage, itemsVirtualizer]);
-
const renderItem = useCallback(
(index: string | number) => {
const note: LumeEvent = notes[index];
@@ -69,7 +58,7 @@ export function NetworkBlock() {
if (root || reply) {
return (
@@ -79,7 +68,7 @@ export function NetworkBlock() {
} else {
return (
@@ -91,31 +80,31 @@ export function NetworkBlock() {
case 6:
return (
-
+
);
case 1063:
return (
-
+
);
default:
return (
-
+
);
}
diff --git a/src/app/space/components/widgets/thread.tsx b/src/app/space/components/widgets/thread.tsx
index 8056b246..b9e27c32 100644
--- a/src/app/space/components/widgets/thread.tsx
+++ b/src/app/space/components/widgets/thread.tsx
@@ -1,4 +1,5 @@
-// import { useLiveThread } from '@app/space/hooks/useLiveThread';
+import { useStorage } from '@libs/storage/provider';
+
import {
NoteActions,
NoteContent,
@@ -10,16 +11,12 @@ import { RepliesList } from '@shared/notes/replies/list';
import { NoteSkeleton } from '@shared/notes/skeleton';
import { TitleBar } from '@shared/titleBar';
-import { useAccount } from '@utils/hooks/useAccount';
import { useEvent } from '@utils/hooks/useEvent';
import { Widget } from '@utils/types';
export function ThreadBlock({ params }: { params: Widget }) {
const { status, data } = useEvent(params.content);
- const { account } = useAccount();
-
- // subscribe to live reply
- // useLiveThread(params.content);
+ const { db } = useStorage();
return (
@@ -50,7 +47,7 @@ export function ThreadBlock({ params }: { params: Widget }) {
)}
- {account && }
+
diff --git a/src/app/space/index.tsx b/src/app/space/index.tsx
index 70783fb8..d7d3f2bb 100644
--- a/src/app/space/index.tsx
+++ b/src/app/space/index.tsx
@@ -10,6 +10,8 @@ import { NetworkBlock } from '@app/space/components/widgets/network';
import { ThreadBlock } from '@app/space/components/widgets/thread';
import { UserBlock } from '@app/space/components/widgets/user';
+import { useStorage } from '@libs/storage/provider';
+
import { LoaderIcon } from '@shared/icons';
import { useWidgets } from '@stores/widgets';
@@ -22,6 +24,8 @@ export function SpaceScreen() {
state.fetchWidgets,
]);
+ const { db } = useStorage();
+
const renderItem = useCallback(
(widget: Widget) => {
switch (widget.kind) {
@@ -43,7 +47,7 @@ export function SpaceScreen() {
);
useEffect(() => {
- fetchWidgets();
+ fetchWidgets(db);
}, [fetchWidgets]);
return (
diff --git a/src/app/splash.tsx b/src/app/splash.tsx
index 38bd50a7..7be1558d 100644
--- a/src/app/splash.tsx
+++ b/src/app/splash.tsx
@@ -30,7 +30,7 @@ export function SplashScreen() {
if (user.status === 'ok') {
const now = Math.floor(Date.now() / 1000);
await db.updateLastLogin(now);
- invoke('close_splashscreen');
+ await invoke('close_splashscreen');
} else {
setIsLoading(false);
setErrorMessage(user.message);
@@ -55,7 +55,7 @@ export function SplashScreen() {
}, [ndk, db.account]);
return (
-
+
diff --git a/src/app/users/components/profile.tsx b/src/app/users/components/profile.tsx
index 48d9425b..95fe5eda 100644
--- a/src/app/users/components/profile.tsx
+++ b/src/app/users/components/profile.tsx
@@ -3,19 +3,20 @@ import { Link } from 'react-router-dom';
import { UserMetadata } from '@app/users/components/metadata';
+import { useStorage } from '@libs/storage/provider';
+
import { EditProfileModal } from '@shared/editProfileModal';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
-import { useAccount } from '@utils/hooks/useAccount';
import { useProfile } from '@utils/hooks/useProfile';
import { useSocial } from '@utils/hooks/useSocial';
import { shortenKey } from '@utils/shortenKey';
export function UserProfile({ pubkey }: { pubkey: string }) {
+ const { db } = useStorage();
const { user } = useProfile(pubkey);
- const { account } = useAccount();
const { status, userFollows, follow, unfollow } = useSocial();
const [followed, setFollowed] = useState(false);
@@ -109,7 +110,7 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
Message
- {account && account.pubkey === pubkey && }
+ {db.account.pubkey === pubkey && }
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index fd5d39b3..8f2ee5ec 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -3,7 +3,6 @@ import NDK from '@nostr-dev-kit/ndk';
import { useEffect, useState } from 'react';
import TauriAdapter from '@libs/ndk/cache';
-import { getExplicitRelayUrls } from '@libs/storage';
import { useStorage } from '@libs/storage/provider';
import { FULL_RELAYS } from '@stores/constants';
@@ -56,7 +55,7 @@ export const NDKInstance = () => {
async function initNDK() {
let explicitRelayUrls: string[];
- const explicitRelayUrlsFromDB = await getExplicitRelayUrls();
+ const explicitRelayUrlsFromDB = await db.getExplicitRelayUrls();
if (explicitRelayUrlsFromDB) {
explicitRelayUrls = await verifyRelays(explicitRelayUrlsFromDB);
diff --git a/src/libs/storage.ts b/src/libs/storage.ts
index c924717d..ec835f3f 100644
--- a/src/libs/storage.ts
+++ b/src/libs/storage.ts
@@ -1,5 +1,5 @@
import Database from '@tauri-apps/plugin-sql';
-import destr from 'destr';
+import { destr } from 'destr';
import { parser } from '@utils/parser';
import { getParentID } from '@utils/transform';
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index f33065d3..46087546 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -184,6 +184,12 @@ export class LumeStorage {
);
}
+ public async removePrivkey() {
+ return await this.db.execute(
+ `UPDATE accounts SET privkey = "privkey is stored in secure storage" WHERE id = "${this.account.id}";`
+ );
+ }
+
public async close() {
return this.db.close();
}
diff --git a/src/libs/storage/provider.tsx b/src/libs/storage/provider.tsx
index 5e6ed51e..aeb712ae 100644
--- a/src/libs/storage/provider.tsx
+++ b/src/libs/storage/provider.tsx
@@ -24,10 +24,6 @@ const StorageProvider = ({ children }: PropsWithChildren