-
{hashtag ? (
diff --git a/src/app/auth/create.tsx b/src/app/auth/create.tsx
index d5bad9ee..2011272e 100644
--- a/src/app/auth/create.tsx
+++ b/src/app/auth/create.tsx
@@ -45,6 +45,8 @@ export function CreateAccountScreen() {
const onSubmit = async (data: { name: string; about: string }) => {
try {
+ if (!ndk.signer) return navigate('/new/privkey');
+
setLoading(true);
const profile = {
diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx
index 45b31d63..a1da4b5b 100644
--- a/src/app/auth/import.tsx
+++ b/src/app/auth/import.tsx
@@ -165,7 +165,7 @@ export function ImportAccountScreen() {
>
Favorite hashtag
+Favorite topic
- By adding favorite hashtag, Lume will display all contents related to this - hashtag as a column + By adding favorite topic, Lume will display all contents related to this topic + for you
Account found
-
+
- Choose {tags.size}/3 your favorite hashtag + Choose your favorite topic
-
- {data.map((item: { hashtag: string }) => (
+
+ {TOPICS.map((item) => (
diff --git a/src/app/auth/onboarding/list.tsx b/src/app/auth/onboarding/list.tsx
index eee68853..76287728 100644
--- a/src/app/auth/onboarding/list.tsx
+++ b/src/app/auth/onboarding/list.tsx
@@ -31,7 +31,7 @@ export function OnboardingListScreen() {
-
+
+
You're almost ready to use Lume.
diff --git a/src/app/chats/components/message.tsx b/src/app/chats/components/message.tsx
index 3dedeac2..f12843c9 100644
--- a/src/app/chats/components/message.tsx
+++ b/src/app/chats/components/message.tsx
@@ -3,13 +3,8 @@ import { twMerge } from 'tailwind-merge';
import { useDecryptMessage } from '@app/chats/hooks/useDecryptMessage';
-import { ImagePreview, LinkPreview, MentionNote, VideoPreview } from '@shared/notes';
-
-import { parser } from '@utils/parser';
-
export function ChatMessage({ message, self }: { message: NDKEvent; self: boolean }) {
const decryptedContent = useDecryptMessage(message);
- const richContent = parser(decryptedContent) ?? null;
return (
- {!richContent ? (
+ {!decryptedContent ? (
Decrypting...
) : (
- {richContent.parsed}
-
- {richContent.images.length > 0 && {decryptedContent}
)}
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 8b667ec8..b3505668 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -1,85 +1,138 @@
-import { useEffect, useState } from 'react';
-import { useLocation, useRouteError } from 'react-router-dom';
+import { downloadDir } from '@tauri-apps/api/path';
+import { message, save } from '@tauri-apps/plugin-dialog';
+import { writeTextFile } from '@tauri-apps/plugin-fs';
+import { relaunch } from '@tauri-apps/plugin-process';
+import { useRouteError } from 'react-router-dom';
+
+import { useStorage } from '@libs/storage/provider';
interface RouteError {
statusText: string;
message: string;
}
-interface DebugInfo {
- os: null | string;
- appDir: null | string;
-}
-
export function ErrorScreen() {
+ const { db } = useStorage();
const error = useRouteError() as RouteError;
- const location = useLocation();
- const [debugInfo, setDebugInfo] = useState({
- os: null,
- appDir: null,
- });
+ const restart = async () => {
+ await relaunch();
+ };
- useEffect(() => {
- async function getInformation() {
- const { platform, version } = await import('@tauri-apps/plugin-os');
- const { appConfigDir } = await import('@tauri-apps/api/path');
-
- const platformName = await platform();
- const osVersion = await version();
- const appDir = await appConfigDir();
-
- setDebugInfo({
- os: platformName + ' ' + osVersion,
- appDir: appDir,
+ const download = async () => {
+ try {
+ const downloadPath = await downloadDir();
+ const fileName = `nostr_keys_${new Date().toISOString()}.txt`;
+ const filePath = await save({
+ defaultPath: downloadPath + '/' + fileName,
});
- }
+ const nsec = await db.secureLoad(db.account.pubkey);
- getInformation();
- }, []);
+ if (filePath) {
+ if (nsec) {
+ await writeTextFile(
+ filePath,
+ `Nostr account, generated by Lume (lume.nu)\nPublic key: ${db.account.id}\nPrivate key: ${nsec}`
+ );
+ } else {
+ await writeTextFile(
+ filePath,
+ `Nostr account, generated by Lume (lume.nu)\nPublic key: ${db.account.id}`
+ );
+ }
+ } // else { user cancel action }
+ } catch (e) {
+ await message(e, { title: 'Cannot download account keys', type: 'error' });
+ }
+ };
return (
-
-
+
+
-
+
Sorry, an unexpected error has occurred.
-
-
- {error.statusText || error.message}
-
-
-
-
- Current location: {location.pathname}
-
-
- Platform: {debugInfo.os}
-
-
+
+ Don't be panic, your account is safe.
+
+ Here are what things you can do:
+
-
-
- Click here to report the issue on GitHub
-
-
-
+
+
+
+ 1. Try close and re-open app
+
+
+
+
+
+ 2. Backup Nostr account
+
+
+
+
+
+
+
+ 3. Report this issue to Lume's Devs
+
+
+ Report
+
+
+
+
+ {error.statusText || error.message}
+
+
+
+
+
+
+
+ 4. Use other Nostr client
+
+
+
+ While waiting Lume's Devs release the bug fixes, you always can use
+ other Nostr client with your account:
+
+
+
+
+
diff --git a/src/app/explore/components/userLatestPosts.tsx b/src/app/explore/components/userLatestPosts.tsx
index 62b553c2..05a0d9fb 100644
--- a/src/app/explore/components/userLatestPosts.tsx
+++ b/src/app/explore/components/userLatestPosts.tsx
@@ -3,14 +3,7 @@ import { useQuery } from '@tanstack/react-query';
import { useCallback } from 'react';
import { LoaderIcon } from '@shared/icons';
-import {
- ArticleNote,
- FileNote,
- NoteWrapper,
- Repost,
- TextNote,
- UnknownNote,
-} from '@shared/notes';
+import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
import { useNostr } from '@utils/hooks/useNostr';
@@ -28,31 +21,11 @@ export function UserLatestPosts({ pubkey }: { pubkey: string }) {
(event: NDKEvent) => {
switch (event.kind) {
case NDKKind.Text:
- return (
-
-
- );
+ return
-
- );
- case NDKKind.Article:
- return (
-
-
- );
+ return
-
- );
+ return (null);
const [selectedIndex, setSelectedIndex] = useState(-1);
@@ -43,13 +39,13 @@ export function SpaceScreen() {
id: '9998',
title: 'Notification',
content: '',
- kind: WidgetKinds.local.notification,
+ kind: WIDGET_KIND.notification,
},
{
id: '9999',
title: 'Newsfeed',
content: '',
- kind: WidgetKinds.local.network,
+ kind: WIDGET_KIND.newsfeed,
},
];
@@ -63,36 +59,30 @@ export function SpaceScreen() {
const renderItem = useCallback((widget: Widget) => {
switch (widget.kind) {
- case WidgetKinds.local.feeds:
- return {
if (!ref.current) return;
switch (e.code) {
+ case 'ArrowUp':
case 'ArrowLeft': {
e.preventDefault();
const prevIndex = Math.max(selectedIndex - 1, 0);
@@ -126,6 +117,7 @@ export function SpaceScreen() {
});
break;
}
+ case 'ArrowDown':
case 'ArrowRight': {
e.preventDefault();
const nextIndex = Math.min(selectedIndex + 1, data.length - 1);
@@ -136,6 +128,8 @@ export function SpaceScreen() {
});
break;
}
+ default:
+ break;
}
}}
>
diff --git a/src/app/new/article.tsx b/src/app/new/article.tsx
index 38998e35..dad5c325 100644
--- a/src/app/new/article.tsx
+++ b/src/app/new/article.tsx
@@ -1,10 +1,11 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+import { NDKEvent, NDKKind, NDKTag } from '@nostr-dev-kit/ndk';
import CharacterCount from '@tiptap/extension-character-count';
import Image from '@tiptap/extension-image';
import Placeholder from '@tiptap/extension-placeholder';
import { EditorContent, FloatingMenu, useEditor } from '@tiptap/react';
import StarterKit from '@tiptap/starter-kit';
import { useMemo, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
import { twMerge } from 'tailwind-merge';
import { Markdown } from 'tiptap-markdown';
@@ -31,6 +32,7 @@ export function NewArticleScreen() {
const [summary, setSummary] = useState({ open: false, content: '' });
const [cover, setCover] = useState('');
+ const navigate = useNavigate();
const ident = useMemo(() => String(Date.now()), []);
const editor = useEditor({
extensions: [
@@ -65,13 +67,15 @@ export function NewArticleScreen() {
const submit = async () => {
try {
+ if (!ndk.signer) return navigate('/new/privkey');
+
setLoading(true);
// get markdown content
const content = editor.storage.markdown.getMarkdown();
// define tags
- const tags: string[][] = [
+ const tags: NDKTag[] = [
['d', ident],
['title', title],
['image', cover],
@@ -85,17 +89,20 @@ export function NewArticleScreen() {
tags.push(['t', tag.replace('#', '')]);
});
- // publish message
const event = new NDKEvent(ndk);
event.content = content;
event.kind = NDKKind.Article;
event.tags = tags;
+ // publish
const publishedRelays = await event.publish();
+
if (publishedRelays) {
toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+
// update state
setLoading(false);
+
// reset editor
editor.commands.clearContent();
localStorage.setItem('editor-article', '{}');
@@ -235,7 +242,7 @@ export function NewArticleScreen() {
- {editor?.storage?.characterCount.characters()}
+ {editor?.storage?.characterCount.characters()} characters
-
diff --git a/src/app/new/components/mentionPopupItem.tsx b/src/app/new/components/mentionPopupItem.tsx
index c2fa6614..d4e8f95d 100644
--- a/src/app/new/components/mentionPopupItem.tsx
+++ b/src/app/new/components/mentionPopupItem.tsx
@@ -1,5 +1,3 @@
-import { Image } from '@shared/image';
-
import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
@@ -20,7 +18,7 @@ export function MentionPopupItem({ pubkey, embed }: { pubkey: string; embed?: st
return (
- {
try {
+ if (!ndk.signer) return navigate('/new/privkey');
+
setIsPublish(true);
const event = new NDKEvent(ndk);
diff --git a/src/app/new/index.tsx b/src/app/new/index.tsx
deleted file mode 100644
index 945689f8..00000000
--- a/src/app/new/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Link, NavLink, Outlet } from 'react-router-dom';
-import { twMerge } from 'tailwind-merge';
-import { WindowTitlebar } from 'tauri-controls';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { ArrowLeftIcon } from '@shared/icons';
-
-export function NewScreen() {
- const { db } = useStorage();
-
- return (
-
- {db.platform !== 'macos' ? (
-
- twMerge(
- 'inline-flex h-9 w-20 items-center justify-center rounded-lg text-sm font-medium',
- isActive ? 'bg-white shadow dark:bg-black' : 'bg-transparent'
- )
- }
- >
- Post
-
-
- twMerge(
- 'inline-flex h-9 w-20 items-center justify-center rounded-lg text-sm font-medium',
- isActive ? 'bg-white shadow dark:bg-black' : 'bg-transparent'
- )
- }
- >
- Article
-
-
- twMerge(
- 'inline-flex h-9 w-28 items-center justify-center rounded-lg text-sm font-medium',
- isActive ? 'bg-white shadow dark:bg-black' : 'bg-transparent'
- )
- }
- >
- File Sharing
-
-
-
-
-
- {editor?.storage?.characterCount.characters()}
+ {editor?.storage?.characterCount.characters()} characters
diff --git a/src/app/new/privkey.tsx b/src/app/new/privkey.tsx
new file mode 100644
index 00000000..691d1b8a
--- /dev/null
+++ b/src/app/new/privkey.tsx
@@ -0,0 +1,86 @@
+import { NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
+import { getPublicKey, nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+export function NewPrivkeyScreen() {
+ const { db } = useStorage();
+ const { ndk } = useNDK();
+
+ const [nsec, setNsec] = useState('');
+ const navigate = useNavigate();
+
+ const save = async (content: string) => {
+ return await db.secureSave(db.account.pubkey, content);
+ };
+
+ const submit = async (isSave?: boolean) => {
+ try {
+ if (!nsec.startsWith('nsec1'))
+ return toast.info('You must enter a private key starts with nsec');
+
+ const decoded = nip19.decode(nsec);
+
+ if (decoded.type !== 'nsec') return toast.info('You must enter a valid nsec');
+
+ const privkey = decoded.data;
+ const pubkey = getPublicKey(privkey);
+
+ if (pubkey !== db.account.pubkey)
+ return toast.info(
+ 'Your nsec is not match your current public key, please make sure you enter right nsec'
+ );
+
+ const signer = new NDKPrivateKeySigner(privkey);
+ ndk.signer = signer;
+
+ if (isSave) await save(privkey);
+
+ navigate(-1);
+ } catch (e) {
+ toast.error(e);
+ }
+ };
+
+ return (
+
+
+
+ You need to provide private key to sign nostr event.
+
+ setNsec(e.target.value)}
+ spellCheck={false}
+ autoComplete="off"
+ autoCorrect="off"
+ autoCapitalize="off"
+ className="h-11 w-full rounded-lg bg-neutral-100 px-3 py-2 placeholder:text-neutral-500 dark:bg-neutral-900 dark:placeholder:text-neutral-400"
+ />
+
+
+
+
+
+
+ );
+}
diff --git a/src/app/notes/article.tsx b/src/app/notes/article.tsx
index 1d79ab3c..d4a1ba2b 100644
--- a/src/app/notes/article.tsx
+++ b/src/app/notes/article.tsx
@@ -1,27 +1,44 @@
import { writeText } from '@tauri-apps/plugin-clipboard-manager';
+import Markdown from 'markdown-to-jsx';
import { nip19 } from 'nostr-tools';
-import { AddressPointer, EventPointer } from 'nostr-tools/lib/types/nip19';
-import { useRef, useState } from 'react';
+import { EventPointer } from 'nostr-tools/lib/types/nip19';
+import { useMemo, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
-import { ArrowLeftIcon, CheckCircleIcon, ReplyIcon, ShareIcon } from '@shared/icons';
-import { ArticleDetailNote, NoteActions, NoteReplyForm } from '@shared/notes';
+import { ArrowLeftIcon, CheckCircleIcon, ShareIcon } from '@shared/icons';
+import { NoteReplyForm } from '@shared/notes';
import { ReplyList } from '@shared/notes/replies/list';
-import { User } from '@shared/user';
import { useEvent } from '@utils/hooks/useEvent';
export function ArticleNoteScreen() {
const { id } = useParams();
-
- const navigate = useNavigate();
- const replyRef = useRef(null);
-
- const naddr = id.startsWith('naddr') ? (nip19.decode(id).data as AddressPointer) : null;
- const { status, data } = useEvent(id, naddr);
+ const { status, data } = useEvent(id);
const [isCopy, setIsCopy] = useState(false);
+ const navigate = useNavigate();
+ const metadata = useMemo(() => {
+ if (status === 'pending') return;
+
+ const title = data.tags.find((tag) => tag[0] === 'title')?.[1];
+ const image = data.tags.find((tag) => tag[0] === 'image')?.[1];
+ const summary = data.tags.find((tag) => tag[0] === 'summary')?.[1];
+
+ let publishedAt: Date | string | number = data.tags.find(
+ (tag) => tag[0] === 'published_at'
+ )?.[1];
+
+ publishedAt = new Date(parseInt(publishedAt) * 1000).toLocaleDateString('en-US');
+
+ return {
+ title,
+ image,
+ publishedAt,
+ summary,
+ };
+ }, [data]);
+
const share = async () => {
await writeText(
'https://njump.me/' +
@@ -33,69 +50,72 @@ export function ArticleNoteScreen() {
setTimeout(() => setIsCopy(false), 2000);
};
- const scrollToReply = () => {
- replyRef.current.scrollIntoView();
- };
-
return (
-
-
-
-
-
-
-
-
-
-
-
-
- {status === 'pending' ? (
- Loading...
+
+
+
+
)}
- Contact Manager
-
-
-
- {status === 'pending' ? (
-
- Edit Profile
-
-
-
-
-
-
- );
-}
diff --git a/src/app/personal/index.tsx b/src/app/personal/index.tsx
deleted file mode 100644
index d84191e7..00000000
--- a/src/app/personal/index.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ContactCard } from '@app/personal/components/contactCard';
-import { PostCard } from '@app/personal/components/postCard';
-import { ProfileCard } from '@app/personal/components/profileCard';
-import { RelayCard } from '@app/personal/components/relayCard';
-import { ZapCard } from '@app/personal/components/zapCard';
-
-export function PersonalScreen() {
- return (
-
-
-
- Personal Dashboard
-
-
-
-
-
- );
+ return
-
- );
- case NDKKind.Article:
- return (
-
-
- );
+ return
-
- );
+ return
{status === 'pending' ? (
@@ -78,13 +51,9 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
) : (
-
-
- {data.map((item) => renderItem(item))}
-
-
+ data.map((item) => renderItem(item))
)}
-
+
);
}
diff --git a/src/app/relays/components/relayList.tsx b/src/app/relays/components/relayList.tsx
index e92221e4..cc77ef51 100644
--- a/src/app/relays/components/relayList.tsx
+++ b/src/app/relays/components/relayList.tsx
@@ -56,7 +56,7 @@ export function RelayList() {
- All relays used by your follows
+ All relays
{[...data].map(([key, value]) => (
diff --git a/src/app/relays/components/userRelay.tsx b/src/app/relays/components/userRelay.tsx
index 9c8e97ea..eb901402 100644
--- a/src/app/relays/components/userRelay.tsx
+++ b/src/app/relays/components/userRelay.tsx
@@ -36,7 +36,7 @@ export function UserRelay() {
{data.map((item) => (
- {!richContent ? (
+ {!decryptedContent ? (
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 8b667ec8..b3505668 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -1,85 +1,138 @@
-import { useEffect, useState } from 'react';
-import { useLocation, useRouteError } from 'react-router-dom';
+import { downloadDir } from '@tauri-apps/api/path';
+import { message, save } from '@tauri-apps/plugin-dialog';
+import { writeTextFile } from '@tauri-apps/plugin-fs';
+import { relaunch } from '@tauri-apps/plugin-process';
+import { useRouteError } from 'react-router-dom';
+
+import { useStorage } from '@libs/storage/provider';
interface RouteError {
statusText: string;
message: string;
}
-interface DebugInfo {
- os: null | string;
- appDir: null | string;
-}
-
export function ErrorScreen() {
+ const { db } = useStorage();
const error = useRouteError() as RouteError;
- const location = useLocation();
- const [debugInfo, setDebugInfo] = useStateDecrypting...
) : (
-
)}
{richContent.parsed}
-
- {richContent.images.length > 0 &&
+ {decryptedContent}
-
+
+
diff --git a/src/app/explore/components/userLatestPosts.tsx b/src/app/explore/components/userLatestPosts.tsx
index 62b553c2..05a0d9fb 100644
--- a/src/app/explore/components/userLatestPosts.tsx
+++ b/src/app/explore/components/userLatestPosts.tsx
@@ -3,14 +3,7 @@ import { useQuery } from '@tanstack/react-query';
import { useCallback } from 'react';
import { LoaderIcon } from '@shared/icons';
-import {
- ArticleNote,
- FileNote,
- NoteWrapper,
- Repost,
- TextNote,
- UnknownNote,
-} from '@shared/notes';
+import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
import { useNostr } from '@utils/hooks/useNostr';
@@ -28,31 +21,11 @@ export function UserLatestPosts({ pubkey }: { pubkey: string }) {
(event: NDKEvent) => {
switch (event.kind) {
case NDKKind.Text:
- return (
-
-
- );
+ return
-
- );
- case NDKKind.Article:
- return (
-
-
- );
+ return
-
- );
+ return (null);
const [selectedIndex, setSelectedIndex] = useState(-1);
@@ -43,13 +39,13 @@ export function SpaceScreen() {
id: '9998',
title: 'Notification',
content: '',
- kind: WidgetKinds.local.notification,
+ kind: WIDGET_KIND.notification,
},
{
id: '9999',
title: 'Newsfeed',
content: '',
- kind: WidgetKinds.local.network,
+ kind: WIDGET_KIND.newsfeed,
},
];
@@ -63,36 +59,30 @@ export function SpaceScreen() {
const renderItem = useCallback((widget: Widget) => {
switch (widget.kind) {
- case WidgetKinds.local.feeds:
- return
-
+
-
+
Sorry, an unexpected error has occurred.
-
-
- {error.statusText || error.message}
-
-
-
-
- Current location: {location.pathname}
-
-
- Platform: {debugInfo.os}
-
-
+
+ Don't be panic, your account is safe.
+
+ Here are what things you can do:
+
- {error.statusText || error.message} -
-- Current location: {location.pathname} -
-- Platform: {debugInfo.os} -
-+ Here are what things you can do: +
-
- Click here to report the issue on GitHub
-
-
-
+
+
+
+
+ 1. Try close and re-open app
+
+
+
+
+
+ 2. Backup Nostr account
+
+
+
+
+
+
+
+
+
+ 3. Report this issue to Lume's Devs
+
+
+ Report
+
+
+
+ + {error.statusText || error.message} +
+
+
+
+
+ 4. Use other Nostr client
+
+
+
+ + While waiting Lume's Devs release the bug fixes, you always can use + other Nostr client with your account: +
+ +
+
{
if (!ref.current) return;
switch (e.code) {
+ case 'ArrowUp':
case 'ArrowLeft': {
e.preventDefault();
const prevIndex = Math.max(selectedIndex - 1, 0);
@@ -126,6 +117,7 @@ export function SpaceScreen() {
});
break;
}
+ case 'ArrowDown':
case 'ArrowRight': {
e.preventDefault();
const nextIndex = Math.min(selectedIndex + 1, data.length - 1);
@@ -136,6 +128,8 @@ export function SpaceScreen() {
});
break;
}
+ default:
+ break;
}
}}
>
diff --git a/src/app/new/article.tsx b/src/app/new/article.tsx
index 38998e35..dad5c325 100644
--- a/src/app/new/article.tsx
+++ b/src/app/new/article.tsx
@@ -1,10 +1,11 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+import { NDKEvent, NDKKind, NDKTag } from '@nostr-dev-kit/ndk';
import CharacterCount from '@tiptap/extension-character-count';
import Image from '@tiptap/extension-image';
import Placeholder from '@tiptap/extension-placeholder';
import { EditorContent, FloatingMenu, useEditor } from '@tiptap/react';
import StarterKit from '@tiptap/starter-kit';
import { useMemo, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
import { twMerge } from 'tailwind-merge';
import { Markdown } from 'tiptap-markdown';
@@ -31,6 +32,7 @@ export function NewArticleScreen() {
const [summary, setSummary] = useState({ open: false, content: '' });
const [cover, setCover] = useState('');
+ const navigate = useNavigate();
const ident = useMemo(() => String(Date.now()), []);
const editor = useEditor({
extensions: [
@@ -65,13 +67,15 @@ export function NewArticleScreen() {
const submit = async () => {
try {
+ if (!ndk.signer) return navigate('/new/privkey');
+
setLoading(true);
// get markdown content
const content = editor.storage.markdown.getMarkdown();
// define tags
- const tags: string[][] = [
+ const tags: NDKTag[] = [
['d', ident],
['title', title],
['image', cover],
@@ -85,17 +89,20 @@ export function NewArticleScreen() {
tags.push(['t', tag.replace('#', '')]);
});
- // publish message
const event = new NDKEvent(ndk);
event.content = content;
event.kind = NDKKind.Article;
event.tags = tags;
+ // publish
const publishedRelays = await event.publish();
+
if (publishedRelays) {
toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+
// update state
setLoading(false);
+
// reset editor
editor.commands.clearContent();
localStorage.setItem('editor-article', '{}');
@@ -235,7 +242,7 @@ export function NewArticleScreen() {
- {editor?.storage?.characterCount.characters()}
+ {editor?.storage?.characterCount.characters()} characters
-
diff --git a/src/app/new/components/mentionPopupItem.tsx b/src/app/new/components/mentionPopupItem.tsx
index c2fa6614..d4e8f95d 100644
--- a/src/app/new/components/mentionPopupItem.tsx
+++ b/src/app/new/components/mentionPopupItem.tsx
@@ -1,5 +1,3 @@
-import { Image } from '@shared/image';
-
import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
@@ -20,7 +18,7 @@ export function MentionPopupItem({ pubkey, embed }: { pubkey: string; embed?: st
return (
- {
try {
+ if (!ndk.signer) return navigate('/new/privkey');
+
setIsPublish(true);
const event = new NDKEvent(ndk);
diff --git a/src/app/new/index.tsx b/src/app/new/index.tsx
deleted file mode 100644
index 945689f8..00000000
--- a/src/app/new/index.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Link, NavLink, Outlet } from 'react-router-dom';
-import { twMerge } from 'tailwind-merge';
-import { WindowTitlebar } from 'tauri-controls';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { ArrowLeftIcon } from '@shared/icons';
-
-export function NewScreen() {
- const { db } = useStorage();
-
- return (
-
- {db.platform !== 'macos' ? (
-
- );
-}
diff --git a/src/app/new/post.tsx b/src/app/new/post.tsx
index afb92439..532bcd65 100644
--- a/src/app/new/post.tsx
+++ b/src/app/new/post.tsx
@@ -6,7 +6,7 @@ import { EditorContent, useEditor } from '@tiptap/react';
import StarterKit from '@tiptap/starter-kit';
import { convert } from 'html-to-text';
import { useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
import { toast } from 'sonner';
import { MediaUploader, MentionPopup } from '@app/new/components';
@@ -16,12 +16,18 @@ import { useNDK } from '@libs/ndk/provider';
import { CancelIcon, LoaderIcon } from '@shared/icons';
import { MentionNote } from '@shared/notes';
+import { WIDGET_KIND } from '@stores/constants';
+
+import { useWidget } from '@utils/hooks/useWidget';
+
export function NewPostScreen() {
- const { ndk, relayUrls } = useNDK();
+ const { ndk } = useNDK();
+ const { addWidget } = useWidget();
const [loading, setLoading] = useState(false);
const [searchParams, setSearchParams] = useSearchParams();
+ const navigate = useNavigate();
const editor = useEditor({
extensions: [
StarterKit.configure(),
@@ -49,13 +55,9 @@ export function NewPostScreen() {
const submit = async () => {
try {
- setLoading(true);
+ if (!ndk.signer) return navigate('/new/privkey');
- const reply = {
- id: searchParams.get('id'),
- root: searchParams.get('root'),
- pubkey: searchParams.get('pubkey'),
- };
+ setLoading(true);
// get plaintext content
const html = editor.getHTML();
@@ -66,47 +68,44 @@ export function NewPostScreen() {
],
});
- // define tags
- let tags: string[][] = [];
-
- // add reply to tags if present
- if (reply.id && reply.pubkey) {
- if (reply.root && reply.root.length > 1) {
- tags = [
- ['e', reply.root, relayUrls[0], 'root'],
- ['e', reply.id, relayUrls[0], 'reply'],
- ['p', reply.pubkey],
- ];
- } else {
- tags = [
- ['e', reply.id, relayUrls[0], 'reply'],
- ['p', reply.pubkey],
- ];
- }
- }
-
- // add hashtag to tags if present
- const hashtags = serializedContent
- .split(/\s/gm)
- .filter((s: string) => s.startsWith('#'));
-
- hashtags?.forEach((tag: string) => {
- tags.push(['t', tag.replace('#', '')]);
- });
-
- // publish message
const event = new NDKEvent(ndk);
event.content = serializedContent;
event.kind = NDKKind.Text;
- event.tags = tags;
+ // add reply to tags if present
+ const replyTo = searchParams.get('replyTo');
+ const rootReplyTo = searchParams.get('rootReplyTo');
+
+ if (rootReplyTo) {
+ const rootEvent = await ndk.fetchEvent(rootReplyTo);
+ event.tag(rootEvent, 'root');
+ }
+
+ if (replyTo) {
+ const replyEvent = await ndk.fetchEvent(replyTo);
+ event.tag(replyEvent, 'reply');
+ }
+
+ // publish event
const publishedRelays = await event.publish();
+
if (publishedRelays) {
toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+
// update state
setLoading(false);
- // reset editor
setSearchParams({});
+
+ // open new widget with this event id
+ if (!replyTo) {
+ addWidget.mutate({
+ title: 'Thread',
+ content: event.id,
+ kind: WIDGET_KIND.thread,
+ });
+ }
+
+ // reset editor
editor.commands.clearContent();
localStorage.setItem('editor-post', '{}');
}
@@ -130,22 +129,22 @@ export function NewPostScreen() {
autoCorrect="off"
autoCapitalize="off"
/>
- {searchParams.get('id') && (
+ {searchParams.get('replyTo') && (
-
-
-
-
-
-
-
-
-
-
-
-
-
- twMerge(
- 'inline-flex h-9 w-20 items-center justify-center rounded-lg text-sm font-medium',
- isActive ? 'bg-white shadow dark:bg-black' : 'bg-transparent'
- )
- }
- >
- Post
-
-
- twMerge(
- 'inline-flex h-9 w-20 items-center justify-center rounded-lg text-sm font-medium',
- isActive ? 'bg-white shadow dark:bg-black' : 'bg-transparent'
- )
- }
- >
- Article
-
-
- twMerge(
- 'inline-flex h-9 w-28 items-center justify-center rounded-lg text-sm font-medium',
- isActive ? 'bg-white shadow dark:bg-black' : 'bg-transparent'
- )
- }
- >
- File Sharing
-
-
-
-
-
-
)}
- {editor?.storage?.characterCount.characters()}
+ {editor?.storage?.characterCount.characters()} characters
diff --git a/src/app/new/privkey.tsx b/src/app/new/privkey.tsx
new file mode 100644
index 00000000..691d1b8a
--- /dev/null
+++ b/src/app/new/privkey.tsx
@@ -0,0 +1,86 @@
+import { NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
+import { getPublicKey, nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+export function NewPrivkeyScreen() {
+ const { db } = useStorage();
+ const { ndk } = useNDK();
+
+ const [nsec, setNsec] = useState('');
+ const navigate = useNavigate();
+
+ const save = async (content: string) => {
+ return await db.secureSave(db.account.pubkey, content);
+ };
+
+ const submit = async (isSave?: boolean) => {
+ try {
+ if (!nsec.startsWith('nsec1'))
+ return toast.info('You must enter a private key starts with nsec');
+
+ const decoded = nip19.decode(nsec);
+
+ if (decoded.type !== 'nsec') return toast.info('You must enter a valid nsec');
+
+ const privkey = decoded.data;
+ const pubkey = getPublicKey(privkey);
+
+ if (pubkey !== db.account.pubkey)
+ return toast.info(
+ 'Your nsec is not match your current public key, please make sure you enter right nsec'
+ );
+
+ const signer = new NDKPrivateKeySigner(privkey);
+ ndk.signer = signer;
+
+ if (isSave) await save(privkey);
+
+ navigate(-1);
+ } catch (e) {
+ toast.error(e);
+ }
+ };
+
+ return (
+
+
+ );
+}
diff --git a/src/app/notes/article.tsx b/src/app/notes/article.tsx
index 1d79ab3c..d4a1ba2b 100644
--- a/src/app/notes/article.tsx
+++ b/src/app/notes/article.tsx
@@ -1,27 +1,44 @@
import { writeText } from '@tauri-apps/plugin-clipboard-manager';
+import Markdown from 'markdown-to-jsx';
import { nip19 } from 'nostr-tools';
-import { AddressPointer, EventPointer } from 'nostr-tools/lib/types/nip19';
-import { useRef, useState } from 'react';
+import { EventPointer } from 'nostr-tools/lib/types/nip19';
+import { useMemo, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
-import { ArrowLeftIcon, CheckCircleIcon, ReplyIcon, ShareIcon } from '@shared/icons';
-import { ArticleDetailNote, NoteActions, NoteReplyForm } from '@shared/notes';
+import { ArrowLeftIcon, CheckCircleIcon, ShareIcon } from '@shared/icons';
+import { NoteReplyForm } from '@shared/notes';
import { ReplyList } from '@shared/notes/replies/list';
-import { User } from '@shared/user';
import { useEvent } from '@utils/hooks/useEvent';
export function ArticleNoteScreen() {
const { id } = useParams();
-
- const navigate = useNavigate();
- const replyRef = useRef(null);
-
- const naddr = id.startsWith('naddr') ? (nip19.decode(id).data as AddressPointer) : null;
- const { status, data } = useEvent(id, naddr);
+ const { status, data } = useEvent(id);
const [isCopy, setIsCopy] = useState(false);
+ const navigate = useNavigate();
+ const metadata = useMemo(() => {
+ if (status === 'pending') return;
+
+ const title = data.tags.find((tag) => tag[0] === 'title')?.[1];
+ const image = data.tags.find((tag) => tag[0] === 'image')?.[1];
+ const summary = data.tags.find((tag) => tag[0] === 'summary')?.[1];
+
+ let publishedAt: Date | string | number = data.tags.find(
+ (tag) => tag[0] === 'published_at'
+ )?.[1];
+
+ publishedAt = new Date(parseInt(publishedAt) * 1000).toLocaleDateString('en-US');
+
+ return {
+ title,
+ image,
+ publishedAt,
+ summary,
+ };
+ }, [data]);
+
const share = async () => {
await writeText(
'https://njump.me/' +
@@ -33,69 +50,72 @@ export function ArticleNoteScreen() {
setTimeout(() => setIsCopy(false), 2000);
};
- const scrollToReply = () => {
- replyRef.current.scrollIntoView();
- };
-
return (
-
+
+ + You need to provide private key to sign nostr event. +
+ setNsec(e.target.value)} + spellCheck={false} + autoComplete="off" + autoCorrect="off" + autoCapitalize="off" + className="h-11 w-full rounded-lg bg-neutral-100 px-3 py-2 placeholder:text-neutral-500 dark:bg-neutral-900 dark:placeholder:text-neutral-400" + /> +
+
+
+
+
-
-
- );
+ return
-
- );
- case NDKKind.Article:
- return (
-
-
- );
+ return
-
- );
+ return
{[...data].map(([key, value]) => (
diff --git a/src/app/relays/components/userRelay.tsx b/src/app/relays/components/userRelay.tsx
index 9c8e97ea..eb901402 100644
--- a/src/app/relays/components/userRelay.tsx
+++ b/src/app/relays/components/userRelay.tsx
@@ -36,7 +36,7 @@ export function UserRelay() {
{data.map((item) => (
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/personal/editContact.tsx b/src/app/personal/editContact.tsx
deleted file mode 100644
index 3cb871f1..00000000
--- a/src/app/personal/editContact.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { Link } from 'react-router-dom';
-
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
-
-import { ArrowLeftIcon, LoaderIcon } from '@shared/icons';
-import { User } from '@shared/user';
-
-export function EditContactScreen() {
- const { db } = useStorage();
- const { ndk } = useNDK();
- const { status, data } = useQuery({
- queryKey: ['contacts'],
- queryFn: async () => {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
-
- const follows = await user.follows();
- return [...follows];
- },
- refetchOnWindowFocus: false,
- });
-
- return (
-
- {status === 'pending' ? (
-
Loading...
+
+
)}
+
+
-
-
-
- );
-}
diff --git a/src/app/personal/editProfile.tsx b/src/app/personal/editProfile.tsx
deleted file mode 100644
index 8d2d1a5d..00000000
--- a/src/app/personal/editProfile.tsx
+++ /dev/null
@@ -1,323 +0,0 @@
-import { NDKEvent, NDKKind, NDKUserProfile } from '@nostr-dev-kit/ndk';
-import { useQueryClient } from '@tanstack/react-query';
-import { message } from '@tauri-apps/plugin-dialog';
-import { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { Link } from 'react-router-dom';
-
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
-
-import {
- ArrowLeftIcon,
- CheckCircleIcon,
- LoaderIcon,
- PlusIcon,
- UnverifiedIcon,
-} from '@shared/icons';
-
-import { useNostr } from '@utils/hooks/useNostr';
-
-export function EditProfileScreen() {
- const queryClient = useQueryClient();
-
- const [loading, setLoading] = useState(false);
- const [picture, setPicture] = useState('');
- const [banner, setBanner] = useState('');
- const [nip05, setNIP05] = useState({ verified: true, text: '' });
-
- const { db } = useStorage();
- const { ndk } = useNDK();
- const { upload } = useNostr();
- const {
- register,
- handleSubmit,
- reset,
- setError,
- formState: { isValid, errors },
- } = useForm({
- defaultValues: async () => {
- const res: NDKUserProfile = queryClient.getQueryData(['user', db.account.pubkey]);
- if (res.image) {
- setPicture(res.image);
- }
- if (res.banner) {
- setBanner(res.banner);
- }
- if (res.nip05) {
- setNIP05((prev) => ({ ...prev, text: res.nip05 }));
- }
- return res;
- },
- });
-
- const uploadAvatar = async () => {
- try {
- setLoading(true);
-
- const image = await upload();
-
- if (image) {
- setPicture(image);
- setLoading(false);
- }
- } catch (e) {
- setLoading(false);
- await message(`Upload failed, error: ${e}`, { title: 'Lume', type: 'error' });
- }
- };
-
- const uploadBanner = async () => {
- try {
- setLoading(true);
-
- const image = await upload();
-
- if (image) {
- setBanner(image);
- setLoading(false);
- }
- } catch (e) {
- setLoading(false);
- await message(`Upload failed, error: ${e}`, { title: 'Lume', type: 'error' });
- }
- };
-
- const onSubmit = async (data: NDKUserProfile) => {
- // start loading
- setLoading(true);
-
- const content = {
- ...data,
- username: data.name,
- display_name: data.name,
- bio: data.about,
- image: data.picture,
- };
-
- const event = new NDKEvent(ndk);
- event.kind = NDKKind.Metadata;
- event.tags = [];
-
- if (data.nip05) {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const verify = await user.validateNip05(data.nip05);
- if (verify) {
- event.content = JSON.stringify({ ...content, nip05: data.nip05 });
- } else {
- setNIP05((prev) => ({ ...prev, verified: false }));
- setError('nip05', {
- type: 'manual',
- message: "Can't verify your Lume ID / NIP-05, please check again",
- });
- }
- } else {
- event.content = JSON.stringify(content);
- }
-
- const publishedRelays = await event.publish();
-
- if (publishedRelays) {
- // invalid cache
- queryClient.invalidateQueries({
- queryKey: ['user', db.account.pubkey],
- });
- // reset form
- reset();
- // reset state
- setLoading(false);
- setPicture(null);
- setBanner(null);
- } else {
- setLoading(false);
- }
- };
-
- return (
-
-
-
- Contact Manager
- -
- {status === 'pending' ? (
-
-
-
- ) : (
- data.map((item) => (
-
-
- ))
- )}
-
-
- );
-}
diff --git a/src/app/personal/index.tsx b/src/app/personal/index.tsx
deleted file mode 100644
index d84191e7..00000000
--- a/src/app/personal/index.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ContactCard } from '@app/personal/components/contactCard';
-import { PostCard } from '@app/personal/components/postCard';
-import { ProfileCard } from '@app/personal/components/profileCard';
-import { RelayCard } from '@app/personal/components/relayCard';
-import { ZapCard } from '@app/personal/components/zapCard';
-
-export function PersonalScreen() {
- return (
-
-
-
- Edit Profile
- -
-
-
-
-
- );
-}
diff --git a/src/app/relays/components/relayEventList.tsx b/src/app/relays/components/relayEventList.tsx
index 399e1666..4f360059 100644
--- a/src/app/relays/components/relayEventList.tsx
+++ b/src/app/relays/components/relayEventList.tsx
@@ -6,27 +6,20 @@ import { VList } from 'virtua';
import { useNDK } from '@libs/ndk/provider';
import { LoaderIcon } from '@shared/icons';
-import {
- ArticleNote,
- FileNote,
- NoteWrapper,
- Repost,
- TextNote,
- UnknownNote,
-} from '@shared/notes';
+import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
export function RelayEventList({ relayUrl }: { relayUrl: string }) {
const { fetcher } = useNDK();
const { status, data } = useQuery({
- queryKey: ['relay-event'],
+ queryKey: ['relay-events', relayUrl],
queryFn: async () => {
const url = 'wss://' + relayUrl;
const events = await fetcher.fetchLatestEvents(
[url],
{
- kinds: [NDKKind.Text, NDKKind.Repost, 1063, NDKKind.Article],
+ kinds: [NDKKind.Text, NDKKind.Repost],
},
- 100
+ 20
);
return events as unknown as NDKEvent[];
},
@@ -37,31 +30,11 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
(event: NDKEvent) => {
switch (event.kind) {
case NDKKind.Text:
- return (
-
-
-
- Personal Dashboard
- -
-
-
-
-
-
);
}
diff --git a/src/app/relays/components/relayList.tsx b/src/app/relays/components/relayList.tsx
index e92221e4..cc77ef51 100644
--- a/src/app/relays/components/relayList.tsx
+++ b/src/app/relays/components/relayList.tsx
@@ -56,7 +56,7 @@ export function RelayList() {
+
{status === 'pending' ? (
) : (
-
-
- {data.map((item) => renderItem(item))}
-
-
+ data.map((item) => renderItem(item))
)}
-
+
@@ -78,13 +51,9 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
+