- {children}
-
- );
-};
-
-const Mention = ({ attributes, element }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
-
- return (
- Transforms.removeNodes(editor, { at: path })}
- className="inline-block align-baseline text-blue-500 hover:text-blue-600"
- >{`@${element.name}`}
- );
-};
-
-const Event = ({ attributes, element, children }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
-
- return (
-
- 
-
-
-
- {children}
- {/* biome-ignore lint/a11y/useKeyWithClickEvents: */}
-
- );
-};
-
-const Element = (props) => {
- const { attributes, children, element } = props;
-
- switch (element.type) {
- case "image":
- return Transforms.removeNodes(editor, { at: path })}
- className="user-select-none relative my-2"
- >
-
- - {children} -
- ); - } -}; - -export function EditorForm() { - const ref = useRef
- {
- const { selection } = editor;
-
- if (selection && Range.isCollapsed(selection)) {
- const [start] = Range.edges(selection);
- const wordBefore = Editor.before(editor, start, { unit: "word" });
- const before = wordBefore && Editor.before(editor, wordBefore);
- const beforeRange = before && Editor.range(editor, before, start);
- const beforeText =
- beforeRange && Editor.string(editor, beforeRange);
- const beforeMatch = beforeText?.match(/^@(\w+)$/);
- const after = Editor.after(editor, start);
- const afterRange = Editor.range(editor, start, after);
- const afterText = Editor.string(editor, afterRange);
- const afterMatch = afterText.match(/^(\s|$)/);
-
- if (beforeMatch && afterMatch) {
- setTarget(beforeRange);
- setSearch(beforeMatch[1]);
- setIndex(0);
- return;
- }
- }
-
- setTarget(null);
- }}
- >
-
-
- );
-}
diff --git a/packages/ui/src/editor/replyForm.tsx b/packages/ui/src/editor/replyForm.tsx
deleted file mode 100644
index 30e6c529..00000000
--- a/packages/ui/src/editor/replyForm.tsx
+++ /dev/null
@@ -1,403 +0,0 @@
-import { LoaderIcon, TrashIcon } from "@lume/icons";
-import { useStorage } from "@lume/storage";
-import { NDKCacheUserProfile } from "@lume/types";
-import { cn } from "@lume/utils";
-import { NDKEvent, NDKKind } from "@nostr-dev-kit/ndk";
-import { Portal } from "@radix-ui/react-dropdown-menu";
-import { useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
- Descendant,
- Editor,
- Node,
- Range,
- Transforms,
- createEditor,
-} from "slate";
-import {
- Editable,
- ReactEditor,
- Slate,
- useFocused,
- useSelected,
- useSlateStatic,
- withReact,
-} from "slate-react";
-import { toast } from "sonner";
-import { EditorAddMedia } from "./addMedia";
-import {
- insertImage,
- insertMention,
- insertNostrEvent,
- isImageUrl,
-} from "./utils";
-import { MentionNote } from "../note/mentions/note";
-import { useArk } from "@lume/ark";
-import { User } from "../user";
-
-const withNostrEvent = (editor: ReactEditor) => {
- const { insertData, isVoid } = editor;
-
- editor.isVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "event" ? true : isVoid(element);
- };
-
- editor.insertData = (data) => {
- const text = data.getData("text/plain");
-
- if (text.startsWith("nevent1") || text.startsWith("note1")) {
- insertNostrEvent(editor, text);
- } else {
- insertData(data);
- }
- };
-
- return editor;
-};
-
-const withMentions = (editor: ReactEditor) => {
- const { isInline, isVoid, markableVoid } = editor;
-
- editor.isInline = (element) => {
- // @ts-expect-error, wtf
- return element.type === "mention" ? true : isInline(element);
- };
-
- editor.isVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "mention" ? true : isVoid(element);
- };
-
- editor.markableVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "mention" || markableVoid(element);
- };
-
- return editor;
-};
-
-const withImages = (editor: ReactEditor) => {
- const { insertData, isVoid } = editor;
-
- editor.isVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "image" ? true : isVoid(element);
- };
-
- editor.insertData = (data) => {
- const text = data.getData("text/plain");
-
- if (isImageUrl(text)) {
- insertImage(editor, text);
- } else {
- insertData(data);
- }
- };
-
- return editor;
-};
-
-const Image = ({ attributes, children, element }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
-
- const selected = useSelected();
- const focused = useFocused();
-
- return (
-
-
-
-
- {t("editor.title")}
-
-
-
-
-
-
-
-
-
- )}
-
-
- {filters.map((contact, i) => (
-
- ))}
-
-
- {children}
-
- );
-};
-
-const Mention = ({ attributes, element }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
-
- return (
- Transforms.removeNodes(editor, { at: path })}
- className="inline-block align-baseline text-blue-500 hover:text-blue-600"
- >{`@${element.name}`}
- );
-};
-
-const Event = ({ attributes, element, children }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
-
- return (
-
-
-
-
-
- {children}
- {/* biome-ignore lint/a11y/useKeyWithClickEvents: */}
-
- );
-};
-
-const Element = (props) => {
- const { attributes, children, element } = props;
-
- switch (element.type) {
- case "image":
- return Transforms.removeNodes(editor, { at: path })}
- className="user-select-none relative"
- >
-
- - {children} -
- ); - } -}; - -export function ReplyForm({ - eventId, - className, -}: { - eventId: string; - className?: string; -}) { - const ark = useArk(); - const storage = useStorage(); - const ref = useRef
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/editor/utils.ts b/packages/ui/src/editor/utils.ts
deleted file mode 100644
index 5bf9e946..00000000
--- a/packages/ui/src/editor/utils.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { ReactNode } from "react";
-import ReactDOM from "react-dom";
-import { BaseEditor, Transforms } from "slate";
-import { ReactEditor } from "slate-react";
-
-export const Portal = ({ children }: { children?: ReactNode }) => {
- return typeof document === "object"
- ? ReactDOM.createPortal(children, document.body)
- : null;
-};
-
-export const isImageUrl = (url: string) => {
- try {
- if (!url) return false;
- const ext = new URL(url).pathname.split(".").pop();
- return ["jpg", "jpeg", "gif", "png", "webp", "avif", "tiff"].includes(ext);
- } catch {
- return false;
- }
-};
-
-export const insertImage = (editor: ReactEditor | BaseEditor, url: string) => {
- const text = { text: "" };
- const image = [
- {
- type: "image",
- url,
- children: [text],
- },
- ];
- const extraText = [
- {
- type: "paragraph",
- children: [text],
- },
- ];
-
- // @ts-ignore, idk
- ReactEditor.focus(editor);
- Transforms.insertNodes(editor, image);
- Transforms.insertNodes(editor, extraText);
-};
-
-export const insertMention = (
- editor: ReactEditor | BaseEditor,
- contact: NDKCacheUserProfile,
-) => {
- const text = { text: "" };
- const mention = {
- type: "mention",
- npub: `nostr:${contact.npub}`,
- name: contact.name || contact.displayName || "anon",
- children: [text],
- };
- const extraText = [
- {
- type: "paragraph",
- children: [text],
- },
- ];
-
- // @ts-ignore, idk
- ReactEditor.focus(editor);
- Transforms.insertNodes(editor, mention);
- Transforms.insertNodes(editor, extraText);
-};
-
-export const insertNostrEvent = (
- editor: ReactEditor | BaseEditor,
- eventId: string,
-) => {
- const text = { text: "" };
- const event = [
- {
- type: "event",
- eventId: `nostr:${eventId}`,
- children: [text],
- },
- ];
- const extraText = [
- {
- type: "paragraph",
- children: [text],
- },
- ];
-
- Transforms.insertNodes(editor, event);
- Transforms.insertNodes(editor, extraText);
-};
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index 3203cdce..f9213137 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -2,12 +2,4 @@
export * from "./user";
export * from "./note";
export * from "./column";
-
-// Deprecated
-export * from "./routes/event";
-export * from "./routes/user";
-export * from "./routes/suggest";
-export * from "./mentions";
export * from "./emptyFeed";
-export * from "./translateRegisterModal";
-export * from "./account/active";
diff --git a/packages/ui/src/interestModal.tsx b/packages/ui/src/interestModal.tsx
deleted file mode 100644
index b52647a5..00000000
--- a/packages/ui/src/interestModal.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import { ArrowLeftIcon, EditInterestIcon, LoaderIcon } from "@lume/icons";
-import { useStorage } from "@lume/storage";
-import { TOPICS, cn } from "@lume/utils";
-import * as Dialog from "@radix-ui/react-dialog";
-import { useQueryClient } from "@tanstack/react-query";
-import { ReactNode, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-
-export function InterestModal({
- queryKey,
- className,
- children,
-}: { queryKey: string[]; className?: string; children?: ReactNode }) {
- const storage = useStorage();
- const queryClient = useQueryClient();
-
- const [t] = useTranslation();
- const [open, setOpen] = useState(false);
- const [loading, setLoading] = useState(false);
- const [hashtags, setHashtags] = useState(storage.interests?.hashtags || []);
-
- const toggleHashtag = (item: string) => {
- const arr = hashtags.includes(item)
- ? hashtags.filter((i) => i !== item)
- : [...hashtags, item];
- setHashtags(arr);
- };
-
- const toggleAll = (item: string[]) => {
- const sets = new Set([...hashtags, ...item]);
- setHashtags([...sets]);
- };
-
- const submit = async () => {
- try {
- setLoading(true);
-
- const save = await storage.createSetting(
- "interests",
- JSON.stringify({ hashtags }),
- );
-
- if (save) {
- storage.interests = { hashtags, users: [], words: [] };
- await queryClient.refetchQueries({ queryKey });
- }
-
- setLoading(false);
- setOpen(false);
- } catch (e) {
- setLoading(false);
- toast.error(String(e));
- }
- };
-
- return (
-
- {
- const { selection } = editor;
-
- if (selection && Range.isCollapsed(selection)) {
- const [start] = Range.edges(selection);
- const wordBefore = Editor.before(editor, start, { unit: "word" });
- const before = wordBefore && Editor.before(editor, wordBefore);
- const beforeRange = before && Editor.range(editor, before, start);
- const beforeText =
- beforeRange && Editor.string(editor, beforeRange);
- const beforeMatch = beforeText?.match(/^@(\w+)$/);
- const after = Editor.after(editor, start);
- const afterRange = Editor.range(editor, start, after);
- const afterText = Editor.string(editor, afterRange);
- const afterMatch = afterText.match(/^(\s|$)/);
-
- if (beforeMatch && afterMatch) {
- setTarget(beforeRange);
- setSearch(beforeMatch[1]);
- setIndex(0);
- return;
- }
- }
-
- setTarget(null);
- }}
- >
-
-
-
-
-
- )}
-
-
- {filters.map((contact, i) => (
- // biome-ignore lint/a11y/useKeyWithClickEvents:
-
- {
- Transforms.select(editor, target);
- insertMention(editor, contact);
- setTarget(null);
- }}
- className="rounded-md px-2 py-2 hover:bg-neutral-100 dark:hover:bg-neutral-900"
- >
-
-
-
-
-
- ))}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {t("interests.edit")}
-
-
-
-
-
- {TOPICS.map((topic) => (
-
-
-
- ))}
-
-
-
- 
-
-
- - {topic.title} -
-
- {topic.content.map((hashtag) => (
-
- ))}
-
-
-
-
-
-
-
- {props.items.length ? (
- props.items.map((item, index) => (
-
- ))
- ) : (
-
- );
-};
-
-export const MentionList = forwardRef
- {t("global.noResult")}
-
- )}
-
-
-
+
);
@@ -91,7 +91,7 @@ export function NoteChild({
if (isError || !data) {
return (
+ Loading...
-
+
@@ -100,8 +100,8 @@ export function NoteChild({
return (
{t("note.error")}
-
-
+
+
{richContent}
@@ -109,7 +109,7 @@ export function NoteChild({
+
{isRoot ? t("note.posted") : t("note.replied")}:
diff --git a/packages/ui/src/note/mentions/note.tsx b/packages/ui/src/note/mentions/note.tsx
index 19335184..f1eca4f5 100644
--- a/packages/ui/src/note/mentions/note.tsx
+++ b/packages/ui/src/note/mentions/note.tsx
@@ -84,7 +84,7 @@ export function MentionNote({
return (
@@ -95,7 +95,7 @@ export function MentionNote({
return (
Loading...
{t("note.error")}
@@ -103,7 +103,7 @@ export function MentionNote({
}
return (
-
+
) => {
- event.currentTarget.src = "/fallback-image.jpg";
- };
+ const fallback = (event: SyntheticEvent) => {
+ event.currentTarget.src = "/fallback-image.jpg";
+ };
- return (
- // biome-ignore lint/a11y/useKeyWithClickEvents:
-
+
- 
-
-
- );
+ return (
+ // biome-ignore lint/a11y/useKeyWithClickEvents:
+
+
+
+ );
}
diff --git a/packages/ui/src/note/preview/link.tsx b/packages/ui/src/note/preview/link.tsx
index 751a0a4a..c9319a10 100644
--- a/packages/ui/src/note/preview/link.tsx
+++ b/packages/ui/src/note/preview/link.tsx
@@ -10,7 +10,7 @@ export function LinkPreview({ url }: { url: string }) {
if (isLoading) {
return (
-
+
@@ -54,7 +54,7 @@ export function LinkPreview({ url }: { url: string }) {
href={url}
target="_blank"
rel="noreferrer"
- className="my-1 flex w-full flex-col overflow-hidden rounded-xl bg-neutral-100 ring-1 ring-black/5 dark:bg-neutral-900 dark:ring-white/5"
+ className="my-1 flex w-full flex-col overflow-hidden rounded-2xl border border-black/10 dark:border-white/10"
>
{isImage(data.image) ? (
![]()
{data.title ? (
-
+
{data.title}
) : null}
diff --git a/packages/ui/src/note/preview/video.tsx b/packages/ui/src/note/preview/video.tsx
index 6fbe229a..ae6334cb 100644
--- a/packages/ui/src/note/preview/video.tsx
+++ b/packages/ui/src/note/preview/video.tsx
@@ -9,14 +9,14 @@ import {
export function VideoPreview({ url }: { url: string }) {
return (
-
+
-
+
{thread.rootEventId ? (
-
- );
-}
diff --git a/packages/ui/src/onboarding/home.tsx b/packages/ui/src/onboarding/home.tsx
deleted file mode 100644
index 1de9984b..00000000
--- a/packages/ui/src/onboarding/home.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ArrowRightIcon, PopperFilledIcon } from "@lume/icons";
-import { onboardingAtom } from "@lume/utils";
-import { motion } from "framer-motion";
-import { useAtom } from "jotai";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-
-export function OnboardingHomeScreen() {
- const navigate = useNavigate();
-
- const [t] = useTranslation();
- const [onboarding, setOnboarding] = useAtom(onboardingAtom);
-
- return (
-
-
- );
-}
diff --git a/packages/ui/src/onboarding/interest.tsx b/packages/ui/src/onboarding/interest.tsx
deleted file mode 100644
index 3d458ccd..00000000
--- a/packages/ui/src/onboarding/interest.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { ArrowLeftIcon, LoaderIcon } from "@lume/icons";
-import { useStorage } from "@lume/storage";
-import { TOPICS, cn } from "@lume/utils";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import { toast } from "sonner";
-
-export function OnboardingInterestScreen() {
- const storage = useStorage();
- const navigate = useNavigate();
-
- const [t] = useTranslation();
- const [loading, setLoading] = useState(false);
- const [hashtags, setHashtags] = useState([]);
-
- const toggleHashtag = (item: string) => {
- const arr = hashtags.includes(item)
- ? hashtags.filter((i) => i !== item)
- : [...hashtags, item];
- setHashtags(arr);
- };
-
- const toggleAll = (item: string[]) => {
- const sets = new Set([...hashtags, ...item]);
- setHashtags([...sets]);
- };
-
- const submit = async () => {
- try {
- setLoading(true);
-
- if (!hashtags.length) return navigate("/finish");
-
- const save = await storage.createSetting(
- "interests",
- JSON.stringify({ hashtags }),
- );
-
- if (save) {
- storage.interests = { hashtags, users: [], words: [] };
- return navigate("/finish");
- }
- } catch (e) {
- setLoading(false);
- toast.error(String(e));
- }
- };
-
- return (
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/onboarding/profile.tsx b/packages/ui/src/onboarding/profile.tsx
deleted file mode 100644
index b4a0a84b..00000000
--- a/packages/ui/src/onboarding/profile.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { useArk } from "@lume/ark";
-import { ArrowLeftIcon, LoaderIcon } from "@lume/icons";
-import { useStorage } from "@lume/storage";
-import { NDKKind, NDKUserProfile } from "@nostr-dev-kit/ndk";
-import { useQueryClient } from "@tanstack/react-query";
-import { motion } from "framer-motion";
-import { minidenticon } from "minidenticons";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import { toast } from "sonner";
-import { AvatarUploadButton } from "../avatarUploadButton";
-
-export function OnboardingProfileScreen() {
- const [picture, setPicture] = useState("");
- const [loading, setLoading] = useState(false);
-
- const ark = useArk();
- const storage = useStorage();
- const queryClient = useQueryClient();
- const navigate = useNavigate();
-
- const { t } = useTranslation();
- const { register, handleSubmit } = useForm();
-
- const svgURI = `data:image/svg+xml;utf8,${encodeURIComponent(
- minidenticon(ark.account.pubkey, 90, 50),
- )}`;
-
- const onSubmit = async (data: { name: string; about: string }) => {
- try {
- setLoading(true);
-
- if (!data.name.length && !data.about.length) {
- setLoading(false);
- navigate("/interests");
- }
-
- const prevProfile = await ark.getUserProfile();
- const newProfile: NDKUserProfile = {
- ...data,
- nip05: prevProfile?.nip05 || "",
- bio: data.about,
- image: picture,
- picture: picture,
- };
-
- const publish = await ark.createEvent({
- content: JSON.stringify(newProfile),
- kind: NDKKind.Metadata,
- tags: [],
- });
-
- if (publish) {
- // invalid cache
- await storage.clearProfileCache(ark.account.pubkey);
- await queryClient.setQueryData(
- ["user", ark.account.pubkey],
- () => newProfile,
- );
-
- setLoading(false);
- navigate("/interests");
- }
- } catch (e) {
- setLoading(false);
- toast.error(String(e));
- }
- };
-
- return (
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/routes/event.tsx b/packages/ui/src/routes/event.tsx
deleted file mode 100644
index f1d7af88..00000000
--- a/packages/ui/src/routes/event.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ArrowLeftIcon, ArrowRightIcon } from "@lume/icons";
-import { useNavigate, useParams } from "react-router-dom";
-import { WindowVirtualizer } from "virtua";
-import { ThreadNote } from "../note/primitives/thread";
-
-export function EventRoute() {
- const { id } = useParams();
- const navigate = useNavigate();
-
- return (
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/tutorial/finish.tsx b/packages/ui/src/tutorial/finish.tsx
deleted file mode 100644
index a342dd34..00000000
--- a/packages/ui/src/tutorial/finish.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { tutorialAtom } from "@lume/utils";
-import { useSetAtom } from "jotai";
-
-export function TutorialFinishScreen() {
- const tutorial = useSetAtom(tutorialAtom);
-
- return (
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/tutorial/newColumn.tsx b/packages/ui/src/tutorial/newColumn.tsx
deleted file mode 100644
index 1fc23ca8..00000000
--- a/packages/ui/src/tutorial/newColumn.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Link } from "react-router-dom";
-
-export function TutorialNewColumnScreen() {
- return (
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/tutorial/welcome.tsx b/packages/ui/src/tutorial/welcome.tsx
deleted file mode 100644
index 48d99ee1..00000000
--- a/packages/ui/src/tutorial/welcome.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Link } from "react-router-dom";
-
-export function TutorialWelcomeScreen() {
- return (
- >>,
}
fn main() {
@@ -68,7 +66,6 @@ fn main() {
// Update global state
handle.manage(Nostr {
client: client.into(),
- contact_list: Mutex::new(None),
})
});
diff --git a/src-tauri/src/nostr/event.rs b/src-tauri/src/nostr/event.rs
index 27007622..9a837e7c 100644
--- a/src-tauri/src/nostr/event.rs
+++ b/src-tauri/src/nostr/event.rs
@@ -50,9 +50,15 @@ pub async fn get_local_events(
None => Timestamp::now(),
};
- let contact_list = state.contact_list.lock().await;
+ let contact_list = client
+ .get_contact_list_public_keys(Some(Duration::from_secs(10)))
+ .await;
+
+ if let Ok(authors) = contact_list {
+ if authors.len() == 0 {
+ return Err("Get text event failed".into());
+ }
- if let Some(authors) = contact_list.clone() {
let filter = Filter::new()
.kinds(vec![Kind::TextNote, Kind::Repost])
.authors(authors)
@@ -68,7 +74,7 @@ pub async fn get_local_events(
Err("Get text event failed".into())
}
} else {
- Err("Contact list not found".into())
+ Err("Get contact list failed".into())
}
}
diff --git a/src-tauri/src/nostr/keys.rs b/src-tauri/src/nostr/keys.rs
index d5fca675..69eff7d9 100644
--- a/src-tauri/src/nostr/keys.rs
+++ b/src-tauri/src/nostr/keys.rs
@@ -3,7 +3,6 @@ use keyring::Entry;
use nostr_sdk::prelude::*;
use std::io::{BufReader, Read};
use std::iter;
-use std::time::Duration;
use std::{fs::File, io::Write, str::FromStr};
use tauri::{Manager, State};
@@ -42,15 +41,6 @@ pub async fn save_key(
let client = &state.client;
client.set_signer(Some(signer)).await;
- // Update contact list
- let mut contact_list = state.contact_list.lock().await;
- if let Ok(list) = client
- .get_contact_list_public_keys(Some(Duration::from_secs(10)))
- .await
- {
- *contact_list = Some(list);
- }
-
let keyring_entry = Entry::new("Lume Secret Storage", "AppKey").unwrap();
let secret_key = keyring_entry.get_password().unwrap();
let app_key = age::x25519::Identity::from_str(&secret_key).unwrap();
@@ -154,15 +144,6 @@ pub async fn load_selected_account(
// Update signer
client.set_signer(Some(signer)).await;
- // Update contact list
- let mut contact_list = state.contact_list.lock().await;
- if let Ok(list) = client
- .get_contact_list_public_keys(Some(Duration::from_secs(10)))
- .await
- {
- *contact_list = Some(list);
- }
-
Ok(true)
} else {
Ok(false)
-
-
- {t("onboarding.finish.title")}
-- {t("onboarding.finish.subtitle")} -
-
-
- {t("onboarding.home.title")}
-- {t("onboarding.home.subtitle")} -
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/onboarding/modal.tsx b/packages/ui/src/onboarding/modal.tsx
deleted file mode 100644
index 15b525bf..00000000
--- a/packages/ui/src/onboarding/modal.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { onboardingAtom } from "@lume/utils";
-import * as Dialog from "@radix-ui/react-dialog";
-import { useAtomValue } from "jotai";
-import { OnboardingRouter } from "./router";
-
-export function OnboardingModal() {
- const onboarding = useAtomValue(onboardingAtom);
-
- return (
-
-
-
-
- {t("interests.title")}
-- {t("interests.subtitle")} -
-
-
-
-
-
- {TOPICS.map((topic) => (
-
-
-
- ))}
-
-
-
-
-
-
- {topic.title}
-
- {topic.content.map((hashtag) => (
-
- ))}
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/onboarding/router.tsx b/packages/ui/src/onboarding/router.tsx
deleted file mode 100644
index 84636435..00000000
--- a/packages/ui/src/onboarding/router.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { AnimatePresence } from "framer-motion";
-import {
- MemoryRouter,
- Route,
- Routes,
- UNSAFE_LocationContext,
-} from "react-router-dom";
-import { OnboardingFinishScreen } from "./finish";
-import { OnboardingHomeScreen } from "./home";
-import { OnboardingInterestScreen } from "./interest";
-import { OnboardingProfileScreen } from "./profile";
-
-export function OnboardingRouter() {
- return (
-
-
-
-
-
- {t("onboarding.profile.title")}
-- {t("onboarding.profile.subtitle")} -
-
-
-
-
- );
-}
diff --git a/packages/ui/src/routes/suggest.tsx b/packages/ui/src/routes/suggest.tsx
deleted file mode 100644
index 0f230853..00000000
--- a/packages/ui/src/routes/suggest.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { ArrowLeftIcon, ArrowRightIcon, LoaderIcon } from "@lume/icons";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import { toast } from "sonner";
-import { WindowVirtualizer } from "virtua";
-import { User } from "../user";
-
-const POPULAR_USERS = [
- "npub180cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsyjh6w6",
- "npub1sg6plzptd64u62a878hep2kev88swjh3tw00gjsfl8f237lmu63q0uf63m",
- "npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s",
- "npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z",
- "npub1az9xj85cmxv8e9j9y80lvqp97crsqdu2fpu3srwthd99qfu9qsgstam8y8",
- "npub1a2cww4kn9wqte4ry70vyfwqyqvpswksna27rtxd8vty6c74era8sdcw83a",
- "npub168ghgug469n4r2tuyw05dmqhqv5jcwm7nxytn67afmz8qkc4a4zqsu2dlc",
- "npub133vj8ycevdle0cq8mtgddq0xtn34kxkwxvak983dx0u5vhqnycyqj6tcza",
- "npub18ams6ewn5aj2n3wt2qawzglx9mr4nzksxhvrdc4gzrecw7n5tvjqctp424",
- "npub1r0rs5q2gk0e3dk3nlc7gnu378ec6cnlenqp8a3cjhyzu6f8k5sgs4sq9ac",
- "npub1prya33fnqerq0fljwjtp77ehtu7jlsjt5ydhwveuwmqdsdm6k8esk42xcv",
- "npub19mduaf5569jx9xz555jcx3v06mvktvtpu0zgk47n4lcpjsz43zzqhj6vzk",
-];
-
-const LUME_USERS = [
- "npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445",
-];
-
-export function SuggestRoute({ queryKey }: { queryKey: string }) {
- const queryClient = useQueryClient();
- const navigate = useNavigate();
-
- const { t } = useTranslation();
- const { isLoading, isError, data } = useQuery({
- queryKey: ["trending-users"],
- queryFn: async ({ signal }: { signal: AbortSignal }) => {
- const res = await fetch("https://api.nostr.band/v0/trending/profiles", {
- signal,
- });
- if (!res.ok) {
- throw new Error("Failed to fetch trending users from nostr.band API.");
- }
- return res.json();
- },
- });
-
- const submit = async () => {
- try {
- await queryClient.refetchQueries({ queryKey: [queryKey] });
- return navigate("/", { replace: true });
- } catch (e) {
- toast.error(String(e));
- }
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/routes/user.tsx b/packages/ui/src/routes/user.tsx
deleted file mode 100644
index 822b894d..00000000
--- a/packages/ui/src/routes/user.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import { useArk } from "@lume/ark";
-import {
- ArrowLeftIcon,
- ArrowRightCircleIcon,
- ArrowRightIcon,
- LoaderIcon,
-} from "@lume/icons";
-import { FETCH_LIMIT } from "@lume/utils";
-import { NDKEvent, NDKKind } from "@nostr-dev-kit/ndk";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { useNavigate, useParams } from "react-router-dom";
-import { WindowVirtualizer } from "virtua";
-import { User } from "../user";
-
-export function UserRoute() {
- const ark = useArk();
- const navigate = useNavigate();
-
- const { id } = useParams();
- const { t } = useTranslation();
- const { data, hasNextPage, isLoading, isFetchingNextPage, fetchNextPage } =
- useInfiniteQuery({
- queryKey: ["user-posts", id],
- initialPageParam: 0,
- queryFn: async ({
- signal,
- pageParam,
- }: {
- signal: AbortSignal;
- pageParam: number;
- }) => {
- const events = await ark.getInfiniteEvents({
- filter: {
- kinds: [NDKKind.Text, NDKKind.Repost],
- authors: [id],
- },
- limit: FETCH_LIMIT,
- pageParam,
- signal,
- });
-
- return events;
- },
- getNextPageParam: (lastPage) => {
- const lastEvent = lastPage.at(-1);
- if (!lastEvent) return;
- return lastEvent.created_at - 1;
- },
- refetchOnWindowFocus: false,
- });
-
- const allEvents = useMemo(
- () => (data ? data.pages.flatMap((page) => page) : []),
- [data],
- );
-
- const renderItem = (event: NDKEvent) => {
- switch (event.kind) {
- case NDKKind.Text:
- return
-
-
-
-
-
-
-
- {t("suggestion.title")}
-
- {isLoading ? (
-
-
-
- ) : isError ? (
-
- {t("suggestion.error")}
-
- ) : (
- data?.profiles.map((item: { pubkey: string }) => (
-
-
-
-
-
-
- ))
- )}
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/translateRegisterModal.tsx b/packages/ui/src/translateRegisterModal.tsx
deleted file mode 100644
index e114cd8e..00000000
--- a/packages/ui/src/translateRegisterModal.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import { useArk } from "@lume/ark";
-import { LoaderIcon } from "@lume/icons";
-import * as Dialog from "@radix-ui/react-dialog";
-import { fetch } from "@tauri-apps/plugin-http";
-import { useState } from "react";
-import { toast } from "sonner";
-import { renderSVG } from "uqr";
-
-export function TranslateRegisterModal({ setAPIKey }) {
- const ark = useArk();
-
- const [open, setOpen] = useState(false);
- const [loading, setLoading] = useState(false);
- const [invoice, setInvoice] = useState<{ api_key: string; bolt11: string }>(
- null,
- );
-
- const createInvoice = async () => {
- try {
- setLoading(true);
-
- const res = await fetch("https://translate.nostr.wine/api/create", {
- method: "POST",
- body: JSON.stringify({
- pubkey: ark.account.pubkey,
- amount: 2500,
- }),
- headers: {
- "Content-Type": "application/json; charset=utf-8",
- },
- });
-
- if (res) {
- const data = await res.json();
- setInvoice(data);
- setLoading(false);
- }
- } catch (e) {
- setLoading(false);
- toast.error(String(e));
- }
- };
-
- const finish = () => {
- if (!invoice) return;
-
- setAPIKey(invoice.api_key);
- setOpen(false);
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - {t("user.latestPosts")} -
-
- {isLoading ? (
-
-
-
- ) : (
- allEvents.map((item) => renderItem(item))
- )}
-
- {hasNextPage ? (
-
- ) : null}
-
-
-
-
- Register Translate Service
-
-
-
-
-
- {!invoice ? (
- - Translation Service is provided by{" "} - nostr.wine. Prices - start at 2,500 sats for 50,000 characters of translated text. -
-- You can learn more about nostr.wine{" "} - - here - -
-
- 
-
-
- ) : (
-
-
-
-
- )}
-
-
- API Key
- -
- 
-
-
- - Scan and Pay with Lightning Wallet -
-
-
- );
-}
diff --git a/packages/ui/src/tutorial/manageColumn.tsx b/packages/ui/src/tutorial/manageColumn.tsx
deleted file mode 100644
index 111b9dcb..00000000
--- a/packages/ui/src/tutorial/manageColumn.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Link } from "react-router-dom";
-
-export function TutorialManageColumnScreen() {
- return (
-
-
- - Great Job! You have completed - this section. Feel free to explore other menus in the interface, such - as Activity and Relay Explorer. -
-- If you want to see this tutorial again, don't hesitate to press the ? - icon in Bottom bar -
-- If you want to seek help from Lume Devs, you can publish a post with{" "} - #lumesos -
-
-
-
-
-
- );
-}
diff --git a/packages/ui/src/tutorial/modal.tsx b/packages/ui/src/tutorial/modal.tsx
deleted file mode 100644
index e43eec83..00000000
--- a/packages/ui/src/tutorial/modal.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { CancelIcon, HelpIcon } from "@lume/icons";
-import { tutorialAtom } from "@lume/utils";
-import * as Popover from "@radix-ui/react-popover";
-import { useAtom } from "jotai";
-import { TutorialRouter } from "./router";
-
-export function TutorialModal() {
- const [tutorial, setTutorial] = useAtom(tutorialAtom);
-
- return (
-
- 
-
- - Once a new column is created, you can click on the title in its header - to find options to customize it -
-
-
-
- Next
-
-
-
-
-
- setTutorial(false)}>
-
-
- Tutorial
-
-
-
-
- );
-}
diff --git a/packages/ui/src/tutorial/router.tsx b/packages/ui/src/tutorial/router.tsx
deleted file mode 100644
index 33e05a55..00000000
--- a/packages/ui/src/tutorial/router.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { AnimatePresence } from "framer-motion";
-import {
- MemoryRouter,
- Route,
- Routes,
- UNSAFE_LocationContext,
-} from "react-router-dom";
-import { TutorialFinishScreen } from "./finish";
-import { TutorialManageColumnScreen } from "./manageColumn";
-import { TutorialNewColumnScreen } from "./newColumn";
-import { TutorialWelcomeScreen } from "./welcome";
-
-export function TutorialRouter() {
- return (
-
- 
-
- Lume is column based, each column is its own experience.
-- To create a new column, you can - click on the "Plus" icon at bottom right corner of this window. -
-Click to "Plus" icon
-
-
-
- Next
-
-
-
-
- );
-}
diff --git a/packages/ui/src/unread.tsx b/packages/ui/src/unread.tsx
deleted file mode 100644
index d4dcc5fd..00000000
--- a/packages/ui/src/unread.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { activityUnreadAtom, compactNumber } from "@lume/utils";
-import { useAtomValue } from "jotai";
-
-export function UnreadActivity() {
- const total = useAtomValue(activityUnreadAtom);
-
- if (total <= 0) return null;
-
- return (
-
- 
-
- - Welcome to your Home Screen.{" "} - This is your personalized screen, which you can customize to you - liking -
-Feel free to make adjustments as needed.
-Let's take a few minutes to explore the features together.
-
-
-
- Next
-
-
-
- {compactNumber.format(total)}
-
- );
-}
diff --git a/src-tauri/capabilities/main.json b/src-tauri/capabilities/main.json
index b5575ca7..ac6f984e 100644
--- a/src-tauri/capabilities/main.json
+++ b/src-tauri/capabilities/main.json
@@ -35,6 +35,7 @@
"webview:allow-create-webview",
"dialog:allow-open",
"fs:allow-read-file",
+ "shell:allow-open",
{
"identifier": "http:default",
"allow": [
diff --git a/src-tauri/gen/schemas/capabilities.json b/src-tauri/gen/schemas/capabilities.json
index 52e37172..9ea934c0 100644
--- a/src-tauri/gen/schemas/capabilities.json
+++ b/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"desktop-capability":{"identifier":"desktop-capability","description":"Capability for the desktop","remote":null,"local":true,"windows":["main","splash","editor","settings","event-*","user-*","column-*"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","notification:allow-is-permission-granted","notification:allow-request-permission","notification:default","os:allow-locale","os:allow-platform","updater:allow-check","updater:default","window:allow-start-dragging","store:allow-get","clipboard-manager:allow-write","clipboard-manager:allow-read","webview:allow-create-webview-window","webview:allow-create-webview","dialog:allow-open","fs:allow-read-file",{"identifier":"http:default","allow":[{"url":"http://**/"},{"url":"https://**/"}]},{"identifier":"fs:allow-read-text-file","allow":[{"path":"$RESOURCE/locales/*"}]}],"platforms":["linux","macOS","windows"]}}
\ No newline at end of file
+{"desktop-capability":{"identifier":"desktop-capability","description":"Capability for the desktop","remote":null,"local":true,"windows":["main","splash","editor","settings","event-*","user-*","column-*"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","notification:allow-is-permission-granted","notification:allow-request-permission","notification:default","os:allow-locale","os:allow-platform","updater:allow-check","updater:default","window:allow-start-dragging","store:allow-get","clipboard-manager:allow-write","clipboard-manager:allow-read","webview:allow-create-webview-window","webview:allow-create-webview","dialog:allow-open","fs:allow-read-file","shell:allow-open",{"identifier":"http:default","allow":[{"url":"http://**/"},{"url":"https://**/"}]},{"identifier":"fs:allow-read-text-file","allow":[{"path":"$RESOURCE/locales/*"}]}],"platforms":["linux","macOS","windows"]}}
\ No newline at end of file
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 7bb2264d..b1dcd049 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -12,11 +12,9 @@ use keyring::Entry;
use nostr_sdk::prelude::*;
use tauri::Manager;
use tauri_plugin_autostart::MacosLauncher;
-use tokio::sync::Mutex;
pub struct Nostr {
client: Client,
- contact_list: Mutex