twMerge(
@@ -34,12 +34,12 @@ export function ChatsListSelfItem({ data }: { data: { pubkey: string } }) {
- {user?.nip05 || user?.name || displayNpub(data.pubkey, 16)}
+ {user?.nip05 || user?.name || displayNpub(pubkey, 16)}
(you)
diff --git a/src/app/chats/index.tsx b/src/app/chats/index.tsx
index 000f7c5a..2eebcedb 100644
--- a/src/app/chats/index.tsx
+++ b/src/app/chats/index.tsx
@@ -10,10 +10,10 @@ import { ChatSidebar } from '@app/chats/components/sidebar';
import { useNDK } from '@libs/ndk/provider';
import { createChat, getChatMessages } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
import { useStronghold } from '@stores/stronghold';
-import { useAccount } from '@utils/hooks/useAccount';
import { Chats } from '@utils/types';
export function ChatScreen() {
@@ -21,17 +21,11 @@ export function ChatScreen() {
const virtuosoRef = useRef(null);
const { ndk } = useNDK();
+ const { db } = useStorage();
const { pubkey } = useParams();
- const { account } = useAccount();
- const { status, data } = useQuery(
- ['chat', pubkey],
- async () => {
- return await getChatMessages(account.pubkey, pubkey);
- },
- {
- enabled: account ? true : false,
- }
- );
+ const { status, data } = useQuery(['chat', pubkey], async () => {
+ return await getChatMessages(db.account.pubkey, pubkey);
+ });
const userPrivkey = useStronghold((state) => state.privkey);
@@ -40,7 +34,7 @@ export function ChatScreen() {
return (
);
@@ -75,7 +69,7 @@ export function ChatScreen() {
const sub: NDKSubscription = ndk.subscribe(
{
kinds: [4],
- authors: [account.pubkey],
+ authors: [db.account.pubkey],
'#p': [pubkey],
since: Math.floor(Date.now() / 1000),
},
@@ -129,7 +123,7 @@ export function ChatScreen() {
diff --git a/src/app/error.tsx b/src/app/error.tsx
index cabed006..2a51519f 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -1,21 +1,79 @@
-import { useRouteError } from 'react-router-dom';
+import { useEffect, useState } from 'react';
+import { useLocation, useRouteError } from 'react-router-dom';
interface IRouteError {
statusText: string;
message: string;
}
+interface IDebugInfo {
+ os: null | string;
+ version: null | string;
+}
+
export function ErrorScreen() {
const error = useRouteError() as IRouteError;
+ const location = useLocation();
+
+ const [debugInfo, setDebugInfo] = useState
({ os: null, version: null });
+
+ useEffect(() => {
+ async function getInformation() {
+ const { platform, version } = await import('@tauri-apps/plugin-os');
+ const { getVersion } = await import('@tauri-apps/plugin-app');
+
+ const platformName = await platform();
+ const osVersion = await version();
+ const appVersion = await getVersion();
+
+ setDebugInfo({ os: platformName + ' ' + osVersion, version: appVersion });
+ }
+
+ getInformation();
+ }, []);
return (
-
-
-
Oops!
-
Sorry, an unexpected error has occurred.
-
- {error.statusText || error.message}
-
+
+
+
+
+ Sorry, an unexpected error has occurred.
+
+
+
+ {error.statusText || error.message}
+
+
+
+
+ Current location: {location.pathname}
+
+
App version: {debugInfo.version}
+
Platform: {debugInfo.os}
+
+
+
);
diff --git a/src/app/events/index.tsx b/src/app/events/index.tsx
index 48db0500..e44c4b82 100644
--- a/src/app/events/index.tsx
+++ b/src/app/events/index.tsx
@@ -1,5 +1,7 @@
import { useParams } from 'react-router-dom';
+import { useStorage } from '@libs/storage/provider';
+
import {
NoteActions,
NoteContent,
@@ -10,12 +12,11 @@ import {
import { RepliesList } from '@shared/notes/replies/list';
import { NoteSkeleton } from '@shared/notes/skeleton';
-import { useAccount } from '@utils/hooks/useAccount';
import { useEvent } from '@utils/hooks/useEvent';
export function EventScreen() {
const { id } = useParams();
- const { account } = useAccount();
+ const { db } = useStorage();
const { status, data } = useEvent(id);
return (
@@ -42,7 +43,7 @@ export function EventScreen() {
)}
-
+
- You not have any posts to see yet
+ You not have any postrs to see yet
Follow more people to have more fun.
@@ -148,7 +146,7 @@ export function NetworkBlock() {
to="/trending"
className="inline-flex w-max rounded bg-fuchsia-500 px-2.5 py-1.5 text-sm hover:bg-fuchsia-600"
>
- Trending
+ Trending users
diff --git a/src/app/splash.tsx b/src/app/splash.tsx
index 47911768..38bd50a7 100644
--- a/src/app/splash.tsx
+++ b/src/app/splash.tsx
@@ -6,13 +6,11 @@ import { useStorage } from '@libs/storage/provider';
import { LoaderIcon } from '@shared/icons';
-import { useAccount } from '@utils/hooks/useAccount';
import { useNostr } from '@utils/hooks/useNostr';
export function SplashScreen() {
const { db } = useStorage();
const { ndk, relayUrls } = useNDK();
- const { status, account } = useAccount();
const { fetchUserData } = useNostr();
const [isLoading, setIsLoading] = useState(true);
@@ -46,15 +44,15 @@ export function SplashScreen() {
};
useEffect(() => {
- if (status === 'success' && !account) {
+ if (!db.account) {
invoke('close_splashscreen');
}
- if (ndk && account) {
+ if (ndk && db.account) {
console.log('prefetching...');
prefetch();
}
- }, [ndk, account]);
+ }, [ndk, db.account]);
return (
diff --git a/src/app/trending/components/profile.tsx b/src/app/trending/components/profile.tsx
index 5148d203..390b7576 100644
--- a/src/app/trending/components/profile.tsx
+++ b/src/app/trending/components/profile.tsx
@@ -1,5 +1,4 @@
import { useQuery } from '@tanstack/react-query';
-import { fetch } from '@tauri-apps/plugin-http';
import { useEffect, useState } from 'react';
import { FollowIcon, LoaderIcon, UnfollowIcon } from '@shared/icons';
diff --git a/src/app/trending/components/trendingNotes.tsx b/src/app/trending/components/trendingNotes.tsx
index 7fd30e39..ef258d73 100644
--- a/src/app/trending/components/trendingNotes.tsx
+++ b/src/app/trending/components/trendingNotes.tsx
@@ -1,5 +1,4 @@
import { useQuery } from '@tanstack/react-query';
-import { fetch } from '@tauri-apps/plugin-http';
import { NoteKind_1 } from '@shared/notes';
import { NoteSkeleton } from '@shared/notes/skeleton';
diff --git a/src/app/trending/components/trendingProfiles.tsx b/src/app/trending/components/trendingProfiles.tsx
index d65a778e..002ced7f 100644
--- a/src/app/trending/components/trendingProfiles.tsx
+++ b/src/app/trending/components/trendingProfiles.tsx
@@ -1,5 +1,4 @@
import { useQuery } from '@tanstack/react-query';
-import { fetch } from '@tauri-apps/plugin-http';
import { Profile } from '@app/trending/components/profile';
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index 6bfaeba8..fd5d39b3 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -1,6 +1,5 @@
// inspire by: https://github.com/nostr-dev-kit/ndk-react/
import NDK from '@nostr-dev-kit/ndk';
-import { fetch } from '@tauri-apps/plugin-http';
import { useEffect, useState } from 'react';
import TauriAdapter from '@libs/ndk/cache';
@@ -31,14 +30,21 @@ export const NDKInstance = () => {
}
try {
+ const controller = new AbortController();
+ const timeoutId = setTimeout(() => controller.abort('timeout'), 5000);
const res = await fetch(url, {
headers: { Accept: 'application/nostr+json' },
+ signal: controller.signal,
});
if (res.ok) {
const data = await res.json();
console.log('relay information: ', data);
+
verifiedRelays.push(relay);
+ clearTimeout(timeoutId);
+ } else {
+ console.log('relay not working: ', res);
}
} catch (e) {
console.log('fetch error', e);
diff --git a/src/libs/storage.ts b/src/libs/storage.ts
index 41600df1..c924717d 100644
--- a/src/libs/storage.ts
+++ b/src/libs/storage.ts
@@ -36,12 +36,6 @@ export async function getActiveAccount() {
'SELECT * FROM accounts WHERE is_active = 1;'
);
if (result.length > 0) {
- result[0]['follows'] = result[0].follows
- ? JSON.parse(result[0].follows as unknown as string)
- : null;
- result[0]['network'] = result[0].network
- ? JSON.parse(result[0].network as unknown as string)
- : null;
return result[0];
} else {
return null;
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index 74c3d3e3..f33065d3 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -7,10 +7,12 @@ import { Account, Relays, Widget } from '@utils/types';
export class LumeStorage {
public db: Database;
public secureDB: Stronghold;
+ public account: Account | null = null;
constructor(sqlite: Database, stronghold?: Stronghold) {
this.db = sqlite;
this.secureDB = stronghold ?? undefined;
+ this.account = null;
}
private async getSecureClient() {
@@ -45,19 +47,24 @@ export class LumeStorage {
}
public async getActiveAccount() {
- const account: Account = await this.db.select(
- 'SELECT * FROM accounts WHERE is_active = 1;'
- )?.[0];
- if (account) {
+ const results: Array
= await this.db.select(
+ 'SELECT * FROM accounts WHERE is_active = "1" ORDER BY id DESC LIMIT 1;'
+ );
+
+ if (results.length > 0) {
+ const account = results[0];
+
if (typeof account.follows === 'string')
account.follows = JSON.parse(account.follows);
if (typeof account.network === 'string')
account.network = JSON.parse(account.network);
+ this.account = account;
return account;
} else {
- throw new Error('Account not found');
+ console.log('no active account, please create new account');
+ return null;
}
}
@@ -75,27 +82,30 @@ export class LumeStorage {
}
public async updateAccount(column: string, value: string | string[]) {
- const account = await this.getActiveAccount();
- return await this.db.execute(`UPDATE accounts SET ${column} = $1 WHERE id = $2;`, [
- value,
- account.id,
- ]);
+ const insert = await this.db.execute(
+ `UPDATE accounts SET ${column} = $1 WHERE id = $2;`,
+ [value, this.account.id]
+ );
+
+ if (insert) {
+ const account = await this.getActiveAccount();
+ return account;
+ }
}
public async getWidgets() {
- const account = await this.getActiveAccount();
const result: Array = await this.db.select(
- `SELECT * FROM widgets WHERE account_id = "${account.id}" ORDER BY created_at DESC;`
+ `SELECT * FROM widgets WHERE account_id = "${this.account.id}" ORDER BY created_at DESC;`
);
return result;
}
public async createWidget(kind: number, title: string, content: string | string[]) {
- const account = await this.getActiveAccount();
const insert = await this.db.execute(
'INSERT OR IGNORE INTO widgets (account_id, kind, title, content) VALUES ($1, $2, $3, $4);',
- [account.id, kind, title, content]
+ [this.account.id, kind, title, content]
);
+
if (insert) {
const widget: Widget = await this.db.select(
'SELECT * FROM widgets ORDER BY id DESC LIMIT 1;'
@@ -129,7 +139,7 @@ export class LumeStorage {
[cacheKey]
)?.[0];
if (!event) {
- console.error('failed to get event by cache_key: ', cacheKey);
+ // console.error('failed to get event by cache_key: ', cacheKey);
return null;
}
return event;
@@ -141,16 +151,15 @@ export class LumeStorage {
[id]
)?.[0];
if (!event) {
- console.error('failed to get event by id: ', id);
+ // console.error('failed to get event by id: ', id);
return null;
}
return event;
}
public async getExplicitRelayUrls() {
- const account = await this.getActiveAccount();
const result: Relays[] = await this.db.select(
- `SELECT * FROM relays WHERE account_id = "${account.id}";`
+ `SELECT * FROM relays WHERE account_id = "${this.account.id}";`
);
if (result.length > 0) return result.map((el) => el.relay);
@@ -158,10 +167,9 @@ export class LumeStorage {
}
public async createRelay(relay: string, purpose?: string) {
- const account = await this.getActiveAccount();
return await this.db.execute(
'INSERT OR IGNORE INTO relays (account_id, relay, purpose) VALUES ($1, $2, $3);',
- [account.id, relay, purpose || '']
+ [this.account.id, relay, purpose || '']
);
}
diff --git a/src/libs/storage/provider.tsx b/src/libs/storage/provider.tsx
index 8489124c..5e6ed51e 100644
--- a/src/libs/storage/provider.tsx
+++ b/src/libs/storage/provider.tsx
@@ -17,6 +17,8 @@ const StorageProvider = ({ children }: PropsWithChildren