-
setWidget(db, {
- kind: widgetKinds.thread,
+ kind: WidgetKinds.thread,
title: 'Thread',
content: id,
})
diff --git a/src/shared/notes/actions/more.tsx b/src/shared/notes/actions/more.tsx
index ee729df0..0d2806fc 100644
--- a/src/shared/notes/actions/more.tsx
+++ b/src/shared/notes/actions/more.tsx
@@ -1,4 +1,4 @@
-import * as Popover from '@radix-ui/react-popover';
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
import * as Tooltip from '@radix-ui/react-tooltip';
import { writeText } from '@tauri-apps/plugin-clipboard-manager';
import { nip19 } from 'nostr-tools';
@@ -25,17 +25,17 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
};
return (
-
+
-
+
-
+
@@ -44,15 +44,17 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
-
-
-
+
+
+
Open as new screen
+
+
+
+
+
+
View profile
-
-
-
-
+
+
+
+
);
}
diff --git a/src/shared/notes/mentions/hashtag.tsx b/src/shared/notes/mentions/hashtag.tsx
index 3105a54d..17c80b98 100644
--- a/src/shared/notes/mentions/hashtag.tsx
+++ b/src/shared/notes/mentions/hashtag.tsx
@@ -1,7 +1,6 @@
import { useStorage } from '@libs/storage/provider';
-import { widgetKinds } from '@stores/constants';
-import { useWidgets } from '@stores/widgets';
+import { WidgetKinds, useWidgets } from '@stores/widgets';
export function Hashtag({ tag }: { tag: string }) {
const { db } = useStorage();
@@ -12,7 +11,7 @@ export function Hashtag({ tag }: { tag: string }) {
type="button"
onClick={() =>
setWidget(db, {
- kind: widgetKinds.hashtag,
+ kind: WidgetKinds.hashtag,
title: tag,
content: tag.replace('#', ''),
})
diff --git a/src/shared/notes/mentions/note.tsx b/src/shared/notes/mentions/note.tsx
index cbc2b78a..265173e1 100644
--- a/src/shared/notes/mentions/note.tsx
+++ b/src/shared/notes/mentions/note.tsx
@@ -8,28 +8,28 @@ import { Image } from '@shared/image';
import { MentionUser, NoteSkeleton } from '@shared/notes';
import { User } from '@shared/user';
-import { widgetKinds } from '@stores/constants';
-import { useWidgets } from '@stores/widgets';
+import { WidgetKinds, useWidgets } from '@stores/widgets';
import { useEvent } from '@utils/hooks/useEvent';
import { isImage } from '@utils/isImage';
export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
const { db } = useStorage();
- const { status, data } = useEvent(id);
+ const { status, data, error } = useEvent(id);
const setWidget = useWidgets((state) => state.setWidget);
const openThread = (event, thread: string) => {
const selection = window.getSelection();
if (selection.toString().length === 0) {
- setWidget(db, { kind: widgetKinds.thread, title: 'Thread', content: thread });
+ setWidget(db, { kind: WidgetKinds.thread, title: 'Thread', content: thread });
} else {
event.stopPropagation();
}
};
const renderItem = useCallback(() => {
+ if (!data) return;
switch (data.event.kind) {
case 1: {
return (
@@ -85,6 +85,14 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
);
}
+ if (error) {
+ return (
+
+
Can't get event from relay
+
+ );
+ }
+
return (
openThread(e, id)}
@@ -93,7 +101,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
tabIndex={0}
className="mb-2 mt-3 cursor-default rounded-lg bg-white/10 px-3 py-3"
>
-
+
{renderItem()}
);
diff --git a/src/shared/notes/mentions/user.tsx b/src/shared/notes/mentions/user.tsx
index 19dcf41a..114eee56 100644
--- a/src/shared/notes/mentions/user.tsx
+++ b/src/shared/notes/mentions/user.tsx
@@ -1,7 +1,6 @@
import { useStorage } from '@libs/storage/provider';
-import { widgetKinds } from '@stores/constants';
-import { useWidgets } from '@stores/widgets';
+import { WidgetKinds, useWidgets } from '@stores/widgets';
import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
@@ -17,7 +16,7 @@ export function MentionUser({ pubkey }: { pubkey: string }) {
type="button"
onClick={() =>
setWidget(db, {
- kind: widgetKinds.user,
+ kind: WidgetKinds.user,
title: user?.nip05 || user?.name || user?.display_name,
content: pubkey,
})
diff --git a/src/shared/notes/metadata.tsx b/src/shared/notes/metadata.tsx
index d850236f..d424bac3 100644
--- a/src/shared/notes/metadata.tsx
+++ b/src/shared/notes/metadata.tsx
@@ -8,8 +8,7 @@ import { useStorage } from '@libs/storage/provider';
import { LoaderIcon } from '@shared/icons';
import { MiniUser } from '@shared/notes/users/mini';
-import { widgetKinds } from '@stores/constants';
-import { useWidgets } from '@stores/widgets';
+import { WidgetKinds, useWidgets } from '@stores/widgets';
import { compactNumber } from '@utils/number';
@@ -54,7 +53,11 @@ export function NoteMetadata({ id }: { id: string }) {
return { replies, users, zap };
},
- { refetchOnWindowFocus: false, refetchOnReconnect: false, refetchOnMount: false }
+ {
+ enabled: !!ndk,
+ refetchOnWindowFocus: false,
+ refetchOnReconnect: false,
+ }
);
if (status === 'loading') {
@@ -68,6 +71,12 @@ export function NoteMetadata({ id }: { id: string }) {
);
}
+ if (status === 'error') {
+
;
+ }
+
return (
{data.replies > 0 ? (
@@ -86,7 +95,7 @@ export function NoteMetadata({ id }: { id: string }) {
type="button"
onClick={() =>
setWidget(db, {
- kind: widgetKinds.thread,
+ kind: WidgetKinds.thread,
title: 'Thread',
content: id,
})
diff --git a/src/stores/constants.tsx b/src/stores/constants.tsx
index d55e070f..d36ea84c 100644
--- a/src/stores/constants.tsx
+++ b/src/stores/constants.tsx
@@ -3,12 +3,3 @@ export const FULL_RELAYS = [
'wss://relay.nostr.band/all',
'wss://nostr.mutinywallet.com',
];
-
-export const widgetKinds = {
- image: 0,
- feed: 1,
- thread: 2,
- hashtag: 3,
- exchange_rate: 4,
- user: 5,
-};
diff --git a/src/stores/widgets.tsx b/src/stores/widgets.tsx
index b4fd37b6..74b29b38 100644
--- a/src/stores/widgets.tsx
+++ b/src/stores/widgets.tsx
@@ -12,6 +12,20 @@ interface WidgetState {
removeWidget: (db: LumeStorage, id: string) => void;
}
+export const WidgetKinds = {
+ feed: 1, // NIP-01
+ thread: 2, // NIP-01
+ hashtag: 3, // NIP-01
+ article: 4, // NIP-23
+ user: 5, // NIP-01
+ trendingProfiles: 6,
+ trendingNotes: 7,
+ file: 8, // NIP-94
+ network: 9999,
+ xfeed: 10000, // x is temporary state for new feed widget form
+ xhashtag: 10001, // x is temporary state for new hashtag widget form
+};
+
export const useWidgets = create()(
persist(
(set) => ({
@@ -25,7 +39,7 @@ export const useWidgets = create()(
id: '9999',
title: 'Network',
content: '',
- kind: 9999,
+ kind: WidgetKinds.network,
});
set({ widgets: dbWidgets });
diff --git a/src/utils/hooks/useEvent.tsx b/src/utils/hooks/useEvent.tsx
index fbfef0c7..55ddaa59 100644
--- a/src/utils/hooks/useEvent.tsx
+++ b/src/utils/hooks/useEvent.tsx
@@ -30,12 +30,17 @@ export function useEvent(id: string, embed?: string) {
} else {
// get event from relay if event in db not present
const event = await ndk.fetchEvent(id);
- if (event.kind === 1) richContent = parser(event);
+
+ if (!event) throw new Error(`Event not found: ${id}`);
+ if (event.kind === 1) {
+ richContent = parser(event);
+ }
return { event: event, richContent: richContent };
}
},
{
+ enabled: !!ndk,
staleTime: Infinity,
refetchOnMount: false,
refetchOnWindowFocus: false,
diff --git a/src/utils/hooks/useNostr.tsx b/src/utils/hooks/useNostr.tsx
index 7dd6ac4b..0631f84e 100644
--- a/src/utils/hooks/useNostr.tsx
+++ b/src/utils/hooks/useNostr.tsx
@@ -109,7 +109,7 @@ export function useNostr() {
const events = fetcher.allEventsIterator(
relayUrls,
{
- kinds: [1, 6],
+ kinds: [NDKKind.Text, NDKKind.Repost, 1063, NDKKind.Article],
authors: db.account.network,
},
{ since: since }
diff --git a/src/utils/hooks/useProfile.tsx b/src/utils/hooks/useProfile.tsx
index f3c7cc95..62f511c7 100644
--- a/src/utils/hooks/useProfile.tsx
+++ b/src/utils/hooks/useProfile.tsx
@@ -20,7 +20,7 @@ export function useProfile(pubkey: string, embed?: string) {
user.profile.display_name = user.profile.displayName;
return user.profile;
} else {
- throw new Error('User not found');
+ throw new Error(`User not found: ${pubkey}`);
}
} else {
const profile: NDKUserProfile = JSON.parse(embed);