- {status === 'pending' ? (
+ {isLoading ? (
diff --git a/src/app/new/components/mentionPopupItem.tsx b/src/app/new/components/mentionPopupItem.tsx
index d4e8f95d8..f91fe830e 100644
--- a/src/app/new/components/mentionPopupItem.tsx
+++ b/src/app/new/components/mentionPopupItem.tsx
@@ -1,10 +1,18 @@
+import * as Avatar from '@radix-ui/react-avatar';
+import { minidenticon } from 'minidenticons';
+import { useMemo } from 'react';
+
import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
export function MentionPopupItem({ pubkey, embed }: { pubkey: string; embed?: string }) {
- const { status, user } = useProfile(pubkey, embed);
+ const { isLoading, user } = useProfile(pubkey, embed);
+ const svgURI = useMemo(
+ () => 'data:image/svg+xml;utf8,' + encodeURIComponent(minidenticon(pubkey, 90, 50)),
+ [pubkey]
+ );
- if (status === 'pending') {
+ if (isLoading) {
return (
Loading...
@@ -18,14 +26,25 @@ export function MentionPopupItem({ pubkey, embed }: { pubkey: string; embed?: st
return (
- 
+
+
+ 
+
+
- {user.display_name || user.displayName || user.name} + {user?.display_name || user?.displayName || user?.name}
{displayNpub(pubkey, 16)} diff --git a/src/app/notes/article.tsx b/src/app/notes/article.tsx index d4a1ba2be..912489db7 100644 --- a/src/app/notes/article.tsx +++ b/src/app/notes/article.tsx @@ -4,6 +4,7 @@ import { nip19 } from 'nostr-tools'; import { EventPointer } from 'nostr-tools/lib/types/nip19'; import { useMemo, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; +import { toast } from 'sonner'; import { ArrowLeftIcon, CheckCircleIcon, ShareIcon } from '@shared/icons'; import { NoteReplyForm } from '@shared/notes'; @@ -40,14 +41,18 @@ export function ArticleNoteScreen() { }, [data]); const share = async () => { - await writeText( - 'https://njump.me/' + - nip19.neventEncode({ id: data.id, author: data.pubkey } as EventPointer) - ); - // update state - setIsCopy(true); - // reset state after 2 sec - setTimeout(() => setIsCopy(false), 2000); + try { + await writeText( + 'https://njump.me/' + + nip19.neventEncode({ id: data?.id, author: data?.pubkey } as EventPointer) + ); + // update state + setIsCopy(true); + // reset state after 2 sec + setTimeout(() => setIsCopy(false), 2000); + } catch (e) { + toast.error(e); + } }; return ( diff --git a/src/app/notes/text.tsx b/src/app/notes/text.tsx index 7228489fe..9e723251a 100644 --- a/src/app/notes/text.tsx +++ b/src/app/notes/text.tsx @@ -4,6 +4,7 @@ import { nip19 } from 'nostr-tools'; import { EventPointer } from 'nostr-tools/lib/types/nip19'; import { useRef, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; +import { toast } from 'sonner'; import { ArrowLeftIcon, CheckCircleIcon, ReplyIcon, ShareIcon } from '@shared/icons'; import { @@ -30,14 +31,18 @@ export function TextNoteScreen() { const [isCopy, setIsCopy] = useState(false); const share = async () => { - await writeText( - 'https://njump.me/' + - nip19.neventEncode({ id: data.id, author: data.pubkey } as EventPointer) - ); - // update state - setIsCopy(true); - // reset state after 2 sec - setTimeout(() => setIsCopy(false), 2000); + try { + await writeText( + 'https://njump.me/' + + nip19.neventEncode({ id: data?.id, author: data?.pubkey } as EventPointer) + ); + // update state + setIsCopy(true); + // reset state after 2 sec + setTimeout(() => setIsCopy(false), 2000); + } catch (e) { + toast.error(e); + } }; const scrollToReply = () => { diff --git a/src/app/relays/components/relayEventList.tsx b/src/app/relays/components/relayEventList.tsx index 4f3600597..e9249a04e 100644 --- a/src/app/relays/components/relayEventList.tsx +++ b/src/app/relays/components/relayEventList.tsx @@ -1,5 +1,6 @@ import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk'; import { useQuery } from '@tanstack/react-query'; +import { normalizeRelayUrl } from 'nostr-fetch'; import { useCallback } from 'react'; import { VList } from 'virtua'; @@ -15,7 +16,7 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) { queryFn: async () => { const url = 'wss://' + relayUrl; const events = await fetcher.fetchLatestEvents( - [url], + [normalizeRelayUrl(url)], { kinds: [NDKKind.Text, NDKKind.Repost], }, @@ -24,6 +25,8 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) { return events as unknown as NDKEvent[]; }, refetchOnWindowFocus: false, + refetchOnReconnect: false, + refetchOnMount: false, }); const renderItem = useCallback( @@ -41,19 +44,18 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) { ); return ( -
-
- {status === 'pending' ? (
-
);
}
diff --git a/src/app/relays/components/relayList.tsx b/src/app/relays/components/relayList.tsx
index ec77917a4..23861733f 100644
--- a/src/app/relays/components/relayList.tsx
+++ b/src/app/relays/components/relayList.tsx
@@ -9,8 +9,6 @@ import { useNostr } from '@utils/hooks/useNostr';
import { useRelay } from '@utils/hooks/useRelay';
export function RelayList() {
- const navigate = useNavigate();
-
const { getAllRelaysByUsers } = useNostr();
const { connectRelay } = useRelay();
const { status, data } = useQuery({
@@ -24,6 +22,8 @@ export function RelayList() {
staleTime: Infinity,
});
+ const navigate = useNavigate();
+
const inspectRelay = (relayUrl: string) => {
const url = new URL(relayUrl);
navigate(`/relays/${url.hostname}`);
diff --git a/src/app/relays/components/userRelayList.tsx b/src/app/relays/components/userRelayList.tsx
index 07d7c383d..3afa12354 100644
--- a/src/app/relays/components/userRelayList.tsx
+++ b/src/app/relays/components/userRelayList.tsx
@@ -6,7 +6,7 @@ import { RelayForm } from '@app/relays/components/relayForm';
import { useNDK } from '@libs/ndk/provider';
import { useStorage } from '@libs/storage/provider';
-import { CancelIcon } from '@shared/icons';
+import { CancelIcon, RefreshIcon } from '@shared/icons';
import { useRelay } from '@utils/hooks/useRelay';
@@ -14,7 +14,7 @@ export function UserRelayList() {
const { db } = useStorage();
const { ndk } = useNDK();
const { removeRelay } = useRelay();
- const { status, data } = useQuery({
+ const { status, data, refetch } = useQuery({
queryKey: ['relays', db.account.pubkey],
queryFn: async () => {
const event = await ndk.fetchEvent(
@@ -25,7 +25,7 @@ export function UserRelayList() {
{ cacheUsage: NDKSubscriptionCacheUsage.ONLY_RELAY }
);
- if (!event) throw new Error('relay set not found');
+ if (!event) return [];
return event.tags;
},
refetchOnWindowFocus: false,
@@ -35,15 +35,22 @@ export function UserRelayList() {
return (
-
+ {status === 'pending' ? (
+
+ ) : (
+ data.map((item) => renderItem(item))
+ )}
+
+
-
+ Loading newsfeed...
-
+
+
+
- ) : (
- data.map((item) => renderItem(item))
- )}
-
- Loading newsfeed...
-
+
Connected relays
+
{status === 'pending' ? (
Loading...
- ) : !data ? ( -
-
You not have personal relay set yet
+ ) : !data.length ? ( +
+
) : (
data.map((item) => (
@@ -68,8 +75,8 @@ export function UserRelayList() {
You not have personal relay list yet
- {item[2] ? (
-
+ {item[2]?.length ? (
+
{item[2]}
) : null}
diff --git a/src/app/settings/components/profileCard.tsx b/src/app/settings/components/profileCard.tsx
index 8b4091989..f8c8429c2 100644
--- a/src/app/settings/components/profileCard.tsx
+++ b/src/app/settings/components/profileCard.tsx
@@ -11,7 +11,7 @@ import { displayNpub } from '@utils/shortenKey';
export function ProfileCard() {
const { db } = useStorage();
- const { status, user } = useProfile(db.account.pubkey);
+ const { isLoading, user } = useProfile(db.account.pubkey);
const svgURI =
'data:image/svg+xml;utf8,' +
@@ -19,7 +19,7 @@ export function ProfileCard() {
return (
- {status === 'pending' ? (
+ {isLoading ? (
{
async function getSigner(nsecbunker?: boolean) {
if (!db.account) return;
- // NIP-46 Signer
- if (nsecbunker) {
- const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`);
- if (!localSignerPrivkey) return null;
+ try {
+ // NIP-46 Signer
+ if (nsecbunker) {
+ const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`);
+ if (!localSignerPrivkey) return null;
+
+ const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
+ const bunker = new NDK({
+ explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
+ });
+ bunker.connect();
- const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
- const bunker = new NDK({
- explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
- });
- bunker.connect();
+ const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner);
+ await remoteSigner.blockUntilReady();
- const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner);
- await remoteSigner.blockUntilReady();
+ return remoteSigner;
+ }
- return remoteSigner;
- }
+ // Privkey Signer
+ const userPrivkey = await db.secureLoad(db.account.pubkey);
+ if (!userPrivkey) return null;
+ return new NDKPrivateKeySigner(userPrivkey);
+ } catch (e) {
+ console.log(e);
+ if (e === 'Token already redeemed') {
+ toast.info(
+ 'nsecbunker token already redeemed. You need to re-login with another token.'
+ );
- // Privkey Signer
- const userPrivkey = await db.secureLoad(db.account.pubkey);
- if (!userPrivkey) return null;
- return new NDKPrivateKeySigner(userPrivkey);
+ await db.secureRemove(`${db.account.pubkey}-nsecbunker`);
+ await db.accountLogout();
+ }
+
+ return null;
+ }
}
async function initNDK() {
- try {
- const outboxSetting = await db.getSettingValue('outbox');
- const bunkerSetting = await db.getSettingValue('nsecbunker');
- const explicitRelayUrls = normalizeRelayUrlSet([
- 'wss://relay.damus.io',
- 'wss://relay.nostr.band',
- 'wss://nos.lol',
- 'wss://nostr.mutinywallet.com',
- ]);
-
- const bunker = !!parseInt(bunkerSetting);
- const outbox = !!parseInt(outboxSetting);
+ const outboxSetting = await db.getSettingValue('outbox');
+ const bunkerSetting = await db.getSettingValue('nsecbunker');
+
+ const bunker = !!parseInt(bunkerSetting);
+ const outbox = !!parseInt(outboxSetting);
+
+ const explicitRelayUrls = normalizeRelayUrlSet([
+ 'wss://relay.damus.io',
+ 'wss://relay.nostr.band',
+ 'wss://nos.lol',
+ 'wss://nostr.mutinywallet.com',
+ ]);
+
+ // #TODO: user should config outbox relays
+ const outboxRelayUrls = normalizeRelayUrlSet(['wss://purplepag.es']);
+
+ // #TODO: user should config blacklist relays
+ const blacklistRelayUrls = normalizeRelayUrlSet(['wss://brb.io']);
+ try {
const tauriAdapter = new NDKCacheAdapterTauri(db);
const instance = new NDK({
explicitRelayUrls,
- cacheAdapter: tauriAdapter,
- outboxRelayUrls: ['wss://purplepag.es'],
+ outboxRelayUrls,
+ blacklistRelayUrls,
enableOutboxModel: outbox,
autoConnectUserRelays: true,
autoFetchUserMutelist: true,
+ cacheAdapter: tauriAdapter,
// clientName: 'Lume',
// clientNip89: '',
});
@@ -88,9 +111,9 @@ export const NDKInstance = () => {
if (db.account) {
const user = instance.getUser({ pubkey: db.account.pubkey });
instance.activeUser = user;
- db.account.contacts = [...(await user.follows(undefined, outbox))].map(
- (user) => user.pubkey
- );
+
+ const contacts = await user.follows(undefined /* outbox */);
+ db.account.contacts = [...contacts].map((user) => user.pubkey);
// prefetch newsfeed
await queryClient.prefetchInfiniteQuery({
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index 5121a5404..7a91ff9e4 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -416,7 +416,14 @@ export class LumeStorage {
return await this.db.execute(`DELETE FROM relays WHERE relay = "${relay}";`);
}
- public async createSetting(key: string, value: string) {
+ public async createSetting(key: string, value: string | undefined) {
+ if (value) {
+ return await this.db.execute(
+ 'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
+ [key, value]
+ );
+ }
+
const currentSetting = await this.checkSettingValue(key);
if (!currentSetting)
@@ -470,9 +477,7 @@ export class LumeStorage {
await this.db.execute("UPDATE accounts SET is_active = '0' WHERE id = $1;", [
this.account.id,
]);
-
this.account = null;
- return true;
}
public async close() {
diff --git a/src/main.jsx b/src/main.jsx
index 7269cc955..df781e5cd 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -11,10 +11,7 @@ import App from './app';
const queryClient = new QueryClient({
defaultOptions: {
queries: {
- gcTime: 1000 * 60 * 60 * 24, // 24 hours
- queries: {
- retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 10000), // 10 seconds
- },
+ retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 10000), // 10 seconds
},
},
});
diff --git a/src/shared/accounts/active.tsx b/src/shared/accounts/active.tsx
index e276f2894..1d3c6512d 100644
--- a/src/shared/accounts/active.tsx
+++ b/src/shared/accounts/active.tsx
@@ -27,7 +27,7 @@ export function ActiveAccount() {
loading="lazy"
decoding="async"
style={{ contentVisibility: 'auto' }}
- className="aspect-square h-auto w-full rounded-md"
+ className="aspect-square h-auto w-full rounded-md object-cover"
/>
![]()
- Send tip to {user?.name || user?.display_name || user?.displayName}
+ Send tip to{' '}
+ {user?.name || user?.displayName || displayNpub(event.pubkey, 16)}
- {user.name || user.display_name || user.displayName || 'No name'} + {user?.name || user?.display_name || user?.displayName || 'No name'}
{user?.nip05 ? (
+
+ );
+ }
+
return (
+ Failed to fetch event
+
+
diff --git a/src/shared/notes/file.tsx b/src/shared/notes/file.tsx
index 1e5a845f0..96ff30fac 100644
--- a/src/shared/notes/file.tsx
+++ b/src/shared/notes/file.tsx
@@ -1,14 +1,11 @@
import { NDKEvent } from '@nostr-dev-kit/ndk';
import { downloadDir } from '@tauri-apps/api/path';
import { download } from '@tauri-apps/plugin-upload';
+import { MediaPlayer, MediaProvider } from '@vidstack/react';
import {
- MediaControlBar,
- MediaController,
- MediaFullscreenButton,
- MediaMuteButton,
- MediaPlayButton,
- MediaTimeRange,
-} from 'media-chrome/dist/react';
+ DefaultVideoLayout,
+ defaultLayoutIcons,
+} from '@vidstack/react/player/layouts/default';
import { memo } from 'react';
import { Link } from 'react-router-dom';
@@ -32,7 +29,7 @@ export function FileNote({ event }: { event: NDKEvent }) {
switch (type) {
case 'image':
return (
-
+
-
-
-
-
+
-
-
-
-
+
+ Failed to fetch event
+
+ );
+ }
+
return (
diff --git a/src/shared/notes/mentions/user.tsx b/src/shared/notes/mentions/user.tsx
index 338c349b4..cc1df7d91 100644
--- a/src/shared/notes/mentions/user.tsx
+++ b/src/shared/notes/mentions/user.tsx
@@ -20,12 +20,7 @@ export const MentionUser = memo(function MentionUser({ pubkey }: { pubkey: strin
}
className="break-words text-blue-500 hover:text-blue-600"
>
- {'@' +
- (user?.name ||
- user?.display_name ||
- user?.displayName ||
- user?.username ||
- 'unknown')}
+ {'@' + (user?.name || user?.displayName || user?.username || 'unknown')}
);
});
diff --git a/src/shared/notes/preview/video.tsx b/src/shared/notes/preview/video.tsx
index 3f956388f..a21ab4aef 100644
--- a/src/shared/notes/preview/video.tsx
+++ b/src/shared/notes/preview/video.tsx
@@ -1,27 +1,19 @@
+import { MediaPlayer, MediaProvider } from '@vidstack/react';
import {
- MediaControlBar,
- MediaController,
- MediaFullscreenButton,
- MediaLoadingIndicator,
- MediaMuteButton,
- MediaPlayButton,
- MediaTimeRange,
-} from 'media-chrome/dist/react';
+ DefaultVideoLayout,
+ defaultLayoutIcons,
+} from '@vidstack/react/player/layouts/default';
export function VideoPreview({ url }: { url: string }) {
return (
-
-
-
-
-
+
@@ -78,10 +91,7 @@ export const User = memo(function User({
);
}
if (variant === 'large') {
- if (status === 'pending') {
+ if (isLoading) {
return (
@@ -242,7 +257,7 @@ export const User = memo(function User({
}
if (variant === 'miniavatar') {
- if (status === 'pending') {
+ if (isLoading) {
return (
);
@@ -259,7 +274,7 @@ export const User = memo(function User({
/>
@@ -269,9 +284,23 @@ export const User = memo(function User({
}
if (variant === 'childnote') {
- if (status === 'pending') {
+ if (isLoading) {
return (
-
+ <>
+
+
+
@@ -295,10 +324,7 @@ export const User = memo(function User({
-
-
+
+
+
);
}
@@ -70,7 +83,7 @@ export const User = memo(function User({
/>
+
+ {fallbackName} +
+ · + {createdAt} +- {user?.name || - user?.display_name || - user?.displayName || - displayNpub(pubkey, 16)} + {user?.name || user?.display_name || user?.displayName || fallbackName}
· {createdAt} @@ -91,11 +101,19 @@ export const User = memo(function User({ } if (variant === 'notify') { - if (status === 'pending') { + if (isLoading) { return (
-
-
+
+
+
);
}
@@ -112,24 +130,21 @@ export const User = memo(function User({
/>
+ {fallbackName} +
- {user?.name || - user?.display_name || - user?.displayName || - displayNpub(pubkey, 16)} + {user?.name || user?.display_name || user?.displayName || fallbackName}
@@ -153,7 +168,7 @@ export const User = memo(function User({
/>
@@ -172,7 +187,7 @@ export const User = memo(function User({
}
if (variant === 'simple') {
- if (status === 'pending') {
+ if (isLoading) {
return (
@@ -215,7 +230,7 @@ export const User = memo(function User({
}
if (variant === 'avatar') {
- if (status === 'pending') {
+ if (isLoading) {
return (
);
@@ -232,7 +247,7 @@ export const User = memo(function User({
/>
@@ -196,7 +211,7 @@ export const User = memo(function User({
/>
@@ -207,7 +222,7 @@ export const User = memo(function User({
{user?.name || user?.display_name || user?.displayName}
- {user?.nip05 || user?.username || displayNpub(pubkey, 16)} + {user?.nip05 || user?.username || fallbackName}
+
+
);
}
@@ -287,7 +316,7 @@ export const User = memo(function User({
/>
{fallbackName}
+
+ {subtext}:
+
+
- {user?.display_name ||
- user?.name ||
- user?.displayName ||
- displayNpub(pubkey, 16)}{' '}
+ {user?.display_name || user?.name || user?.displayName || fallbackName}{' '}
{subtext}:
@@ -309,7 +335,7 @@ export const User = memo(function User({
}
if (variant === 'stacked') {
- if (status === 'pending') {
+ if (isLoading) {
return (
);
@@ -326,7 +352,7 @@ export const User = memo(function User({
/>
@@ -336,7 +362,7 @@ export const User = memo(function User({
}
if (variant === 'ministacked') {
- if (status === 'pending') {
+ if (isLoading) {
return (
);
@@ -353,7 +379,7 @@ export const User = memo(function User({
/>
@@ -363,7 +389,7 @@ export const User = memo(function User({
}
if (variant === 'repost') {
- if (status === 'pending') {
+ if (isLoading) {
return (
@@ -389,11 +415,11 @@ export const User = memo(function User({
alt={pubkey}
loading="lazy"
decoding="async"
- className="h-6 w-6 rounded"
+ className="h-6 w-6 rounded object-cover"
/>
@@ -401,10 +427,7 @@ export const User = memo(function User({
@@ -414,13 +437,13 @@ export const User = memo(function User({
}
if (variant === 'thread') {
- if (status === 'pending') {
+ if (isLoading) {
return (
-
@@ -492,10 +523,7 @@ export const User = memo(function User({
@@ -541,7 +569,7 @@ export const User = memo(function User({
/>
) : (
- {displayNpub(pubkey, 16)}
+ {fallbackName}
)}
diff --git a/src/shared/widgets/thread.tsx b/src/shared/widgets/thread.tsx
index 8e10d255c..dcb70fe25 100644
--- a/src/shared/widgets/thread.tsx
+++ b/src/shared/widgets/thread.tsx
@@ -21,7 +21,7 @@ import { useNostr } from '@utils/hooks/useNostr';
import { Widget } from '@utils/types';
export function ThreadWidget({ widget }: { widget: Widget }) {
- const { status, data } = useEvent(widget.content);
+ const { isFetching, isError, data } = useEvent(widget.content);
const { getEventThread } = useNostr();
const renderKind = useCallback(
@@ -59,16 +59,22 @@ export function ThreadWidget({ widget }: { widget: Widget }) {
- {status === 'pending' ? (
+ {isFetching ? (
- {user?.name || - user?.display_name || - user?.displayName || - displayNpub(pubkey, 16)} + {user?.name || user?.display_name || user?.displayName || fallbackName}
reposted
+
);
}
- if (status === 'pending') {
+ if (isLoading) {
return (
-
@@ -451,19 +474,27 @@ export const User = memo(function User({
+
);
@@ -434,11 +457,11 @@ export const User = memo(function User({
alt={pubkey}
loading="lazy"
decoding="async"
- className="h-10 w-10 rounded-lg ring-1 ring-neutral-200/50 dark:ring-neutral-800/50"
+ className="h-10 w-10 rounded-lg object-cover ring-1 ring-neutral-200/50 dark:ring-neutral-800/50"
/>
-
+
{createdAt}
·
- {displayNpub(pubkey, 16)}
+ {fallbackName}
-
+
+
);
@@ -483,7 +514,7 @@ export const User = memo(function User({
/>
-
+
+ {fallbackName}
+
- {user?.name ||
- user?.display_name ||
- user?.displayName ||
- displayNpub(pubkey, 16)}
+ {user?.name || user?.display_name || user?.displayName || fallbackName}
{createdAt}
@@ -515,11 +543,11 @@ export const User = memo(function User({
alt={pubkey}
loading="lazy"
decoding="async"
- className="h-10 w-10 rounded-lg"
+ className="h-10 w-10 rounded-lg object-cover"
/>
-
Failed to fetch event
+ ) : (
+ <>
+