chore: bump version

.github/workflows/main.yml

@@ -18,10 +18,10 @@ jobs:
             args: "--target x86_64-apple-darwin"
           - platform: "macos-latest" # for Intel based macs.
             args: "--target universal-apple-darwin"
-            #- platform: 'ubuntu-22.04'
+          - platform: 'ubuntu-22.04'
-            #  args: ''
+            args: ''
-            #- platform: 'windows-latest'
+          - platform: 'windows-latest'
-            #  args: '--target x86_64-pc-windows-msvc'
+            args: '--target x86_64-pc-windows-msvc'
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v4

apps/desktop2/package.json

@@ -21,20 +21,20 @@
 		"@radix-ui/react-switch": "^1.1.0",
 		"@radix-ui/react-tabs": "^1.1.0",
 		"@radix-ui/react-tooltip": "^1.1.2",
-		"@tanstack/query-persist-client-core": "^5.49.1",
+		"@tanstack/query-persist-client-core": "^5.51.9",
-		"@tanstack/react-query": "^5.49.2",
+		"@tanstack/react-query": "^5.51.9",
-		"@tanstack/react-router": "^1.43.3",
+		"@tanstack/react-router": "^1.45.4",
-		"embla-carousel-react": "^8.1.5",
+		"embla-carousel-react": "^8.1.6",
-		"i18next": "^23.11.5",
+		"i18next": "^23.12.1",
 		"i18next-resources-to-backend": "^1.2.1",
 		"minidenticons": "^4.2.1",
 		"nanoid": "^5.0.7",
-		"nostr-tools": "^2.7.0",
+		"nostr-tools": "^2.7.1",
 		"react": "^18.3.1",
 		"react-currency-input-field": "^3.8.0",
 		"react-dom": "^18.3.1",
-		"react-hook-form": "^7.52.0",
+		"react-hook-form": "^7.52.1",
-		"react-i18next": "^14.1.2",
+		"react-i18next": "^14.1.3",
 		"react-string-replace": "^1.1.1",
 		"slate": "^0.103.0",
 		"slate-react": "^0.105.0",
@@ -45,17 +45,16 @@
 		"@lume/tailwindcss": "workspace:^",
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@tanstack/router-devtools": "^1.43.3",
+		"@tanstack/router-devtools": "^1.45.4",
-		"@tanstack/router-vite-plugin": "^1.43.1",
+		"@tanstack/router-vite-plugin": "^1.45.3",
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
 		"@vitejs/plugin-react-swc": "^3.7.0",
 		"autoprefixer": "^10.4.19",
 		"postcss": "^8.4.39",
-		"tailwindcss": "^3.4.4",
+		"tailwindcss": "^3.4.6",
-		"typescript": "^5.5.2",
+		"typescript": "^5.5.3",
-		"vite": "^5.3.2",
+		"vite": "^5.3.4",
-		"vite-plugin-top-level-await": "^1.4.1",
 		"vite-tsconfig-paths": "^4.3.2"
 	}
 }

apps/desktop2/src/components/column.tsx

@@ -3,7 +3,7 @@ import type { LumeColumn } from "@lume/types";
 import { invoke } from "@tauri-apps/api/core";
 import { listen } from "@tauri-apps/api/event";
 import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
-import { getCurrent } from "@tauri-apps/api/webviewWindow";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { memo, useCallback, useEffect, useRef, useState } from "react";
 
 type WindowEvent = {
@@ -106,7 +106,7 @@ function Header({
 	const [isChanged, setIsChanged] = useState(false);
 
 	const saveNewTitle = async () => {
-		const mainWindow = getCurrent();
+		const mainWindow = getCurrentWindow();
 		await mainWindow.emit("columns", { type: "set_title", label, title });
 
 		// update search params
@@ -135,7 +135,7 @@ function Header({
 			MenuItem.new({
 				text: "Move left",
 				action: async () => {
-					await getCurrent().emit("columns", {
+					await getCurrentWindow().emit("columns", {
 						type: "move",
 						label,
 						direction: "left",
@@ -145,7 +145,7 @@ function Header({
 			MenuItem.new({
 				text: "Move right",
 				action: async () => {
-					await getCurrent().emit("columns", {
+					await getCurrentWindow().emit("columns", {
 						type: "move",
 						label,
 						direction: "right",
@@ -156,7 +156,10 @@ function Header({
 			MenuItem.new({
 				text: "Close",
 				action: async () => {
-					await getCurrent().emit("columns", { type: "remove", label });
+					await getCurrentWindow().emit("columns", {
+						type: "remove",
+						label,
+					});
 				},
 			}),
 		]);

apps/desktop2/src/routes/$account.home.tsx

@@ -5,7 +5,7 @@ import { NostrQuery } from "@lume/system";
 import type { ColumnEvent, LumeColumn } from "@lume/types";
 import { createFileRoute } from "@tanstack/react-router";
 import { listen } from "@tauri-apps/api/event";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import useEmblaCarousel from "embla-carousel-react";
 import { nanoid } from "nanoid";
 import { useCallback, useEffect, useState } from "react";
@@ -30,23 +30,23 @@ function Screen() {
 	});
 
 	const scrollPrev = useCallback(() => {
-		if (emblaApi) emblaApi.scrollPrev(true);
+		if (emblaApi) emblaApi.scrollPrev();
 	}, [emblaApi]);
 
 	const scrollNext = useCallback(() => {
-		if (emblaApi) emblaApi.scrollNext(true);
+		if (emblaApi) emblaApi.scrollNext();
 	}, [emblaApi]);
 
 	const emitScrollEvent = useCallback(() => {
-		getCurrent().emit("child_webview", { scroll: true });
+		getCurrentWindow().emit("child_webview", { scroll: true });
 	}, []);
 
 	const emitResizeEvent = useCallback(() => {
-		getCurrent().emit("child_webview", { resize: true, direction: "x" });
+		getCurrentWindow().emit("child_webview", { resize: true, direction: "x" });
 	}, []);
 
 	const openLumeStore = useCallback(async () => {
-		await getCurrent().emit("columns", {
+		await getCurrentWindow().emit("columns", {
 			type: "add",
 			column: {
 				label: "store",
@@ -101,10 +101,10 @@ function Screen() {
 
 		switch (event.code) {
 			case "ArrowLeft":
-				if (emblaApi) emblaApi.scrollPrev(true);
+				if (emblaApi) emblaApi.scrollPrev();
 				break;
 			case "ArrowRight":
-				if (emblaApi) emblaApi.scrollNext(true);
+				if (emblaApi) emblaApi.scrollNext();
 				break;
 			default:
 				break;

apps/desktop2/src/routes/$account.tsx

@@ -9,7 +9,7 @@ import { LumeWindow, NostrAccount, NostrQuery } from "@lume/system";
 import { cn } from "@lume/utils";
 import { Outlet, createFileRoute } from "@tanstack/react-router";
 import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { message } from "@tauri-apps/plugin-dialog";
 import { memo, useCallback, useState } from "react";
 
@@ -30,7 +30,7 @@ function Screen() {
 	const { settings, platform } = Route.useRouteContext();
 
 	const openLumeStore = async () => {
-		await getCurrent().emit("columns", {
+		await getCurrentWindow().emit("columns", {
 			type: "add",
 			column: {
 				label: "store",
@@ -137,7 +137,7 @@ const Accounts = memo(function Accounts() {
 
 			if (select) {
 				// Reset current columns
-				await getCurrent().emit("columns", { type: "reset" });
+				await getCurrentWindow().emit("columns", { type: "reset" });
 
 				// Redirect to new account
 				return navigate({

apps/desktop2/src/routes/__root.tsx

@@ -11,7 +11,6 @@ interface RouterContext {
 export const Route = createRootRouteWithContext<RouterContext>()({
 	component: () => <Outlet />,
 	pendingComponent: Pending,
-	wrapInSuspense: true,
 });
 
 function Pending() {

apps/desktop2/src/routes/auth.lazy.tsx

@@ -1,4 +1,4 @@
-import { Box, Container } from "@lume/ui";
+import { Container } from "@lume/ui";
 import { Outlet, createLazyFileRoute } from "@tanstack/react-router";
 
 export const Route = createLazyFileRoute("/auth")({
@@ -8,9 +8,9 @@ export const Route = createLazyFileRoute("/auth")({
 function Screen() {
 	return (
 		<Container withDrag>
-			<Box className="px-3 pt-3">
+			<div className="max-w-sm mx-auto size-full">
 				<Outlet />
-			</Box>
+			</div>
 		</Container>
 	);
 }

apps/desktop2/src/routes/auth/create-profile.tsx

@@ -55,83 +55,81 @@ function Screen() {
 	};
 
 	return (
-		<div className="flex flex-col items-center justify-center w-full h-full gap-6 px-5 mx-auto xl:max-w-xl">
+		<div className="flex flex-col items-center justify-center size-full gap-4">
 			<div className="text-center">
 				<h3 className="text-xl font-semibold">Let's set up your profile.</h3>
 			</div>
-			<div>
+			<form onSubmit={handleSubmit(onSubmit)} className="w-full mb-0">
-				<div className="relative rounded-full size-24 bg-gradient-to-tr from-orange-100 via-red-50 to-blue-200">
+				<div className="flex flex-col gap-3 w-full p-3 overflow-hidden bg-white rounded-xl shadow-primary dark:bg-white/10 dark:ring-1 ring-white/15">
-					{picture ? (
+					<div className="self-center relative rounded-full size-20 bg-neutral-200 dark:bg-white/70 my-3">
-						<img
+						{picture ? (
-							src={picture}
+							<img
-							alt="avatar"
+								src={picture}
-							loading="lazy"
+								alt="avatar"
-							decoding="async"
+								loading="lazy"
-							className="absolute inset-0 z-10 object-cover w-full h-full rounded-full"
+								decoding="async"
+								className="absolute inset-0 z-10 object-cover w-full h-full rounded-full"
+							/>
+						) : null}
+						<AvatarUploader
+							setPicture={setPicture}
+							className="absolute inset-0 z-20 flex items-center justify-center w-full h-full text-white rounded-full dark:text-black bg-black/10 hover:bg-black/20 dark:bg-white/10 dark:hover:bg-white/20"
+						>
+							<PlusIcon className="size-8" />
+						</AvatarUploader>
+					</div>
+					<div className="flex flex-col gap-1">
+						<label htmlFor="display_name" className="font-medium">
+							Display Name *
+						</label>
+						<input
+							type={"text"}
+							{...register("display_name", { required: true, minLength: 1 })}
+							placeholder="e.g. Alice in Nostrland"
+							spellCheck={false}
+							className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
 						/>
-					) : null}
+					</div>
-					<AvatarUploader
+					<div className="flex flex-col gap-1">
-						setPicture={setPicture}
+						<label htmlFor="name" className="font-medium">
-						className="absolute inset-0 z-20 flex items-center justify-center w-full h-full text-white rounded-full dark:text-black bg-black/10 hover:bg-black/20 dark:bg-white/10 dark:hover:bg-white/20"
+							Name
-					>
+						</label>
-						<PlusIcon className="size-8" />
+						<input
-					</AvatarUploader>
+							type={"text"}
-				</div>
+							{...register("name")}
-			</div>
+							placeholder="e.g. alice"
-			<form
+							spellCheck={false}
-				onSubmit={handleSubmit(onSubmit)}
+							className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
-				className="flex flex-col w-full gap-3"
+						/>
-			>
+					</div>
-				<div className="flex flex-col gap-1">
+					<div className="flex flex-col gap-1">
-					<label htmlFor="display_name" className="font-medium">
+						<label htmlFor="about" className="font-medium">
-						Display Name *
+							Bio
-					</label>
+						</label>
-					<input
+						<textarea
-						type={"text"}
+							{...register("about")}
-						{...register("display_name", { required: true, minLength: 1 })}
+							placeholder="e.g. Artist, anime-lover, and k-pop fan"
-						placeholder="e.g. Alice in Nostrland"
+							spellCheck={false}
-						spellCheck={false}
+							className="relative h-24 w-full resize-none rounded-lg border-transparent bg-neutral-100 px-3 py-2 !outline-none placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
-						className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+						/>
-					/>
+					</div>
-				</div>
+					<div className="flex flex-col gap-1">
-				<div className="flex flex-col gap-1">
+						<label htmlFor="website" className="font-medium">
-					<label htmlFor="name" className="font-medium">
+							Website
-						Name
+						</label>
-					</label>
+						<input
-					<input
+							type="url"
-						type={"text"}
+							{...register("website")}
-						{...register("name")}
+							placeholder="e.g. https://alice.me"
-						placeholder="e.g. alice"
+							spellCheck={false}
-						spellCheck={false}
+							className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-500 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
-						className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+						/>
-					/>
+					</div>
-				</div>
-				<div className="flex flex-col gap-1">
-					<label htmlFor="about" className="font-medium">
-						Bio
-					</label>
-					<textarea
-						{...register("about")}
-						placeholder="e.g. Artist, anime-lover, and k-pop fan"
-						spellCheck={false}
-						className="relative h-24 w-full resize-none rounded-lg border-transparent bg-neutral-100 px-3 py-2 !outline-none placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
-					/>
-				</div>
-				<div className="flex flex-col gap-1">
-					<label htmlFor="website" className="font-medium">
-						Website
-					</label>
-					<input
-						type="url"
-						{...register("website")}
-						placeholder="e.g. https://alice.me"
-						spellCheck={false}
-						className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-500 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
-					/>
 				</div>
 				<button
 					type="submit"
-					className="inline-flex items-center justify-center w-full mt-3 font-semibold text-white bg-blue-500 rounded-lg h-11 shrink-0 hover:bg-blue-600 disabled:opacity-50"
+					disabled={loading}
+					className="inline-flex items-center justify-center w-full h-9 mt-4 text-sm font-semibold text-white bg-blue-500 rounded-lg shrink-0 hover:bg-blue-600 disabled:opacity-50"
 				>
 					{loading ? <Spinner /> : "Continue"}
 				</button>

apps/desktop2/src/routes/auth/import.lazy.tsx

@@ -38,47 +38,49 @@ function Screen() {
 	};
 
 	return (
-		<div className="flex flex-col items-center justify-center w-full h-full gap-6 px-5 mx-auto xl:max-w-xl">
+		<div className="flex flex-col items-center justify-center size-full gap-4">
 			<div className="text-center">
 				<h3 className="text-xl font-semibold">Continue with Private Key</h3>
 			</div>
-			<div className="flex flex-col w-full gap-3">
+			<div className="flex flex-col w-full">
-				<div className="flex flex-col gap-1">
+				<div className="flex flex-col gap-3 w-full p-3 overflow-hidden bg-white rounded-xl shadow-primary dark:bg-white/10 dark:ring-1 ring-white/15">
-					<label
+					<div className="flex flex-col gap-1">
-						htmlFor="key"
+						<label
-						className="font-medium text-neutral-900 dark:text-neutral-100"
+							htmlFor="key"
-					>
+							className="font-medium text-neutral-900 dark:text-neutral-100"
-						Private Key
+						>
-					</label>
+							Private Key
-					<input
+						</label>
-						name="key"
+						<input
-						type="text"
+							name="key"
-						placeholder="nsec or ncryptsec..."
+							type="text"
-						value={key}
+							placeholder="nsec or ncryptsec..."
-						onChange={(e) => setKey(e.target.value)}
+							value={key}
-						className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+							onChange={(e) => setKey(e.target.value)}
-					/>
+							className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
-				</div>
+						/>
-				<div className="flex flex-col gap-1">
+					</div>
-					<label
+					<div className="flex flex-col gap-1">
-						htmlFor="password"
+						<label
-						className="font-medium text-neutral-900 dark:text-neutral-100"
+							htmlFor="password"
-					>
+							className="font-medium text-neutral-900 dark:text-neutral-100"
-						Password (Optional)
+						>
-					</label>
+							Password (Optional)
-					<input
+						</label>
-						name="password"
+						<input
-						type="password"
+							name="password"
-						value={password}
+							type="password"
-						onChange={(e) => setPassword(e.target.value)}
+							value={password}
-						className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+							onChange={(e) => setPassword(e.target.value)}
-					/>
+							className="px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+						/>
+					</div>
 				</div>
 				<button
 					type="button"
 					onClick={() => submit()}
 					disabled={loading}
-					className="inline-flex items-center justify-center w-full mt-3 font-semibold text-white bg-blue-500 rounded-lg h-11 shrink-0 hover:bg-blue-600 disabled:opacity-50"
+					className="inline-flex items-center justify-center w-full h-9 mt-4 text-sm font-semibold text-white bg-blue-500 rounded-lg shrink-0 hover:bg-blue-600 disabled:opacity-50"
 				>
 					{loading ? <Spinner /> : "Login"}
 				</button>

apps/desktop2/src/routes/auth/remote.lazy.tsx

@@ -37,12 +37,12 @@ function Screen() {
 	};
 
 	return (
-		<div className="flex flex-col items-center justify-center w-full h-full gap-6 px-5 mx-auto xl:max-w-xl">
+		<div className="flex flex-col items-center justify-center size-full gap-4">
 			<div className="text-center">
 				<h3 className="text-xl font-semibold">Continue with Nostr Connect</h3>
 			</div>
-			<div className="flex flex-col w-full gap-3">
+			<div className="flex flex-col w-full">
-				<div className="flex flex-col gap-1">
+				<div className="flex flex-col gap-1 w-full p-3 overflow-hidden bg-white rounded-xl shadow-primary dark:bg-white/10 dark:ring-1 ring-white/15">
 					<label
 						htmlFor="uri"
 						className="font-medium text-neutral-900 dark:text-neutral-100"
@@ -63,7 +63,7 @@ function Screen() {
 						type="button"
 						onClick={() => submit()}
 						disabled={loading}
-						className="inline-flex items-center justify-center w-full mt-3 font-semibold text-white bg-blue-500 rounded-lg h-11 shrink-0 hover:bg-blue-600 disabled:opacity-50"
+						className="inline-flex items-center justify-center w-full h-9 mt-4 text-sm font-semibold text-white bg-blue-500 rounded-lg shrink-0 hover:bg-blue-600 disabled:opacity-50"
 					>
 						{loading ? <Spinner /> : "Login"}
 					</button>

apps/desktop2/src/routes/bootstrap-relays.tsx

@@ -65,9 +65,9 @@ function Screen() {
 				data-tauri-drag-region
 				className="absolute top-0 left-0 h-14 w-full"
 			/>
-			<div className="flex items-end justify-center flex-1 w-full px-4 pb-10">
+			<div className="flex items-end justify-center flex-1 w-full px-4 pb-4">
 				<div className="text-center">
-					<h2 className="text-2xl font-semibold">Customize Bootstrap Relays</h2>
+					<h2 className="text-xl font-semibold">Customize Bootstrap Relays</h2>
 				</div>
 			</div>
 			<div className="flex flex-col items-center flex-1 w-full">

apps/desktop2/src/routes/editor/-components/media.tsx

@@ -3,7 +3,7 @@ import { NostrQuery } from "@lume/system";
 import { Spinner } from "@lume/ui";
 import { insertImage, isImagePath } from "@lume/utils";
 import type { UnlistenFn } from "@tauri-apps/api/event";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { message } from "@tauri-apps/plugin-dialog";
 import { useEffect, useState } from "react";
 import { useSlateStatic } from "slate-react";
@@ -32,7 +32,7 @@ export function MediaButton() {
 		let unlisten: UnlistenFn = undefined;
 
 		async function listenFileDrop() {
-			const window = getCurrent();
+			const window = getCurrentWindow();
 			if (!unlisten) {
 				unlisten = await window.listen("tauri://file-drop", async (event) => {
 					// @ts-ignore, lfg !!!

apps/desktop2/src/routes/events/$id.tsx

@@ -3,7 +3,7 @@ import { LumeEvent, NostrQuery } from "@lume/system";
 import type { Meta } from "@lume/types";
 import * as ScrollArea from "@radix-ui/react-scroll-area";
 import { createFileRoute } from "@tanstack/react-router";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { useEffect, useRef, useState } from "react";
 import { Virtualizer } from "virtua";
 import NoteParent from "./-components/parent";
@@ -83,14 +83,17 @@ function ReplyList() {
 	const [replies, setReplies] = useState<LumeEvent[]>([]);
 
 	useEffect(() => {
-		const unlistenEvent = getCurrent().listen<Payload>("new_reply", (data) => {
+		const unlistenEvent = getCurrentWindow().listen<Payload>(
-			const event = LumeEvent.from(data.payload.raw, data.payload.parsed);
+			"new_reply",
-			setReplies((prev) => [event, ...prev]);
+			(data) => {
-		});
+				const event = LumeEvent.from(data.payload.raw, data.payload.parsed);
+				setReplies((prev) => [event, ...prev]);
+			},
+		);
 
-		const unlistenWindow = getCurrent().onCloseRequested(async () => {
+		const unlistenWindow = getCurrentWindow().onCloseRequested(async () => {
 			await event.unlistenEventReply();
-			await getCurrent().destroy();
+			await getCurrentWindow().destroy();
 		});
 
 		return () => {

apps/desktop2/src/routes/newsfeed.tsx

@@ -10,7 +10,7 @@ import * as ScrollArea from "@radix-ui/react-scroll-area";
 import { type InfiniteData, useInfiniteQuery } from "@tanstack/react-query";
 import { createFileRoute, redirect } from "@tanstack/react-router";
 import { listen } from "@tauri-apps/api/event";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Virtualizer } from "virtua";
 
@@ -195,7 +195,7 @@ function Listerner() {
 	};
 
 	useEffect(() => {
-		const unlisten = getCurrent().listen<Payload>("new_event", (data) => {
+		const unlisten = getCurrentWindow().listen<Payload>("new_event", (data) => {
 			const event = LumeEvent.from(data.payload.raw, data.payload.parsed);
 			setEvents((prev) => [event, ...prev]);
 		});

apps/desktop2/src/routes/panel.$account.tsx

@@ -15,12 +15,15 @@ import { useQuery } from "@tanstack/react-query";
 import { createFileRoute } from "@tanstack/react-router";
 import { invoke } from "@tauri-apps/api/core";
 import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { open } from "@tauri-apps/plugin-shell";
 import { type ReactNode, useCallback, useEffect, useRef } from "react";
 import { Virtualizer } from "virtua";
 
 export const Route = createFileRoute("/panel/$account")({
+	beforeLoad: async ({ context }) => {
+		console.log(context);
+	},
 	component: Screen,
 });
 
@@ -30,6 +33,7 @@ function Screen() {
 	const { isLoading, data } = useQuery({
 		queryKey: ["notification", account],
 		queryFn: async () => {
+			console.log(queryClient);
 			const events = await NostrQuery.getNotifications();
 			return events;
 		},
@@ -110,7 +114,7 @@ function Screen() {
 	}, []);
 
 	useEffect(() => {
-		const unlisten = getCurrent().listen("notification", async (data) => {
+		const unlisten = getCurrentWindow().listen("notification", async (data) => {
 			const event: LumeEvent = JSON.parse(data.payload as string);
 			await queryClient.setQueryData(
 				["notification", account],

apps/desktop2/src/routes/settings/bitcoin-connect.tsx

@@ -1,7 +1,7 @@
 import { Button, init } from "@getalby/bitcoin-connect-react";
 import { NostrAccount } from "@lume/system";
 import { createFileRoute } from "@tanstack/react-router";
-import { getCurrent } from "@tauri-apps/api/webviewWindow";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 
 export const Route = createFileRoute("/settings/bitcoin-connect")({
 	beforeLoad: () => {
@@ -17,7 +17,7 @@ export const Route = createFileRoute("/settings/bitcoin-connect")({
 function Screen() {
 	const setNwcUri = async (uri: string) => {
 		const cmd = await NostrAccount.setWallet(uri);
-		if (cmd) getCurrent().close();
+		if (cmd) getCurrentWebviewWindow().close();
 	};
 
 	return (

apps/desktop2/src/routes/store.tsx

@@ -3,7 +3,7 @@ import type { LumeColumn } from "@lume/types";
 import * as ScrollArea from "@radix-ui/react-scroll-area";
 import { createFileRoute } from "@tanstack/react-router";
 import { resolveResource } from "@tauri-apps/api/path";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { readTextFile } from "@tauri-apps/plugin-fs";
 
 export const Route = createFileRoute("/store")({
@@ -24,7 +24,7 @@ function Screen() {
 	const { officialColumns } = Route.useRouteContext();
 
 	const install = async (column: LumeColumn) => {
-		const mainWindow = getCurrent();
+		const mainWindow = getCurrentWindow();
 		await mainWindow.emit("columns", { type: "add", column });
 	};
 

apps/desktop2/src/routes/zap.$id.tsx

@@ -1,7 +1,7 @@
 import { User } from "@/components/user";
 import { NostrQuery } from "@lume/system";
 import { createFileRoute } from "@tanstack/react-router";
-import { getCurrent } from "@tauri-apps/api/webviewWindow";
+import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { message } from "@tauri-apps/plugin-dialog";
 import { useState } from "react";
 import CurrencyInput from "react-currency-input-field";
@@ -35,7 +35,7 @@ function Screen() {
 			if (val) {
 				setIsCompleted(true);
 				// close current window
-				await getCurrent().close();
+				await getCurrentWebviewWindow().close();
 			}
 		} catch (e) {
 			setIsLoading(false);

apps/desktop2/vite.config.ts

@@ -1,19 +1,10 @@
 import { TanStackRouterVite } from "@tanstack/router-vite-plugin";
 import react from "@vitejs/plugin-react-swc";
 import { defineConfig } from "vite";
-import topLevelAwait from "vite-plugin-top-level-await";
 import viteTsconfigPaths from "vite-tsconfig-paths";
 
 export default defineConfig({
-	plugins: [
+	plugins: [react(), viteTsconfigPaths(), TanStackRouterVite()],
-		react(),
-		viteTsconfigPaths(),
-		topLevelAwait({
-			promiseExportName: "__tla",
-			promiseImportName: (i) => `__tla_${i}`,
-		}),
-		TanStackRouterVite(),
-	],
 	build: {
 		outDir: "../../dist",
 	},

apps/web/package.json

@@ -13,12 +13,12 @@
 		"@astrojs/check": "^0.5.10",
 		"@astrojs/tailwind": "^5.1.0",
 		"@fontsource/alice": "^5.0.13",
-		"astro": "^4.11.3",
+		"astro": "^4.11.6",
 		"astro-seo-meta": "^4.1.1",
 		"astro-seo-schema": "^4.0.2",
 		"schema-dts": "^1.1.2",
-		"tailwindcss": "^3.4.4",
+		"tailwindcss": "^3.4.6",
-		"typescript": "^5.5.2"
+		"typescript": "^5.5.3"
 	},
 	"devDependencies": {
 		"@tailwindcss/typography": "^0.5.13"

biome.json

@@ -1,28 +1,31 @@
 {
-	"$schema": "https://biomejs.dev/schemas/1.4.1/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.4.1/schema.json",
-	"organizeImports": {
+  "organizeImports": {
-		"enabled": true
+    "enabled": true
-	},
-	"files": {
-    "ignore": ["apps/desktop2/src/router.gen.ts"]
   },
-	"linter": {
+  "files": {
-		"enabled": true,
+    "ignore": [
-		"rules": {
+      "apps/desktop2/src/router.gen.ts",
-			"recommended": true,
+      "packages/system/src/commands.ts"
-			"style": {
+    ]
-				"noNonNullAssertion": "warn",
+  },
-				"noUselessElse": "off"
+  "linter": {
-			},
+    "enabled": true,
-			"correctness": {
+    "rules": {
-				"useExhaustiveDependencies": "off"
+      "recommended": true,
-			},
+      "style": {
-			"a11y": {
+        "noNonNullAssertion": "warn",
-				"noSvgWithoutTitle": "off"
+        "noUselessElse": "off"
-			},
+      },
-			"complexity": {
+      "correctness": {
-				"noStaticOnlyClass": "off"
+        "useExhaustiveDependencies": "off"
-			}
+      },
-		}
+      "a11y": {
-	}
+        "noSvgWithoutTitle": "off"
+      },
+      "complexity": {
+        "noStaticOnlyClass": "off"
+      }
+    }
+  }
 }

package.json

@@ -1,35 +1,35 @@
 {
-	"name": "lume",
+  "name": "lume",
-	"private": true,
+  "private": true,
-	"version": "4.0.0",
+  "version": "4.0.0",
-	"scripts": {
+  "scripts": {
-		"build": "turbo run build",
+    "build": "turbo run build",
-		"dev": "turbo run dev",
+    "dev": "turbo run dev",
-		"web:dev": "turbo run dev --filter web",
+    "web:dev": "turbo run dev --filter web",
-		"desktop:dev": "turbo run dev --filter desktop2",
+    "desktop:dev": "turbo run dev --filter desktop2",
-		"desktop:build": "turbo run build --filter desktop2",
+    "desktop:build": "turbo run build --filter desktop2",
-		"tauri": "tauri"
+    "tauri": "tauri"
-	},
+  },
-	"devDependencies": {
+  "devDependencies": {
-		"@biomejs/biome": "^1.8.3",
+    "@biomejs/biome": "^1.8.3",
-		"@tauri-apps/cli": "2.0.0-beta.20",
+    "@tauri-apps/cli": "2.0.0-beta.22",
-		"turbo": "^1.13.4"
+    "turbo": "^1.13.4"
-	},
+  },
-	"packageManager": "pnpm@8.9.0",
+  "packageManager": "pnpm@8.9.0",
-	"engines": {
+  "engines": {
-		"node": ">=18"
+    "node": ">=18"
-	},
+  },
-	"dependencies": {
+  "dependencies": {
-		"@tauri-apps/api": "2.0.0-beta.13",
+    "@tauri-apps/api": "2.0.0-beta.15",
-		"@tauri-apps/plugin-clipboard-manager": "2.1.0-beta.3",
+    "@tauri-apps/plugin-clipboard-manager": "2.1.0-beta.5",
-		"@tauri-apps/plugin-dialog": "2.0.0-beta.5",
+    "@tauri-apps/plugin-dialog": "2.0.0-beta.7",
-		"@tauri-apps/plugin-fs": "2.0.0-beta.5",
+    "@tauri-apps/plugin-fs": "2.0.0-beta.7",
-		"@tauri-apps/plugin-http": "2.0.0-beta.5",
+    "@tauri-apps/plugin-http": "2.0.0-beta.8",
-		"@tauri-apps/plugin-os": "github:tauri-apps/tauri-plugin-os#v2",
+    "@tauri-apps/plugin-os": "2.0.0-beta.7",
-		"@tauri-apps/plugin-process": "2.0.0-beta.5",
+    "@tauri-apps/plugin-process": "2.0.0-beta.7",
-		"@tauri-apps/plugin-shell": "2.0.0-beta.6",
+    "@tauri-apps/plugin-shell": "2.0.0-beta.8",
-		"@tauri-apps/plugin-updater": "2.0.0-beta.5",
+    "@tauri-apps/plugin-updater": "2.0.0-beta.7",
-		"@tauri-apps/plugin-upload": "2.0.0-beta.6",
+    "@tauri-apps/plugin-upload": "2.0.0-beta.8",
-		"@tauri-apps/plugin-window-state": "2.0.0-beta.6"
+    "@tauri-apps/plugin-window-state": "2.0.0-beta.8"
-	}
+  }
 }

packages/icons/package.json

@@ -9,6 +9,6 @@
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:*",
 		"@types/react": "^18.3.3",
-		"typescript": "^5.5.2"
+		"typescript": "^5.5.3"
 	}
 }

packages/system/package.json

@@ -5,15 +5,15 @@
 	"main": "./src/index.ts",
 	"dependencies": {
 		"@lume/utils": "workspace:^",
-		"@tanstack/query-persist-client-core": "^5.49.1",
+		"@tanstack/query-persist-client-core": "^5.51.9",
-		"@tanstack/react-query": "^5.49.2",
+		"@tanstack/react-query": "^5.51.9",
-		"nostr-tools": "^2.7.0",
+		"nostr-tools": "^2.7.1",
 		"react": "^18.3.1"
 	},
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
 		"@types/react": "^18.3.3",
-		"typescript": "^5.5.2"
+		"typescript": "^5.5.3"
 	}
 }

packages/system/src/account.ts

@@ -4,12 +4,7 @@ import { type Result, commands } from "./commands";
 export const NostrAccount = {
 	getAccounts: async () => {
 		const query = await commands.getAccounts();
-
+		return query;
-		if (query.status === "ok") {
-			return query.data;
-		} else {
-			return [];
-		}
 	},
 	loadAccount: async (npub: string) => {
 		const bunker: string = localStorage.getItem(`${npub}_bunker`);

packages/system/src/commands.ts

@@ -44,13 +44,8 @@ try {
     else return { status: "error", error: e  as any };
 }
 },
-async getAccounts() : Promise<Result<string[], string>> {
+async getAccounts() : Promise<string[]> {
-try {
+return await TAURI_INVOKE("get_accounts");
-    return { status: "ok", data: await TAURI_INVOKE("get_accounts") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
 },
 async createAccount() : Promise<Result<Account, string>> {
 try {

packages/system/src/query.ts

@@ -1,6 +1,6 @@
 import type { LumeColumn, Metadata, NostrEvent, Relay } from "@lume/types";
 import { resolveResource } from "@tauri-apps/api/path";
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { open } from "@tauri-apps/plugin-dialog";
 import { readFile, readTextFile } from "@tauri-apps/plugin-fs";
 import { relaunch } from "@tauri-apps/plugin-process";
@@ -201,7 +201,7 @@ export const NostrQuery = {
 		}
 	},
 	listenLocalEvent: async () => {
-		const label = getCurrent().label;
+		const label = getCurrentWindow().label;
 		const query = await commands.listenLocalEvent(label);
 
 		if (query.status === "ok") {
@@ -394,7 +394,7 @@ export const NostrQuery = {
 		}
 	},
 	unlisten: async (id?: string) => {
-		const label = id ? id : getCurrent().label;
+		const label = id ? id : getCurrentWindow().label;
 		const query = await commands.unlisten(label);
 
 		if (query.status === "ok") {

packages/tailwindcss/package.json

@@ -15,7 +15,7 @@
 		"@tailwindcss/typography": "^0.5.13",
 		"tailwind-gradient-mask-image": "^1.2.0",
 		"tailwind-scrollbar": "^3.1.0",
-		"tailwindcss": "^3.4.4",
+		"tailwindcss": "^3.4.6",
 		"tailwindcss-content-visibility": "^0.2.0"
 	}
 }

packages/types/package.json

@@ -9,6 +9,6 @@
 		"access": "public"
 	},
 	"devDependencies": {
-		"typescript": "^5.5.2"
+		"typescript": "^5.5.3"
 	}
 }

packages/ui/package.json

@@ -15,7 +15,7 @@
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
 		"@types/react": "^18.3.3",
-		"tailwindcss": "^3.4.4",
+		"tailwindcss": "^3.4.6",
-		"typescript": "^5.5.2"
+		"typescript": "^5.5.3"
 	}
 }

packages/utils/package.json

@@ -12,7 +12,7 @@
 		"clsx": "^2.1.1",
 		"dayjs": "^1.11.11",
 		"light-bolt11-decoder": "^3.1.1",
-		"nostr-tools": "^2.7.0",
+		"nostr-tools": "^2.7.1",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
 		"slate": "^0.103.0",
@@ -23,7 +23,7 @@
 		"@lume/types": "workspace:^",
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
-		"tailwind-merge": "^2.3.0",
+		"tailwind-merge": "^2.4.0",
-		"typescript": "^5.5.2"
+		"typescript": "^5.5.3"
 	}
 }

src-tauri/.rustfmt.toml

@@ -1 +0,0 @@
-tab_spaces=2

src-tauri/Cargo.toml

@@ -11,16 +11,16 @@ rust-version = "1.70"
 tauri-build = { version = "2.0.0-beta", features = [] }
 
 [dependencies]
-nostr-sdk = { version = "0.32", features = ["sqlite"] }
+nostr-sdk = { version = "0.33", features = ["sqlite"] }
 tokio = { version = "1", features = ["full"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "2.0.0-beta", features = [
-  "unstable",
+	"unstable",
-  "tray-icon",
+	"tray-icon",
-  "macos-private-api",
+	"macos-private-api",
-  "native-tls-vendored",
+	"native-tls-vendored",
-  "protocol-asset",
+	"protocol-asset",
 ] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
@@ -33,19 +33,23 @@ tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace"
 tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-specta = { git = "https://github.com/reyamir/tauri-specta", features = [
+tauri-specta = { git = "https://github.com/reyamir/tauri-specta", branch = "feat/tauri-v2", features = [
-  "typescript",
+	"typescript",
 ] }
 tauri-plugin-theme = "0.4.1"
-tauri-plugin-decorum = "0.1.0"
+tauri-plugin-decorum = { git = "https://github.com/reyamir/tauri-plugin-decorum", branch = "feat/tauri-v2" }
 specta = "^2.0.0-rc.12"
-keyring = "2"
-keyring-search = "0.2.0"
 reqwest = "0.12.4"
 url = "2.5.0"
 futures = "0.3.30"
 linkify = "0.10.0"
 regex = "1.10.4"
+keyring = { version = "3", features = [
+	"apple-native",
+	"windows-native",
+	"sync-secret-service",
+] }
+keyring-search = "1.2.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.25.0"
@@ -53,6 +57,7 @@ objc = "0.2.7"
 rand = "0.8.5"
 monitor = { git = "https://github.com/ahkohd/tauri-toolkit", branch = "v2" }
 tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
+border = { git = "https://github.com/ahkohd/tauri-toolkit", branch = "v2" }
 
 [profile.release]
 codegen-units = 1

src-tauri/gen/schemas/desktop-schema.json

@@ -6738,6 +6738,13 @@
             "window:allow-set-title"
           ]
         },
+        {
+          "description": "window:allow-set-title-bar-style -> Enables the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "enum": [
+            "window:allow-set-title-bar-style"
+          ]
+        },
         {
           "description": "window:allow-set-visible-on-all-workspaces -> Enables the set_visible_on_all_workspaces command without any pre-configured scope.",
           "type": "string",
@@ -7179,6 +7186,13 @@
             "window:deny-set-title"
           ]
         },
+        {
+          "description": "window:deny-set-title-bar-style -> Denies the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "enum": [
+            "window:deny-set-title-bar-style"
+          ]
+        },
         {
           "description": "window:deny-set-visible-on-all-workspaces -> Denies the set_visible_on_all_workspaces command without any pre-configured scope.",
           "type": "string",

src-tauri/gen/schemas/macOS-schema.json

@@ -6738,6 +6738,13 @@
             "window:allow-set-title"
           ]
         },
+        {
+          "description": "window:allow-set-title-bar-style -> Enables the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "enum": [
+            "window:allow-set-title-bar-style"
+          ]
+        },
         {
           "description": "window:allow-set-visible-on-all-workspaces -> Enables the set_visible_on_all_workspaces command without any pre-configured scope.",
           "type": "string",
@@ -7179,6 +7186,13 @@
             "window:deny-set-title"
           ]
         },
+        {
+          "description": "window:deny-set-title-bar-style -> Denies the set_title_bar_style command without any pre-configured scope.",
+          "type": "string",
+          "enum": [
+            "window:deny-set-title-bar-style"
+          ]
+        },
         {
           "description": "window:deny-set-visible-on-all-workspaces -> Denies the set_visible_on_all_workspaces command without any pre-configured scope.",
           "type": "string",

src-tauri/src/commands/fns.rs

@@ -1,177 +1,174 @@
 use std::ffi::CString;
 
-use tauri::{AppHandle, Manager, WebviewWindow};
+use tauri::{AppHandle, Emitter, Listener, Manager, WebviewWindow};
 use tauri_nspanel::{
-  block::ConcreteBlock,
+    block::ConcreteBlock,
-  cocoa::{
+    cocoa::{
-    appkit::{NSMainMenuWindowLevel, NSView, NSWindow, NSWindowCollectionBehavior},
+        appkit::{NSMainMenuWindowLevel, NSView, NSWindow, NSWindowCollectionBehavior},
-    base::{id, nil},
+        base::{id, nil},
-    foundation::{NSPoint, NSRect},
+        foundation::{NSPoint, NSRect},
-  },
+    },
-  objc::{class, msg_send, runtime::NO, sel, sel_impl},
+    objc::{class, msg_send, runtime::NO, sel, sel_impl},
-  panel_delegate, ManagerExt, WebviewWindowExt,
+    panel_delegate, ManagerExt, WebviewWindowExt,
 };
 
 #[allow(non_upper_case_globals)]
 const NSWindowStyleMaskNonActivatingPanel: i32 = 1 << 7;
 
 pub fn swizzle_to_menubar_panel(app_handle: &tauri::AppHandle) {
-  let panel_delegate = panel_delegate!(SpotlightPanelDelegate {
+    let panel_delegate = panel_delegate!(SpotlightPanelDelegate {
-    window_did_resign_key
+        window_did_resign_key
-  });
+    });
 
-  let window = app_handle.get_webview_window("panel").unwrap();
+    let window = app_handle.get_webview_window("panel").unwrap();
 
-  let panel = window.to_panel().unwrap();
+    let panel = window.to_panel().unwrap();
 
-  let handle = app_handle.clone();
+    let handle = app_handle.clone();
 
-  panel_delegate.set_listener(Box::new(move |delegate_name: String| {
+    panel_delegate.set_listener(Box::new(move |delegate_name: String| {
-    match delegate_name.as_str() {
+        if delegate_name.as_str() == "window_did_resign_key" {
-      "window_did_resign_key" => {
+            let _ = handle.emit("menubar_panel_did_resign_key", ());
-        let _ = handle.emit("menubar_panel_did_resign_key", ());
+        }
-      }
+    }));
-      _ => (),
-    }
-  }));
 
-  panel.set_level(NSMainMenuWindowLevel + 1);
+    panel.set_level(NSMainMenuWindowLevel + 1);
 
-  panel.set_style_mask(NSWindowStyleMaskNonActivatingPanel);
+    panel.set_style_mask(NSWindowStyleMaskNonActivatingPanel);
 
-  panel.set_collection_behaviour(
+    panel.set_collection_behaviour(
-    NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces
+        NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces
-      | NSWindowCollectionBehavior::NSWindowCollectionBehaviorStationary
+            | NSWindowCollectionBehavior::NSWindowCollectionBehaviorStationary
-      | NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary,
+            | NSWindowCollectionBehavior::NSWindowCollectionBehaviorFullScreenAuxiliary,
-  );
+    );
 
-  panel.set_delegate(panel_delegate);
+    panel.set_delegate(panel_delegate);
 }
 
 pub fn setup_menubar_panel_listeners(app_handle: &AppHandle) {
-  fn hide_menubar_panel(app_handle: &tauri::AppHandle) {
+    fn hide_menubar_panel(app_handle: &tauri::AppHandle) {
-    if check_menubar_frontmost() {
+        if check_menubar_frontmost() {
-      return;
+            return;
+        }
+
+        let panel = app_handle.get_webview_panel("panel").unwrap();
+
+        panel.order_out(None);
     }
 
-    let panel = app_handle.get_webview_panel("panel").unwrap();
+    let handle = app_handle.clone();
 
-    panel.order_out(None);
+    app_handle.listen_any("menubar_panel_did_resign_key", move |_| {
-  }
+        hide_menubar_panel(&handle);
+    });
 
-  let handle = app_handle.clone();
+    let handle = app_handle.clone();
 
-  app_handle.listen_any("menubar_panel_did_resign_key", move |_| {
+    let callback = Box::new(move || {
-    hide_menubar_panel(&handle);
+        hide_menubar_panel(&handle);
-  });
+    });
 
-  let handle = app_handle.clone();
+    register_workspace_listener(
+        "NSWorkspaceDidActivateApplicationNotification".into(),
+        callback.clone(),
+    );
 
-  let callback = Box::new(move || {
+    register_workspace_listener(
-    hide_menubar_panel(&handle);
+        "NSWorkspaceActiveSpaceDidChangeNotification".into(),
-  });
+        callback,
-
+    );
-  register_workspace_listener(
-    "NSWorkspaceDidActivateApplicationNotification".into(),
-    callback.clone(),
-  );
-
-  register_workspace_listener(
-    "NSWorkspaceActiveSpaceDidChangeNotification".into(),
-    callback,
-  );
 }
 
 pub fn set_corner_radius(window: &WebviewWindow, radius: f64) {
-  let win: id = window.ns_window().unwrap() as _;
+    let win: id = window.ns_window().unwrap() as _;
 
-  unsafe {
+    unsafe {
-    let view: id = win.contentView();
+        let view: id = win.contentView();
 
-    view.wantsLayer();
+        view.wantsLayer();
 
-    let layer: id = view.layer();
+        let layer: id = view.layer();
 
-    let _: () = msg_send![layer, setCornerRadius: radius];
+        let _: () = msg_send![layer, setCornerRadius: radius];
-  }
+    }
 }
 
 pub fn position_menubar_panel(app_handle: &tauri::AppHandle, padding_top: f64) {
-  let window = app_handle.get_webview_window("panel").unwrap();
+    let window = app_handle.get_webview_window("panel").unwrap();
 
-  let monitor = monitor::get_monitor_with_cursor().unwrap();
+    let monitor = monitor::get_monitor_with_cursor().unwrap();
 
-  let scale_factor = monitor.scale_factor();
+    let scale_factor = monitor.scale_factor();
 
-  let visible_area = monitor.visible_area();
+    let visible_area = monitor.visible_area();
 
-  let monitor_pos = visible_area.position().to_logical::<f64>(scale_factor);
+    let monitor_pos = visible_area.position().to_logical::<f64>(scale_factor);
 
-  let monitor_size = visible_area.size().to_logical::<f64>(scale_factor);
+    let monitor_size = visible_area.size().to_logical::<f64>(scale_factor);
 
-  let mouse_location: NSPoint = unsafe { msg_send![class!(NSEvent), mouseLocation] };
+    let mouse_location: NSPoint = unsafe { msg_send![class!(NSEvent), mouseLocation] };
 
-  let handle: id = window.ns_window().unwrap() as _;
+    let handle: id = window.ns_window().unwrap() as _;
 
-  let mut win_frame: NSRect = unsafe { msg_send![handle, frame] };
+    let mut win_frame: NSRect = unsafe { msg_send![handle, frame] };
 
-  win_frame.origin.y = (monitor_pos.y + monitor_size.height) - win_frame.size.height;
+    win_frame.origin.y = (monitor_pos.y + monitor_size.height) - win_frame.size.height;
 
-  win_frame.origin.y -= padding_top;
+    win_frame.origin.y -= padding_top;
 
-  win_frame.origin.x = {
+    win_frame.origin.x = {
-    let top_right = mouse_location.x + (win_frame.size.width / 2.0);
+        let top_right = mouse_location.x + (win_frame.size.width / 2.0);
 
-    let is_offscreen = top_right > monitor_pos.x + monitor_size.width;
+        let is_offscreen = top_right > monitor_pos.x + monitor_size.width;
 
-    if !is_offscreen {
+        if !is_offscreen {
-      mouse_location.x - (win_frame.size.width / 2.0)
+            mouse_location.x - (win_frame.size.width / 2.0)
-    } else {
+        } else {
-      let diff = top_right - (monitor_pos.x + monitor_size.width);
+            let diff = top_right - (monitor_pos.x + monitor_size.width);
 
-      mouse_location.x - (win_frame.size.width / 2.0) - diff
+            mouse_location.x - (win_frame.size.width / 2.0) - diff
-    }
+        }
-  };
+    };
 
-  let _: () = unsafe { msg_send![handle, setFrame: win_frame display: NO] };
+    let _: () = unsafe { msg_send![handle, setFrame: win_frame display: NO] };
 }
 
 fn register_workspace_listener(name: String, callback: Box<dyn Fn()>) {
-  let workspace: id = unsafe { msg_send![class!(NSWorkspace), sharedWorkspace] };
+    let workspace: id = unsafe { msg_send![class!(NSWorkspace), sharedWorkspace] };
-  let notification_center: id = unsafe { msg_send![workspace, notificationCenter] };
+    let notification_center: id = unsafe { msg_send![workspace, notificationCenter] };
 
-  let block = ConcreteBlock::new(move |_notif: id| {
+    let block = ConcreteBlock::new(move |_notif: id| {
-    callback();
+        callback();
-  });
+    });
 
-  let block = block.copy();
+    let block = block.copy();
 
-  let name: id =
+    let name: id =
-    unsafe { msg_send![class!(NSString), stringWithCString: CString::new(name).unwrap()] };
+        unsafe { msg_send![class!(NSString), stringWithCString: CString::new(name).unwrap()] };
 
-  unsafe {
+    unsafe {
-    let _: () = msg_send![
+        let _: () = msg_send![
-        notification_center,
+            notification_center,
-        addObserverForName: name object: nil queue: nil usingBlock: block
+            addObserverForName: name object: nil queue: nil usingBlock: block
-    ];
+        ];
-  }
+    }
 }
 
 fn app_pid() -> i32 {
-  let process_info: id = unsafe { msg_send![class!(NSProcessInfo), processInfo] };
+    let process_info: id = unsafe { msg_send![class!(NSProcessInfo), processInfo] };
-  let pid: i32 = unsafe { msg_send![process_info, processIdentifier] };
+    let pid: i32 = unsafe { msg_send![process_info, processIdentifier] };
 
-  pid
+    pid
 }
 
 fn get_frontmost_app_pid() -> i32 {
-  let workspace: id = unsafe { msg_send![class!(NSWorkspace), sharedWorkspace] };
+    let workspace: id = unsafe { msg_send![class!(NSWorkspace), sharedWorkspace] };
-  let frontmost_application: id = unsafe { msg_send![workspace, frontmostApplication] };
+    let frontmost_application: id = unsafe { msg_send![workspace, frontmostApplication] };
-  let pid: i32 = unsafe { msg_send![frontmost_application, processIdentifier] };
+    let pid: i32 = unsafe { msg_send![frontmost_application, processIdentifier] };
 
-  pid
+    pid
 }
 
 pub fn check_menubar_frontmost() -> bool {
-  get_frontmost_app_pid() == app_pid()
+    get_frontmost_app_pid() == app_pid()
 }

src-tauri/src/commands/mod.rs

@@ -1,3 +1,5 @@
+#[cfg(target_os = "macos")]
 pub mod fns;
+#[cfg(target_os = "macos")]
 pub mod tray;
 pub mod window;

src-tauri/src/commands/tray.rs

@@ -1,65 +1,65 @@
 use std::path::PathBuf;
 use tauri::window::{Effect, EffectsBuilder};
 use tauri::{
-  tray::{MouseButtonState, TrayIconEvent},
+    tray::{MouseButtonState, TrayIconEvent},
-  WebviewWindowBuilder,
+    WebviewWindowBuilder,
 };
 use tauri::{AppHandle, Manager, WebviewUrl};
 use tauri_nspanel::ManagerExt;
 
 use super::fns::{
-  position_menubar_panel, set_corner_radius, setup_menubar_panel_listeners,
+    position_menubar_panel, set_corner_radius, setup_menubar_panel_listeners,
-  swizzle_to_menubar_panel,
+    swizzle_to_menubar_panel,
 };
 
 pub fn create_tray_panel(account: &str, app: &AppHandle) {
-  let tray = app.tray_by_id("main").unwrap();
+    let tray = app.tray_by_id("main").unwrap();
 
-  tray.on_tray_icon_event(|tray, event| {
+    tray.on_tray_icon_event(|tray, event| {
-    if let TrayIconEvent::Click { button_state, .. } = event {
+        if let TrayIconEvent::Click { button_state, .. } = event {
-      if button_state == MouseButtonState::Up {
+            if button_state == MouseButtonState::Up {
-        let app = tray.app_handle();
+                let app = tray.app_handle();
-        let panel = app.get_webview_panel("panel").unwrap();
+                let panel = app.get_webview_panel("panel").unwrap();
 
-        match panel.is_visible() {
+                match panel.is_visible() {
-          true => panel.order_out(None),
+                    true => panel.order_out(None),
-          false => {
+                    false => {
-            position_menubar_panel(app, 0.0);
+                        position_menubar_panel(app, 0.0);
-            panel.show();
+                        panel.show();
-          }
+                    }
+                }
+            }
         }
-      }
+    });
-    }
-  });
 
-  if let Some(window) = app.get_webview_window("panel") {
+    if let Some(window) = app.get_webview_window("panel") {
-    let _ = window.destroy();
+        let _ = window.destroy();
-  };
+    };
 
-  let mut url = "/panel/".to_owned();
+    let mut url = "/panel/".to_owned();
-  url.push_str(account);
+    url.push_str(account);
 
-  let window = WebviewWindowBuilder::new(app, "panel", WebviewUrl::App(PathBuf::from(url)))
+    let window = WebviewWindowBuilder::new(app, "panel", WebviewUrl::App(PathBuf::from(url)))
-    .title("Panel")
+        .title("Panel")
-    .inner_size(350.0, 500.0)
+        .inner_size(350.0, 500.0)
-    .fullscreen(false)
+        .fullscreen(false)
-    .resizable(false)
+        .resizable(false)
-    .visible(false)
+        .visible(false)
-    .decorations(false)
+        .decorations(false)
-    .transparent(true)
+        .transparent(true)
-    .build()
+        .build()
-    .unwrap();
+        .unwrap();
 
-  let _ = window.set_effects(
+    let _ = window.set_effects(
-    EffectsBuilder::new()
+        EffectsBuilder::new()
-      .effect(Effect::Popover)
+            .effect(Effect::Popover)
-      .state(tauri::window::EffectState::FollowsWindowActiveState)
+            .state(tauri::window::EffectState::FollowsWindowActiveState)
-      .build(),
+            .build(),
-  );
+    );
 
-  set_corner_radius(&window, 13.0);
+    set_corner_radius(&window, 13.0);
 
-  // Convert window to panel
+    // Convert window to panel
-  swizzle_to_menubar_panel(app);
+    swizzle_to_menubar_panel(app);
-  setup_menubar_panel_listeners(app);
+    setup_menubar_panel_listeners(app);
 }

src-tauri/src/commands/window.rs

@@ -1,16 +1,21 @@
 use std::path::PathBuf;
 use std::str::FromStr;
 
+#[cfg(target_os = "macos")]
+use border::WebviewWindowExt as BorderWebviewWindowExt;
 #[cfg(target_os = "macos")]
 use cocoa::{appkit::NSApp, base::nil, foundation::NSString};
 use serde::{Deserialize, Serialize};
 use specta::Type;
+#[cfg(not(target_os = "linux"))]
 use tauri::utils::config::WindowEffectsConfig;
+#[cfg(not(target_os = "linux"))]
 use tauri::window::Effect;
 #[cfg(target_os = "macos")]
 use tauri::TitleBarStyle;
 use tauri::WebviewWindowBuilder;
 use tauri::{LogicalPosition, LogicalSize, Manager, State, WebviewUrl};
+#[cfg(not(target_os = "linux"))]
 use tauri_plugin_decorum::WebviewWindowExt;
 use url::Url;
 
@@ -18,246 +23,261 @@ use crate::Nostr;
 
 #[derive(Serialize, Deserialize, Type)]
 pub struct Window {
-  label: String,
+    label: String,
-  title: String,
+    title: String,
-  url: String,
+    url: String,
-  width: f64,
+    width: f64,
-  height: f64,
+    height: f64,
-  maximizable: bool,
+    maximizable: bool,
-  minimizable: bool,
+    minimizable: bool,
-  hidden_title: bool,
+    hidden_title: bool,
 }
 
 #[derive(Serialize, Deserialize, Type)]
 pub struct Column {
-  label: String,
+    label: String,
-  url: String,
+    url: String,
-  x: f32,
+    x: f32,
-  y: f32,
+    y: f32,
-  width: f32,
+    width: f32,
-  height: f32,
+    height: f32,
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn create_column(
-  column: Column,
+    column: Column,
-  app_handle: tauri::AppHandle,
+    app_handle: tauri::AppHandle,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<String, String> {
-  let settings = state.settings.lock().unwrap().clone();
+    let settings = state.settings.lock().unwrap().clone();
 
-  match app_handle.get_window("main") {
+    match app_handle.get_window("main") {
-    Some(main_window) => match app_handle.get_webview(&column.label) {
+        Some(main_window) => match app_handle.get_webview(&column.label) {
-      Some(_) => Ok(column.label),
+            Some(_) => Ok(column.label),
-      None => {
+            None => {
-        let path = PathBuf::from(column.url);
+                let path = PathBuf::from(column.url);
-        let webview_url = WebviewUrl::App(path);
+                let webview_url = WebviewUrl::App(path);
-        let builder = match settings.proxy {
+                let builder = match settings.proxy {
-          Some(url) => {
+                    Some(url) => {
-            let proxy = Url::from_str(&url).unwrap();
+                        let proxy = Url::from_str(&url).unwrap();
-            tauri::webview::WebviewBuilder::new(column.label, webview_url)
+                        tauri::webview::WebviewBuilder::new(column.label, webview_url)
-              .user_agent("Lume/4.0")
+                            .user_agent("Lume/4.0")
-              .zoom_hotkeys_enabled(true)
+                            .zoom_hotkeys_enabled(true)
-              .enable_clipboard_access()
+                            .enable_clipboard_access()
-              .transparent(true)
+                            .transparent(true)
-              .proxy_url(proxy)
+                            .proxy_url(proxy)
-          }
+                    }
-          None => tauri::webview::WebviewBuilder::new(column.label, webview_url)
+                    None => tauri::webview::WebviewBuilder::new(column.label, webview_url)
-            .user_agent("Lume/4.0")
+                        .user_agent("Lume/4.0")
-            .zoom_hotkeys_enabled(true)
+                        .zoom_hotkeys_enabled(true)
-            .enable_clipboard_access()
+                        .enable_clipboard_access()
-            .transparent(true),
+                        .transparent(true),
-        };
+                };
-        match main_window.add_child(
+                match main_window.add_child(
-          builder,
+                    builder,
-          LogicalPosition::new(column.x, column.y),
+                    LogicalPosition::new(column.x, column.y),
-          LogicalSize::new(column.width, column.height),
+                    LogicalSize::new(column.width, column.height),
-        ) {
+                ) {
-          Ok(webview) => Ok(webview.label().into()),
+                    Ok(webview) => Ok(webview.label().into()),
-          Err(_) => Err("Create webview failed".into()),
+                    Err(_) => Err("Create webview failed".into()),
-        }
+                }
-      }
+            }
-    },
+        },
-    None => Err("Main window not found".into()),
+        None => Err("Main window not found".into()),
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn close_column(label: &str, app_handle: tauri::AppHandle) -> Result<bool, String> {
-  match app_handle.get_webview(label) {
+    match app_handle.get_webview(label) {
-    Some(webview) => {
+        Some(webview) => {
-      if webview.close().is_ok() {
+            if webview.close().is_ok() {
-        Ok(true)
+                Ok(true)
-      } else {
+            } else {
-        Ok(false)
+                Ok(false)
-      }
+            }
+        }
+        None => Err("Column not found.".into()),
     }
-    None => Err("Column not found.".into()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn reposition_column(
-  label: &str,
+    label: &str,
-  x: f32,
+    x: f32,
-  y: f32,
+    y: f32,
-  app_handle: tauri::AppHandle,
+    app_handle: tauri::AppHandle,
 ) -> Result<(), String> {
-  match app_handle.get_webview(label) {
+    match app_handle.get_webview(label) {
-    Some(webview) => {
+        Some(webview) => {
-      if webview.set_position(LogicalPosition::new(x, y)).is_ok() {
+            if webview.set_position(LogicalPosition::new(x, y)).is_ok() {
-        Ok(())
+                Ok(())
-      } else {
+            } else {
-        Err("Reposition column failed".into())
+                Err("Reposition column failed".into())
-      }
+            }
+        }
+        None => Err("Webview not found".into()),
     }
-    None => Err("Webview not found".into()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn resize_column(
-  label: &str,
+    label: &str,
-  width: f32,
+    width: f32,
-  height: f32,
+    height: f32,
-  app_handle: tauri::AppHandle,
+    app_handle: tauri::AppHandle,
 ) -> Result<(), String> {
-  match app_handle.get_webview(label) {
+    match app_handle.get_webview(label) {
-    Some(webview) => {
+        Some(webview) => {
-      if webview.set_size(LogicalSize::new(width, height)).is_ok() {
+            if webview.set_size(LogicalSize::new(width, height)).is_ok() {
-        Ok(())
+                Ok(())
-      } else {
+            } else {
-        Err("Resize column failed".into())
+                Err("Resize column failed".into())
-      }
+            }
+        }
+        None => Err("Webview not found".into()),
     }
-    None => Err("Webview not found".into()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn reload_column(label: &str, app_handle: tauri::AppHandle) -> Result<(), String> {
-  match app_handle.get_webview(label) {
+    match app_handle.get_webview(label) {
-    Some(webview) => {
+        Some(webview) => {
-      if webview.eval("window.location.reload()").is_ok() {
+            if webview.eval("window.location.reload()").is_ok() {
-        Ok(())
+                Ok(())
-      } else {
+            } else {
-        Err("Reload column failed".into())
+                Err("Reload column failed".into())
-      }
+            }
+        }
+        None => Err("Webview not found".into()),
     }
-    None => Err("Webview not found".into()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn open_window(window: Window, app_handle: tauri::AppHandle) -> Result<(), String> {
-  if let Some(window) = app_handle.get_window(&window.label) {
+    if let Some(window) = app_handle.get_window(&window.label) {
-    if window.is_visible().unwrap_or_default() {
+        if window.is_visible().unwrap_or_default() {
-      let _ = window.set_focus();
+            let _ = window.set_focus();
+        } else {
+            let _ = window.show();
+            let _ = window.set_focus();
+        };
     } else {
-      let _ = window.show();
+        #[cfg(target_os = "macos")]
-      let _ = window.set_focus();
+        let window = WebviewWindowBuilder::new(
-    };
+            &app_handle,
-  } else {
+            &window.label,
-    #[cfg(target_os = "macos")]
+            WebviewUrl::App(PathBuf::from(window.url)),
-    let window = WebviewWindowBuilder::new(
+        )
-      &app_handle,
+        .title(&window.title)
-      &window.label,
+        .min_inner_size(window.width, window.height)
-      WebviewUrl::App(PathBuf::from(window.url)),
+        .inner_size(window.width, window.height)
-    )
+        .hidden_title(window.hidden_title)
-    .title(&window.title)
+        .title_bar_style(TitleBarStyle::Overlay)
-    .min_inner_size(window.width, window.height)
+        .minimizable(window.minimizable)
-    .inner_size(window.width, window.height)
+        .maximizable(window.maximizable)
-    .hidden_title(window.hidden_title)
+        .transparent(true)
-    .title_bar_style(TitleBarStyle::Overlay)
+        .effects(WindowEffectsConfig {
-    .minimizable(window.minimizable)
+            state: None,
-    .maximizable(window.maximizable)
+            effects: vec![Effect::UnderWindowBackground],
-    .effects(WindowEffectsConfig {
+            radius: None,
-      state: None,
+            color: None,
-      effects: vec![Effect::UnderWindowBackground],
+        })
-      radius: None,
+        .build()
-      color: None,
+        .unwrap();
-    })
-    .build()
-    .unwrap();
 
-    #[cfg(target_os = "windows")]
+        #[cfg(target_os = "windows")]
-    let window = WebviewWindowBuilder::new(&app_handle, label, WebviewUrl::App(PathBuf::from(url)))
+        let window = WebviewWindowBuilder::new(
-      .title(title)
+            &app_handle,
-      .min_inner_size(width, height)
+            &window.label,
-      .inner_size(width, height)
+            WebviewUrl::App(PathBuf::from(window.url)),
-      .effects(WindowEffectsConfig {
+        )
-        state: None,
+        .title(&window.title)
-        effects: vec![Effect::Mica],
+        .min_inner_size(window.width, window.height)
-        radius: None,
+        .inner_size(window.width, window.height)
-        color: None,
+        .minimizable(window.minimizable)
-      })
+        .maximizable(window.maximizable)
-      .build()
+        .effects(WindowEffectsConfig {
-      .unwrap();
+            state: None,
+            effects: vec![Effect::Mica],
+            radius: None,
+            color: None,
+        })
+        .build()
+        .unwrap();
 
-    #[cfg(target_os = "linux")]
+        #[cfg(target_os = "linux")]
-    let window = WebviewWindowBuilder::new(&app_handle, label, WebviewUrl::App(PathBuf::from(url)))
+        let window = WebviewWindowBuilder::new(
-      .title(title)
+            &app_handle,
-      .min_inner_size(width, height)
+            &window.label,
-      .inner_size(width, height)
+            WebviewUrl::App(PathBuf::from(window.url)),
-      .build()
+        )
-      .unwrap();
+        .title(&window.title)
+        .min_inner_size(window.width, window.height)
+        .inner_size(window.width, window.height)
+        .minimizable(window.minimizable)
+        .maximizable(window.maximizable)
+        .build()
+        .unwrap();
 
-    // Set decoration
+        // Set decoration
-    window.create_overlay_titlebar().unwrap();
+        #[cfg(not(target_os = "linux"))]
+        window.create_overlay_titlebar().unwrap();
 
-    // Make main window transparent
+        // Restore native border
-    #[cfg(target_os = "macos")]
+        #[cfg(target_os = "macos")]
-    window.make_transparent().unwrap();
+        window.add_border(None);
-  }
+    }
 
-  Ok(())
+    Ok(())
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn open_main_window(app: tauri::AppHandle) {
-  if let Some(window) = app.get_window("main") {
+    if let Some(window) = app.get_window("main") {
-    if window.is_visible().unwrap_or_default() {
+        if window.is_visible().unwrap_or_default() {
-      let _ = window.set_focus();
+            let _ = window.set_focus();
+        } else {
+            let _ = window.show();
+            let _ = window.set_focus();
+        };
     } else {
-      let _ = window.show();
+        let window =
-      let _ = window.set_focus();
+            WebviewWindowBuilder::from_config(&app, app.config().app.windows.first().unwrap())
-    };
+                .unwrap()
-  } else {
+                .build()
-    let window = WebviewWindowBuilder::from_config(&app, app.config().app.windows.first().unwrap())
+                .unwrap();
-      .unwrap()
-      .build()
-      .unwrap();
 
-    // Make main window transparent
+        // Restore native border
-    #[cfg(target_os = "macos")]
+        #[cfg(target_os = "macos")]
-    window.make_transparent().unwrap();
+        window.add_border(None);
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn force_quit() {
-  std::process::exit(0)
+    std::process::exit(0)
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn set_badge(count: i32) {
-  #[cfg(target_os = "macos")]
+    #[cfg(target_os = "macos")]
-  unsafe {
+    unsafe {
-    let label = if count == 0 {
+        let label = if count == 0 {
-      nil
+            nil
-    } else {
+        } else {
-      NSString::alloc(nil).init_str(&format!("{}", count))
+            NSString::alloc(nil).init_str(&format!("{}", count))
-    };
+        };
-    let dock_tile: cocoa::base::id = msg_send![NSApp(), dockTile];
+        let dock_tile: cocoa::base::id = msg_send![NSApp(), dockTile];
-    let _: cocoa::base::id = msg_send![dock_tile, setBadgeLabel: label];
+        let _: cocoa::base::id = msg_send![dock_tile, setBadgeLabel: label];
-  }
+    }
 }

src-tauri/src/main.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(
-  all(not(debug_assertions), target_os = "windows"),
+    all(not(debug_assertions), target_os = "windows"),
-  windows_subsystem = "windows"
+    windows_subsystem = "windows"
 )]
 
 #[cfg(target_os = "macos")]
@@ -9,17 +9,20 @@ extern crate cocoa;
 #[macro_use]
 extern crate objc;
 
+#[cfg(target_os = "macos")]
+use border::WebviewWindowExt as BorderWebviewWindowExt;
 use nostr_sdk::prelude::*;
 use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::sync::Mutex;
 use std::time::Duration;
 use std::{
-  fs,
+    fs,
-  io::{self, BufRead},
+    io::{self, BufRead},
-  str::FromStr,
+    str::FromStr,
 };
 use tauri::{path::BaseDirectory, Manager};
+#[cfg(not(target_os = "linux"))]
 use tauri_plugin_decorum::WebviewWindowExt;
 
 pub mod commands;
@@ -27,39 +30,39 @@ pub mod nostr;
 
 #[derive(Serialize)]
 pub struct Nostr {
-  #[serde(skip_serializing)]
+    #[serde(skip_serializing)]
-  client: Client,
+    client: Client,
-  contact_list: Mutex<Vec<Contact>>,
+    contact_list: Mutex<Vec<Contact>>,
-  settings: Mutex<Settings>,
+    settings: Mutex<Settings>,
 }
 
 #[derive(Clone, Serialize, Deserialize, Type)]
 pub struct Settings {
-  proxy: Option<String>,
+    proxy: Option<String>,
-  image_resize_service: Option<String>,
+    image_resize_service: Option<String>,
-  use_relay_hint: bool,
+    use_relay_hint: bool,
-  content_warning: bool,
+    content_warning: bool,
-  display_avatar: bool,
+    display_avatar: bool,
-  display_zap_button: bool,
+    display_zap_button: bool,
-  display_repost_button: bool,
+    display_repost_button: bool,
-  display_media: bool,
+    display_media: bool,
-  vibrancy: bool,
+    vibrancy: bool,
 }
 
 impl Default for Settings {
-  fn default() -> Self {
+    fn default() -> Self {
-    Self {
+        Self {
-      proxy: None,
+            proxy: None,
-      image_resize_service: Some("https://wsrv.nl/".into()),
+            image_resize_service: Some("https://wsrv.nl/".into()),
-      use_relay_hint: true,
+            use_relay_hint: true,
-      content_warning: true,
+            content_warning: true,
-      display_avatar: true,
+            display_avatar: true,
-      display_zap_button: true,
+            display_zap_button: true,
-      display_repost_button: true,
+            display_repost_button: true,
-      display_media: true,
+            display_media: true,
-      vibrancy: true,
+            vibrancy: true,
+        }
     }
-  }
 }
 
 pub const FETCH_LIMIT: usize = 20;
@@ -67,182 +70,194 @@ pub const NEWSFEED_NEG_LIMIT: usize = 256;
 pub const NOTIFICATION_NEG_LIMIT: usize = 64;
 
 fn main() {
-  let mut ctx = tauri::generate_context!();
+    let mut ctx = tauri::generate_context!();
 
-  let invoke_handler = {
+    let invoke_handler = {
-    let builder = tauri_specta::ts::builder().commands(tauri_specta::collect_commands![
+        let builder = tauri_specta::ts::builder().commands(tauri_specta::collect_commands![
-      nostr::relay::get_relays,
+            nostr::relay::get_relays,
-      nostr::relay::connect_relay,
+            nostr::relay::connect_relay,
-      nostr::relay::remove_relay,
+            nostr::relay::remove_relay,
-      nostr::relay::get_bootstrap_relays,
+            nostr::relay::get_bootstrap_relays,
-      nostr::relay::save_bootstrap_relays,
+            nostr::relay::save_bootstrap_relays,
-      nostr::keys::get_accounts,
+            nostr::keys::get_accounts,
-      nostr::keys::create_account,
+            nostr::keys::create_account,
-      nostr::keys::save_account,
+            nostr::keys::save_account,
-      nostr::keys::get_encrypted_key,
+            nostr::keys::get_encrypted_key,
-      nostr::keys::get_private_key,
+            nostr::keys::get_private_key,
-      nostr::keys::connect_remote_account,
+            nostr::keys::connect_remote_account,
-      nostr::keys::load_account,
+            nostr::keys::load_account,
-      nostr::metadata::get_current_profile,
+            nostr::metadata::get_current_profile,
-      nostr::metadata::get_profile,
+            nostr::metadata::get_profile,
-      nostr::metadata::get_contact_list,
+            nostr::metadata::get_contact_list,
-      nostr::metadata::set_contact_list,
+            nostr::metadata::set_contact_list,
-      nostr::metadata::create_profile,
+            nostr::metadata::create_profile,
-      nostr::metadata::is_contact_list_empty,
+            nostr::metadata::is_contact_list_empty,
-      nostr::metadata::check_contact,
+            nostr::metadata::check_contact,
-      nostr::metadata::toggle_contact,
+            nostr::metadata::toggle_contact,
-      nostr::metadata::get_nstore,
+            nostr::metadata::get_nstore,
-      nostr::metadata::set_nstore,
+            nostr::metadata::set_nstore,
-      nostr::metadata::set_wallet,
+            nostr::metadata::set_wallet,
-      nostr::metadata::load_wallet,
+            nostr::metadata::load_wallet,
-      nostr::metadata::remove_wallet,
+            nostr::metadata::remove_wallet,
-      nostr::metadata::zap_profile,
+            nostr::metadata::zap_profile,
-      nostr::metadata::zap_event,
+            nostr::metadata::zap_event,
-      nostr::metadata::friend_to_friend,
+            nostr::metadata::friend_to_friend,
-      nostr::metadata::get_notifications,
+            nostr::metadata::get_notifications,
-      nostr::metadata::get_settings,
+            nostr::metadata::get_settings,
-      nostr::metadata::set_new_settings,
+            nostr::metadata::set_new_settings,
-      nostr::metadata::verify_nip05,
+            nostr::metadata::verify_nip05,
-      nostr::event::get_event_meta,
+            nostr::event::get_event_meta,
-      nostr::event::get_event,
+            nostr::event::get_event,
-      nostr::event::get_event_from,
+            nostr::event::get_event_from,
-      nostr::event::get_replies,
+            nostr::event::get_replies,
-      nostr::event::listen_event_reply,
+            nostr::event::listen_event_reply,
-      nostr::event::get_events_by,
+            nostr::event::get_events_by,
-      nostr::event::get_local_events,
+            nostr::event::get_local_events,
-      nostr::event::listen_local_event,
+            nostr::event::listen_local_event,
-      nostr::event::get_group_events,
+            nostr::event::get_group_events,
-      nostr::event::get_global_events,
+            nostr::event::get_global_events,
-      nostr::event::get_hashtag_events,
+            nostr::event::get_hashtag_events,
-      nostr::event::publish,
+            nostr::event::publish,
-      nostr::event::reply,
+            nostr::event::reply,
-      nostr::event::repost,
+            nostr::event::repost,
-      nostr::event::event_to_bech32,
+            nostr::event::event_to_bech32,
-      nostr::event::user_to_bech32,
+            nostr::event::user_to_bech32,
-      nostr::event::unlisten,
+            nostr::event::unlisten,
-      commands::window::create_column,
+            commands::window::create_column,
-      commands::window::close_column,
+            commands::window::close_column,
-      commands::window::reposition_column,
+            commands::window::reposition_column,
-      commands::window::resize_column,
+            commands::window::resize_column,
-      commands::window::reload_column,
+            commands::window::reload_column,
-      commands::window::open_window,
+            commands::window::open_window,
-      commands::window::open_main_window,
+            commands::window::open_main_window,
-      commands::window::force_quit,
+            commands::window::force_quit,
-      commands::window::set_badge
+            commands::window::set_badge
-    ]);
+        ]);
 
-    #[cfg(debug_assertions)]
+        #[cfg(debug_assertions)]
-    let builder = builder.path("../packages/system/src/commands.ts");
+        let builder = builder.path("../packages/system/src/commands.ts");
 
-    builder.build().unwrap()
+        builder.build().unwrap()
-  };
+    };
 
-  tauri::Builder::default()
+    #[cfg(target_os = "macos")]
-    .setup(|app| {
+    let builder = tauri::Builder::default().plugin(tauri_nspanel::init());
-      let main_window = app.get_webview_window("main").unwrap();
 
-      // Set custom decoration for Windows
+    #[cfg(not(target_os = "macos"))]
-      #[cfg(target_os = "windows")]
+    let builder = tauri::Builder::default();
-      main_window.create_overlay_titlebar().unwrap();
 
-      // Make main window transparent
+    builder
-      #[cfg(target_os = "macos")]
+        .setup(|app| {
-      main_window.make_transparent().unwrap();
+            #[cfg(target_os = "macos")]
+            app.handle().plugin(tauri_nspanel::init()).unwrap();
 
-      // Set a custom inset to the traffic lights
+            #[cfg(not(target_os = "linux"))]
-      #[cfg(target_os = "macos")]
+            let main_window = app.get_webview_window("main").unwrap();
-      main_window.set_traffic_lights_inset(8.0, 16.0).unwrap();
 
-      // Create data folder if not exist
+            // Set custom decoration for Windows
-      let home_dir = app.path().home_dir().unwrap();
+            #[cfg(target_os = "windows")]
-      let _ = fs::create_dir_all(home_dir.join("Lume/"));
+            main_window.create_overlay_titlebar().unwrap();
 
-      tauri::async_runtime::block_on(async move {
+            // Restore native border
-        // Setup database
+            #[cfg(target_os = "macos")]
-        let database = SQLiteDatabase::open(home_dir.join("Lume/lume.db")).await;
+            main_window.add_border(None);
 
-        // Config
+            // Set a custom inset to the traffic lights
-        let opts = Options::new()
+            #[cfg(target_os = "macos")]
-          .automatic_authentication(true)
+            main_window.set_traffic_lights_inset(8.0, 16.0).unwrap();
-          .connection_timeout(Some(Duration::from_secs(5)))
-          .timeout(Duration::from_secs(30));
 
-        // Setup nostr client
+            #[cfg(target_os = "macos")]
-        let client = match database {
+            let win = main_window.clone();
-          Ok(db) => ClientBuilder::default().database(db).opts(opts).build(),
-          Err(_) => ClientBuilder::default().opts(opts).build(),
-        };
 
-        // Get bootstrap relays
+            #[cfg(target_os = "macos")]
-        if let Ok(path) = app
+            main_window.on_window_event(move |event| {
-          .path()
+                if let tauri::WindowEvent::ThemeChanged(_) = event {
-          .resolve("resources/relays.txt", BaseDirectory::Resource)
+                    win.set_traffic_lights_inset(8.0, 16.0).unwrap();
-        {
-          let file = std::fs::File::open(&path).unwrap();
-          let lines = io::BufReader::new(file).lines();
-
-          // Add bootstrap relays to relay pool
-          for line in lines.map_while(Result::ok) {
-            if let Some((relay, option)) = line.split_once(',') {
-              match RelayMetadata::from_str(option) {
-                Ok(meta) => {
-                  println!("connecting to bootstrap relay...: {} - {}", relay, meta);
-                  let opts = if meta == RelayMetadata::Read {
-                    RelayOptions::new().read(true).write(false)
-                  } else {
-                    RelayOptions::new().write(true).read(false)
-                  };
-                  let _ = client.add_relay_with_opts(relay, opts).await;
                 }
-                Err(_) => {
+                if let tauri::WindowEvent::Resized(_) = event {
-                  println!("connecting to bootstrap relay...: {}", relay);
+                    win.set_traffic_lights_inset(8.0, 16.0).unwrap();
-                  let _ = client.add_relay(relay).await;
                 }
-              }
+            });
-            }
-          }
-        }
 
-        // Connect
+            // Create data folder if not exist
-        client.connect().await;
+            let home_dir = app.path().home_dir().unwrap();
+            let _ = fs::create_dir_all(home_dir.join("Lume/"));
 
-        // Update global state
+            tauri::async_runtime::block_on(async move {
-        app.handle().manage(Nostr {
+                // Setup database
-          client,
+                let database = SQLiteDatabase::open(home_dir.join("Lume/lume.db")).await;
-          contact_list: Mutex::new(vec![]),
+
-          settings: Mutex::new(Settings::default()),
+                // Config
+                let opts = Options::new()
+                    .automatic_authentication(true)
+                    .connection_timeout(Some(Duration::from_secs(5)))
+                    .timeout(Duration::from_secs(30));
+
+                // Setup nostr client
+                let client = match database {
+                    Ok(db) => ClientBuilder::default().database(db).opts(opts).build(),
+                    Err(_) => ClientBuilder::default().opts(opts).build(),
+                };
+
+                // Get bootstrap relays
+                if let Ok(path) = app
+                    .path()
+                    .resolve("resources/relays.txt", BaseDirectory::Resource)
+                {
+                    let file = std::fs::File::open(&path).unwrap();
+                    let lines = io::BufReader::new(file).lines();
+
+                    // Add bootstrap relays to relay pool
+                    for line in lines.map_while(Result::ok) {
+                        if let Some((relay, option)) = line.split_once(',') {
+                            match RelayMetadata::from_str(option) {
+                                Ok(meta) => {
+                                    println!(
+                                        "connecting to bootstrap relay...: {} - {}",
+                                        relay, meta
+                                    );
+                                    let opts = if meta == RelayMetadata::Read {
+                                        RelayOptions::new().read(true).write(false)
+                                    } else {
+                                        RelayOptions::new().write(true).read(false)
+                                    };
+                                    let _ = client.add_relay_with_opts(relay, opts).await;
+                                }
+                                Err(_) => {
+                                    println!("connecting to bootstrap relay...: {}", relay);
+                                    let _ = client.add_relay(relay).await;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Connect
+                client.connect().await;
+
+                // Update global state
+                app.handle().manage(Nostr {
+                    client,
+                    contact_list: Mutex::new(vec![]),
+                    settings: Mutex::new(Settings::default()),
+                })
+            });
+
+            Ok(())
         })
-      });
+        .plugin(tauri_plugin_theme::init(ctx.config_mut()))
-
+        .plugin(tauri_plugin_decorum::init())
-      Ok(())
+        .plugin(tauri_plugin_clipboard_manager::init())
-    })
+        .plugin(tauri_plugin_dialog::init())
-    .plugin(tauri_nspanel::init())
+        .plugin(tauri_plugin_fs::init())
-    .plugin(tauri_plugin_theme::init(ctx.config_mut()))
+        .plugin(tauri_plugin_http::init())
-    .plugin(tauri_plugin_decorum::init())
+        .plugin(tauri_plugin_notification::init())
-    .plugin(tauri_plugin_clipboard_manager::init())
+        .plugin(tauri_plugin_os::init())
-    .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_process::init())
-    .plugin(tauri_plugin_fs::init())
+        .plugin(tauri_plugin_shell::init())
-    .plugin(tauri_plugin_http::init())
+        .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_notification::init())
+        .plugin(tauri_plugin_updater::Builder::new().build())
-    .plugin(tauri_plugin_os::init())
+        .invoke_handler(invoke_handler)
-    .plugin(tauri_plugin_process::init())
+        .run(ctx)
-    .plugin(tauri_plugin_shell::init())
+        .expect("error while running tauri application");
-    .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_updater::Builder::new().build())
-    .plugin(
-      tauri_plugin_window_state::Builder::new()
-        .with_denylist(&["panel"])
-        .build(),
-    )
-    .invoke_handler(invoke_handler)
-    .build(ctx)
-    .expect("error while running tauri application")
-    .run(|_, event| {
-      if let tauri::RunEvent::ExitRequested { api, .. } = event {
-        // Hide app icon on macOS
-        // let _ = app.set_activation_policy(tauri::ActivationPolicy::Accessory);
-        // Keep API running
-        api.prevent_exit();
-      }
-    });
 }

src-tauri/src/nostr/internal.rs

@@ -2,74 +2,74 @@ use crate::Settings;
 use nostr_sdk::prelude::*;
 
 pub async fn init_nip65(client: &Client) {
-  let signer = client.signer().await.unwrap();
+    let signer = client.signer().await.unwrap();
-  let public_key = signer.public_key().await.unwrap();
+    let public_key = signer.public_key().await.unwrap();
 
-  if let Ok(events) = client
+    if let Ok(events) = client
-    .get_events_of(
+        .get_events_of(
-      vec![Filter::new()
+            vec![Filter::new()
-        .author(public_key)
+                .author(public_key)
-        .kind(Kind::RelayList)
+                .kind(Kind::RelayList)
-        .limit(1)],
+                .limit(1)],
-      None,
+            None,
-    )
+        )
-    .await
+        .await
-  {
+    {
-    if let Some(event) = events.first() {
+        if let Some(event) = events.first() {
-      let relay_list = nip65::extract_relay_list(event);
+            let relay_list = nip65::extract_relay_list(event);
-      for item in relay_list.into_iter() {
+            for item in relay_list.into_iter() {
-        let relay_url = item.0.to_string();
+                let relay_url = item.0.to_string();
-        let opts = match item.1 {
+                let opts = match item.1 {
-          Some(val) => {
+                    Some(val) => {
-            if val == &RelayMetadata::Read {
+                        if val == &RelayMetadata::Read {
-              RelayOptions::new().read(true).write(false)
+                            RelayOptions::new().read(true).write(false)
-            } else {
+                        } else {
-              RelayOptions::new().write(true).read(false)
+                            RelayOptions::new().write(true).read(false)
+                        }
+                    }
+                    None => RelayOptions::default(),
+                };
+
+                // Add relay to relay pool
+                let _ = client
+                    .add_relay_with_opts(&relay_url, opts)
+                    .await
+                    .unwrap_or_default();
+
+                // Connect relay
+                client.connect_relay(relay_url).await.unwrap_or_default();
+                println!("connecting to relay: {} - {:?}", item.0, item.1);
             }
-          }
+        }
-          None => RelayOptions::default(),
+    };
-        };
-
-        // Add relay to relay pool
-        let _ = client
-          .add_relay_with_opts(&relay_url, opts)
-          .await
-          .unwrap_or_default();
-
-        // Connect relay
-        client.connect_relay(relay_url).await.unwrap_or_default();
-        println!("connecting to relay: {} - {:?}", item.0, item.1);
-      }
-    }
-  };
 }
 
 pub async fn get_user_settings(client: &Client) -> Result<Settings, String> {
-  let ident = "lume:settings";
+    let ident = "lume:settings";
-  let signer = client.signer().await.unwrap();
+    let signer = client.signer().await.unwrap();
-  let public_key = signer.public_key().await.unwrap();
+    let public_key = signer.public_key().await.unwrap();
 
-  let filter = Filter::new()
+    let filter = Filter::new()
-    .author(public_key)
+        .author(public_key)
-    .kind(Kind::ApplicationSpecificData)
+        .kind(Kind::ApplicationSpecificData)
-    .identifier(ident)
+        .identifier(ident)
-    .limit(1);
+        .limit(1);
 
-  if let Ok(events) = client.get_events_of(vec![filter], None).await {
+    if let Ok(events) = client.get_events_of(vec![filter], None).await {
-    if let Some(event) = events.first() {
+        if let Some(event) = events.first() {
-      let content = event.content();
+            let content = event.content();
-      if let Ok(decrypted) = signer.nip44_decrypt(public_key, content).await {
+            if let Ok(decrypted) = signer.nip44_decrypt(public_key, content).await {
-        match serde_json::from_str(&decrypted) {
+                match serde_json::from_str(&decrypted) {
-          Ok(parsed) => parsed,
+                    Ok(parsed) => parsed,
-          Err(_) => Err("Could not parse settings payload".into()),
+                    Err(_) => Err("Could not parse settings payload".into()),
+                }
+            } else {
+                Err("Decrypt settings failed.".into())
+            }
+        } else {
+            Err("Settings not found.".into())
         }
-      } else {
-        Err("Decrypt settings failed.".into())
-      }
     } else {
-      Err("Settings not found.".into())
+        Err("Settings not found.".into())
     }
-  } else {
-    Err("Settings not found.".into())
-  }
 }

src-tauri/src/nostr/keys.rs

@@ -1,414 +1,424 @@
-use keyring::Entry;
+#[cfg(target_os = "macos")]
-use keyring_search::{Limit, List, Search};
-use nostr_sdk::prelude::*;
-use serde::Serialize;
-use specta::Type;
-use std::time::Duration;
-use tauri::{EventTarget, Manager, State};
-use tauri_plugin_notification::NotificationExt;
-
 use crate::commands::tray::create_tray_panel;
 use crate::nostr::event::RichEvent;
 use crate::nostr::internal::{get_user_settings, init_nip65};
 use crate::nostr::utils::parse_event;
 use crate::{Nostr, NEWSFEED_NEG_LIMIT, NOTIFICATION_NEG_LIMIT};
 
+use keyring::Entry;
+use keyring_search::{Limit, List, Search};
+use nostr_sdk::prelude::*;
+use serde::Serialize;
+use specta::Type;
+use std::collections::HashSet;
+use std::time::Duration;
+use tauri::{Emitter, EventTarget, Manager, State};
+use tauri_plugin_notification::NotificationExt;
+
 #[derive(Serialize, Type)]
 pub struct Account {
-  npub: String,
+    npub: String,
-  nsec: String,
+    nsec: String,
 }
 
 #[tauri::command]
 #[specta::specta]
-pub fn get_accounts() -> Result<Vec<String>, String> {
+pub fn get_accounts() -> Vec<String> {
-  let search = Search::new().unwrap();
+    let search = Search::new().expect("Unexpected.");
-  let results = search.by("Account", "nostr_secret");
+    let results = search.by_service("Lume");
-
+    let list = List::list_credentials(&results, Limit::All);
-  match List::list_credentials(results, Limit::All) {
+    let accounts: HashSet<String> = list
-    Ok(list) => {
-      let search: Vec<String> = list
         .split_whitespace()
-        .map(|v| v.to_string())
         .filter(|v| v.starts_with("npub1"))
+        .map(String::from)
         .collect();
 
-      let accounts: Vec<String> = search
+    accounts.into_iter().collect()
-        .into_iter()
-        .collect::<std::collections::HashSet<_>>()
-        .into_iter()
-        .collect();
-
-      Ok(accounts)
-    }
-    Err(_) => Err("Empty.".into()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn create_account() -> Result<Account, String> {
-  let keys = Keys::generate();
+    let keys = Keys::generate();
-  let public_key = keys.public_key();
+    let public_key = keys.public_key();
-  let secret_key = keys.secret_key().unwrap();
+    let secret_key = keys.secret_key().unwrap();
 
-  let result = Account {
+    let result = Account {
-    npub: public_key.to_bech32().unwrap(),
+        npub: public_key.to_bech32().unwrap(),
-    nsec: secret_key.to_bech32().unwrap(),
+        nsec: secret_key.to_bech32().unwrap(),
-  };
+    };
 
-  Ok(result)
+    Ok(result)
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn get_private_key(npub: &str) -> Result<String, String> {
-  let keyring = Entry::new(npub, "nostr_secret").unwrap();
+    let keyring = Entry::new("Lume", npub).unwrap();
 
-  if let Ok(nsec) = keyring.get_password() {
+    if let Ok(nsec) = keyring.get_password() {
-    let secret_key = SecretKey::from_bech32(nsec).unwrap();
+        let secret_key = SecretKey::from_bech32(nsec).unwrap();
-    Ok(secret_key.to_bech32().unwrap())
+        Ok(secret_key.to_bech32().unwrap())
-  } else {
+    } else {
-    Err("Key not found".into())
+        Err("Key not found".into())
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn save_account(
-  nsec: &str,
+    nsec: &str,
-  password: &str,
+    password: &str,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<String, String> {
-  let secret_key = if nsec.starts_with("ncryptsec") {
+    let secret_key = if nsec.starts_with("ncryptsec") {
-    let encrypted_key = EncryptedSecretKey::from_bech32(nsec).unwrap();
+        let encrypted_key = EncryptedSecretKey::from_bech32(nsec).unwrap();
-    encrypted_key
+        encrypted_key
-      .to_secret_key(password)
+            .to_secret_key(password)
-      .map_err(|err| err.to_string())
+            .map_err(|err| err.to_string())
-  } else {
+    } else {
-    SecretKey::from_bech32(nsec).map_err(|err| err.to_string())
+        SecretKey::from_bech32(nsec).map_err(|err| err.to_string())
-  };
+    };
 
-  match secret_key {
+    match secret_key {
-    Ok(val) => {
+        Ok(val) => {
-      let nostr_keys = Keys::new(val);
+            let nostr_keys = Keys::new(val);
-      let npub = nostr_keys.public_key().to_bech32().unwrap();
+            let npub = nostr_keys.public_key().to_bech32().unwrap();
-      let nsec = nostr_keys.secret_key().unwrap().to_bech32().unwrap();
+            let nsec = nostr_keys.secret_key().unwrap().to_bech32().unwrap();
 
-      let keyring = Entry::new(&npub, "nostr_secret").unwrap();
+            let keyring = Entry::new("Lume", &npub).unwrap();
-      let _ = keyring.set_password(&nsec);
+            let _ = keyring.set_password(&nsec);
 
-      let signer = NostrSigner::Keys(nostr_keys);
+            let signer = NostrSigner::Keys(nostr_keys);
-      let client = &state.client;
+            let client = &state.client;
 
-      // Update client's signer
+            // Update client's signer
-      client.set_signer(Some(signer)).await;
+            client.set_signer(Some(signer)).await;
 
-      Ok(npub)
+            Ok(npub)
+        }
+        Err(msg) => Err(msg),
     }
-    Err(msg) => Err(msg),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn connect_remote_account(uri: &str, state: State<'_, Nostr>) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  match NostrConnectURI::parse(uri) {
+    match NostrConnectURI::parse(uri) {
-    Ok(bunker_uri) => {
+        Ok(bunker_uri) => {
-      let app_keys = Keys::generate();
+            let app_keys = Keys::generate();
-      let app_secret = app_keys.secret_key().unwrap().to_string();
+            let app_secret = app_keys.secret_key().unwrap().to_string();
 
-      // Get remote user
+            // Get remote user
-      let remote_user = bunker_uri.signer_public_key().unwrap();
+            let remote_user = bunker_uri.signer_public_key().unwrap();
-      let remote_npub = remote_user.to_bech32().unwrap();
+            let remote_npub = remote_user.to_bech32().unwrap();
 
-      match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(120), None).await {
+            match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(120), None).await {
-        Ok(signer) => {
+                Ok(signer) => {
-          let keyring = Entry::new(&remote_npub, "nostr_secret").unwrap();
+                    let keyring = Entry::new("Lume", &remote_npub).unwrap();
-          let _ = keyring.set_password(&app_secret);
+                    let _ = keyring.set_password(&app_secret);
 
-          // Update signer
+                    // Update signer
-          let _ = client.set_signer(Some(signer.into())).await;
+                    let _ = client.set_signer(Some(signer.into())).await;
 
-          Ok(remote_npub)
+                    Ok(remote_npub)
+                }
+                Err(err) => Err(err.to_string()),
+            }
         }
         Err(err) => Err(err.to_string()),
-      }
     }
-    Err(err) => Err(err.to_string()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_encrypted_key(npub: &str, password: &str) -> Result<String, String> {
-  let keyring = Entry::new(npub, "nostr_secret").unwrap();
+    let keyring = Entry::new("Lume", npub).unwrap();
 
-  if let Ok(nsec) = keyring.get_password() {
+    if let Ok(nsec) = keyring.get_password() {
-    let secret_key = SecretKey::from_bech32(nsec).unwrap();
+        let secret_key = SecretKey::from_bech32(nsec).unwrap();
-    let new_key = EncryptedSecretKey::new(&secret_key, password, 16, KeySecurity::Medium);
+        let new_key = EncryptedSecretKey::new(&secret_key, password, 16, KeySecurity::Medium);
 
-    if let Ok(key) = new_key {
+        if let Ok(key) = new_key {
-      Ok(key.to_bech32().unwrap())
+            Ok(key.to_bech32().unwrap())
+        } else {
+            Err("Encrypt key failed".into())
+        }
     } else {
-      Err("Encrypt key failed".into())
+        Err("Key not found".into())
     }
-  } else {
-    Err("Key not found".into())
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn load_account(
-  npub: &str,
+    npub: &str,
-  bunker: Option<&str>,
+    bunker: Option<&str>,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
-  app: tauri::AppHandle,
+    app: tauri::AppHandle,
 ) -> Result<bool, String> {
-  let handle = app.clone();
+    let handle = app.clone();
-  let client = &state.client;
-  let keyring = Entry::new(npub, "nostr_secret").unwrap();
-
-  let password = match keyring.get_password() {
-    Ok(pw) => pw,
-    Err(_) => return Err("Cancelled".into()),
-  };
-
-  match bunker {
-    Some(uri) => {
-      let app_keys = Keys::parse(password).expect("Secret Key is modified, please check again.");
-
-      match NostrConnectURI::parse(uri) {
-        Ok(bunker_uri) => {
-          match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(30), None).await {
-            Ok(signer) => client.set_signer(Some(signer.into())).await,
-            Err(err) => return Err(err.to_string()),
-          }
-        }
-        Err(err) => return Err(err.to_string()),
-      }
-    }
-    None => {
-      let keys = Keys::parse(password).expect("Secret Key is modified, please check again.");
-      let signer = NostrSigner::Keys(keys);
-
-      // Update signer
-      client.set_signer(Some(signer)).await;
-    }
-  }
-
-  // Connect to user's relay (NIP-65)
-  init_nip65(client).await;
-
-  // Create tray (macOS)
-  #[cfg(target_os = "macos")]
-  create_tray_panel(npub, &handle);
-
-  // Get user's contact list
-  if let Ok(contacts) = client.get_contact_list(None).await {
-    *state.contact_list.lock().unwrap() = contacts
-  };
-
-  // Get user's settings
-  if let Ok(settings) = get_user_settings(client).await {
-    *state.settings.lock().unwrap() = settings
-  };
-
-  tauri::async_runtime::spawn(async move {
-    let window = handle.get_window("main").unwrap();
-
-    let state = window.state::<Nostr>();
     let client = &state.client;
-    let contact_list = state.contact_list.lock().unwrap().clone();
+    let keyring = Entry::new("Lume", npub).unwrap();
 
-    let signer = client.signer().await.unwrap();
+    let password = match keyring.get_password() {
-    let public_key = signer.public_key().await.unwrap();
+        Ok(pw) => pw,
-
+        Err(_) => return Err("Cancelled".into()),
-    if !contact_list.is_empty() {
-      let authors: Vec<PublicKey> = contact_list.into_iter().map(|f| f.public_key).collect();
-
-      match client
-        .reconcile(
-          Filter::new()
-            .authors(authors)
-            .kinds(vec![Kind::TextNote, Kind::Repost])
-            .limit(NEWSFEED_NEG_LIMIT),
-          NegentropyOptions::default(),
-        )
-        .await
-      {
-        Ok(_) => {
-          if handle.emit_to(EventTarget::Any, "synced", true).is_err() {
-            println!("Emit event failed.")
-          }
-        }
-        Err(_) => println!("Sync newsfeed failed."),
-      }
     };
 
-    match client
+    match bunker {
-      .reconcile(
+        Some(uri) => {
-        Filter::new()
+            let app_keys =
-          .pubkey(public_key)
+                Keys::parse(password).expect("Secret Key is modified, please check again.");
-          .kinds(vec![
-            Kind::TextNote,
-            Kind::Repost,
-            Kind::Reaction,
-            Kind::ZapReceipt,
-          ])
-          .limit(NOTIFICATION_NEG_LIMIT),
-        NegentropyOptions::default(),
-      )
-      .await
-    {
-      Ok(_) => {
-        if handle.emit_to(EventTarget::Any, "synced", true).is_err() {
-          println!("Emit event failed.")
-        }
-      }
-      Err(_) => println!("Sync notification failed."),
-    };
 
-    let subscription_id = SubscriptionId::new("notification");
+            match NostrConnectURI::parse(uri) {
-    let subscription = Filter::new()
+                Ok(bunker_uri) => {
-      .pubkey(public_key)
+                    match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(30), None)
-      .kinds(vec![
+                        .await
-        Kind::TextNote,
+                    {
-        Kind::Repost,
+                        Ok(signer) => client.set_signer(Some(signer.into())).await,
-        Kind::Reaction,
+                        Err(err) => return Err(err.to_string()),
-        Kind::ZapReceipt,
+                    }
-      ])
-      .since(Timestamp::now());
-
-    // Subscribing for new notification...
-    client
-      .subscribe_with_id(subscription_id, vec![subscription], None)
-      .await;
-
-    // Handle notifications
-    client
-      .handle_notifications(|notification| async {
-        if let RelayPoolNotification::Message { message, .. } = notification {
-          if let RelayMessage::Event {
-            subscription_id,
-            event,
-          } = message
-          {
-            let id = subscription_id.to_string();
-
-            if id.starts_with("notification") {
-              if app
-                .emit_to(
-                  EventTarget::window("panel"),
-                  "notification",
-                  event.as_json(),
-                )
-                .is_err()
-              {
-                println!("Emit new notification failed.")
-              }
-
-              let handle = app.app_handle();
-              let author = client.metadata(event.pubkey).await.unwrap();
-
-              match event.kind() {
-                Kind::TextNote => {
-                  if let Err(e) = handle
-                    .notification()
-                    .builder()
-                    .body("Mentioned you in a thread.")
-                    .title(author.display_name.unwrap_or_else(|| "Lume".to_string()))
-                    .show()
-                  {
-                    println!("Failed to show notification: {:?}", e);
-                  }
                 }
-                Kind::Repost => {
+                Err(err) => return Err(err.to_string()),
-                  if let Err(e) = handle
-                    .notification()
-                    .builder()
-                    .body("Reposted your note.")
-                    .title(author.display_name.unwrap_or_else(|| "Lume".to_string()))
-                    .show()
-                  {
-                    println!("Failed to show notification: {:?}", e);
-                  }
-                }
-                Kind::Reaction => {
-                  let content = event.content();
-                  if let Err(e) = handle
-                    .notification()
-                    .builder()
-                    .body(content)
-                    .title(author.display_name.unwrap_or_else(|| "Lume".to_string()))
-                    .show()
-                  {
-                    println!("Failed to show notification: {:?}", e);
-                  }
-                }
-                Kind::ZapReceipt => {
-                  if let Err(e) = handle
-                    .notification()
-                    .builder()
-                    .body("Zapped you.")
-                    .title(author.display_name.unwrap_or_else(|| "Lume".to_string()))
-                    .show()
-                  {
-                    println!("Failed to show notification: {:?}", e);
-                  }
-                }
-                _ => {}
-              }
-            } else if id.starts_with("event-") {
-              let raw = event.as_json();
-              let parsed = if event.kind == Kind::TextNote {
-                Some(parse_event(&event.content).await)
-              } else {
-                None
-              };
-
-              if app
-                .emit_to(
-                  EventTarget::window(id),
-                  "new_reply",
-                  RichEvent { raw, parsed },
-                )
-                .is_err()
-              {
-                println!("Emit new notification failed.")
-              }
-            } else if id.starts_with("column-") {
-              let raw = event.as_json();
-              let parsed = if event.kind == Kind::TextNote {
-                Some(parse_event(&event.content).await)
-              } else {
-                None
-              };
-
-              if app
-                .emit_to(
-                  EventTarget::window(id),
-                  "new_event",
-                  RichEvent { raw, parsed },
-                )
-                .is_err()
-              {
-                println!("Emit new notification failed.")
-              }
-            } else {
-              println!("new event: {}", event.as_json())
             }
-          } else {
-            println!("new message: {}", message.as_json())
-          }
         }
-        Ok(false)
+        None => {
-      })
+            let keys = Keys::parse(password).expect("Secret Key is modified, please check again.");
-      .await
+            let signer = NostrSigner::Keys(keys);
-  });
 
-  Ok(true)
+            // Update signer
+            client.set_signer(Some(signer)).await;
+        }
+    }
+
+    // Connect to user's relay (NIP-65)
+    init_nip65(client).await;
+
+    // Create tray (macOS)
+    #[cfg(target_os = "macos")]
+    create_tray_panel(npub, &handle);
+
+    // Get user's contact list
+    if let Ok(contacts) = client.get_contact_list(None).await {
+        *state.contact_list.lock().unwrap() = contacts
+    };
+
+    // Get user's settings
+    if let Ok(settings) = get_user_settings(client).await {
+        *state.settings.lock().unwrap() = settings
+    };
+
+    tauri::async_runtime::spawn(async move {
+        let window = handle.get_window("main").unwrap();
+
+        let state = window.state::<Nostr>();
+        let client = &state.client;
+        let contact_list = state.contact_list.lock().unwrap().clone();
+
+        let signer = client.signer().await.unwrap();
+        let public_key = signer.public_key().await.unwrap();
+
+        if !contact_list.is_empty() {
+            let authors: Vec<PublicKey> = contact_list.into_iter().map(|f| f.public_key).collect();
+
+            match client
+                .reconcile(
+                    Filter::new()
+                        .authors(authors)
+                        .kinds(vec![Kind::TextNote, Kind::Repost])
+                        .limit(NEWSFEED_NEG_LIMIT),
+                    NegentropyOptions::default(),
+                )
+                .await
+            {
+                Ok(_) => {
+                    if handle.emit_to(EventTarget::Any, "synced", true).is_err() {
+                        println!("Emit event failed.")
+                    }
+                }
+                Err(_) => println!("Sync newsfeed failed."),
+            }
+        };
+
+        match client
+            .reconcile(
+                Filter::new()
+                    .pubkey(public_key)
+                    .kinds(vec![
+                        Kind::TextNote,
+                        Kind::Repost,
+                        Kind::Reaction,
+                        Kind::ZapReceipt,
+                    ])
+                    .limit(NOTIFICATION_NEG_LIMIT),
+                NegentropyOptions::default(),
+            )
+            .await
+        {
+            Ok(_) => {
+                if handle.emit_to(EventTarget::Any, "synced", true).is_err() {
+                    println!("Emit event failed.")
+                }
+            }
+            Err(_) => println!("Sync notification failed."),
+        };
+
+        let subscription_id = SubscriptionId::new("notification");
+        let subscription = Filter::new()
+            .pubkey(public_key)
+            .kinds(vec![
+                Kind::TextNote,
+                Kind::Repost,
+                Kind::Reaction,
+                Kind::ZapReceipt,
+            ])
+            .since(Timestamp::now());
+
+        // Subscribing for new notification...
+        let _ = client
+            .subscribe_with_id(subscription_id, vec![subscription], None)
+            .await;
+
+        // Handle notifications
+        client
+            .handle_notifications(|notification| async {
+                if let RelayPoolNotification::Message { message, .. } = notification {
+                    if let RelayMessage::Event {
+                        subscription_id,
+                        event,
+                    } = message
+                    {
+                        let id = subscription_id.to_string();
+
+                        if id.starts_with("notification") {
+                            if app
+                                .emit_to(
+                                    EventTarget::window("panel"),
+                                    "notification",
+                                    event.as_json(),
+                                )
+                                .is_err()
+                            {
+                                println!("Emit new notification failed.")
+                            }
+
+                            let handle = app.app_handle();
+                            let author = client.metadata(event.pubkey).await.unwrap();
+
+                            match event.kind() {
+                                Kind::TextNote => {
+                                    if let Err(e) = handle
+                                        .notification()
+                                        .builder()
+                                        .body("Mentioned you in a thread.")
+                                        .title(
+                                            author
+                                                .display_name
+                                                .unwrap_or_else(|| "Lume".to_string()),
+                                        )
+                                        .show()
+                                    {
+                                        println!("Failed to show notification: {:?}", e);
+                                    }
+                                }
+                                Kind::Repost => {
+                                    if let Err(e) = handle
+                                        .notification()
+                                        .builder()
+                                        .body("Reposted your note.")
+                                        .title(
+                                            author
+                                                .display_name
+                                                .unwrap_or_else(|| "Lume".to_string()),
+                                        )
+                                        .show()
+                                    {
+                                        println!("Failed to show notification: {:?}", e);
+                                    }
+                                }
+                                Kind::Reaction => {
+                                    let content = event.content();
+                                    if let Err(e) = handle
+                                        .notification()
+                                        .builder()
+                                        .body(content)
+                                        .title(
+                                            author
+                                                .display_name
+                                                .unwrap_or_else(|| "Lume".to_string()),
+                                        )
+                                        .show()
+                                    {
+                                        println!("Failed to show notification: {:?}", e);
+                                    }
+                                }
+                                Kind::ZapReceipt => {
+                                    if let Err(e) = handle
+                                        .notification()
+                                        .builder()
+                                        .body("Zapped you.")
+                                        .title(
+                                            author
+                                                .display_name
+                                                .unwrap_or_else(|| "Lume".to_string()),
+                                        )
+                                        .show()
+                                    {
+                                        println!("Failed to show notification: {:?}", e);
+                                    }
+                                }
+                                _ => {}
+                            }
+                        } else if id.starts_with("event-") {
+                            let raw = event.as_json();
+                            let parsed = if event.kind == Kind::TextNote {
+                                Some(parse_event(&event.content).await)
+                            } else {
+                                None
+                            };
+
+                            if app
+                                .emit_to(
+                                    EventTarget::window(id),
+                                    "new_reply",
+                                    RichEvent { raw, parsed },
+                                )
+                                .is_err()
+                            {
+                                println!("Emit new notification failed.")
+                            }
+                        } else if id.starts_with("column-") {
+                            let raw = event.as_json();
+                            let parsed = if event.kind == Kind::TextNote {
+                                Some(parse_event(&event.content).await)
+                            } else {
+                                None
+                            };
+
+                            if app
+                                .emit_to(
+                                    EventTarget::window(id),
+                                    "new_event",
+                                    RichEvent { raw, parsed },
+                                )
+                                .is_err()
+                            {
+                                println!("Emit new notification failed.")
+                            }
+                        } else {
+                            println!("new event: {}", event.as_json())
+                        }
+                    } else {
+                        println!("new message: {}", message.as_json())
+                    }
+                }
+                Ok(false)
+            })
+            .await
+    });
+
+    Ok(true)
 }

src-tauri/src/nostr/metadata.rs

@@ -11,584 +11,587 @@ use super::get_latest_event;
 #[tauri::command]
 #[specta::specta]
 pub async fn get_current_profile(state: State<'_, Nostr>) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  let signer = match client.signer().await {
+    let signer = match client.signer().await {
-    Ok(signer) => signer,
+        Ok(signer) => signer,
-    Err(err) => return Err(format!("Failed to get signer: {}", err)),
+        Err(err) => return Err(format!("Failed to get signer: {}", err)),
-  };
+    };
 
-  let public_key = match signer.public_key().await {
+    let public_key = match signer.public_key().await {
-    Ok(pk) => pk,
+        Ok(pk) => pk,
-    Err(err) => return Err(format!("Failed to get public key: {}", err)),
+        Err(err) => return Err(format!("Failed to get public key: {}", err)),
-  };
+    };
 
-  let filter = Filter::new()
+    let filter = Filter::new()
-    .author(public_key)
+        .author(public_key)
-    .kind(Kind::Metadata)
+        .kind(Kind::Metadata)
-    .limit(1);
+        .limit(1);
 
-  let events_result = client
+    let events_result = client
-    .get_events_of(vec![filter], Some(Duration::from_secs(10)))
+        .get_events_of(vec![filter], Some(Duration::from_secs(10)))
-    .await;
+        .await;
 
-  match events_result {
+    match events_result {
-    Ok(events) => {
+        Ok(events) => {
-      if let Some(event) = get_latest_event(&events) {
+            if let Some(event) = get_latest_event(&events) {
-        match Metadata::from_json(&event.content) {
+                match Metadata::from_json(&event.content) {
-          Ok(metadata) => Ok(metadata.as_json()),
+                    Ok(metadata) => Ok(metadata.as_json()),
-          Err(_) => Err("Failed to parse metadata.".into()),
+                    Err(_) => Err("Failed to parse metadata.".into()),
+                }
+            } else {
+                Err("No matching events found.".into())
+            }
         }
-      } else {
+        Err(err) => Err(format!("Failed to get events: {}", err)),
-        Err("No matching events found.".into())
-      }
     }
-    Err(err) => Err(format!("Failed to get events: {}", err)),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_profile(id: &str, state: State<'_, Nostr>) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let public_key: Option<PublicKey> = match Nip19::from_bech32(id) {
+    let public_key: Option<PublicKey> = match Nip19::from_bech32(id) {
-    Ok(val) => match val {
+        Ok(val) => match val {
-      Nip19::Pubkey(key) => Some(key),
+            Nip19::Pubkey(key) => Some(key),
-      Nip19::Profile(profile) => {
+            Nip19::Profile(profile) => {
-        let relays = profile.relays;
+                let relays = profile.relays;
-        for relay in relays.into_iter() {
+                for relay in relays.into_iter() {
-          let _ = client.add_relay(&relay).await.unwrap_or_default();
+                    let _ = client.add_relay(&relay).await.unwrap_or_default();
-          client.connect_relay(&relay).await.unwrap_or_default();
+                    client.connect_relay(&relay).await.unwrap_or_default();
-        }
+                }
-        Some(profile.public_key)
+                Some(profile.public_key)
-      }
+            }
-      _ => None,
+            _ => None,
-    },
+        },
-    Err(_) => match PublicKey::from_str(id) {
+        Err(_) => match PublicKey::from_str(id) {
-      Ok(val) => Some(val),
+            Ok(val) => Some(val),
-      Err(_) => None,
+            Err(_) => None,
-    },
+        },
-  };
+    };
 
-  if let Some(author) = public_key {
+    if let Some(author) = public_key {
-    let filter = Filter::new().author(author).kind(Kind::Metadata).limit(1);
+        let filter = Filter::new().author(author).kind(Kind::Metadata).limit(1);
-    let query = client
+        let query = client
-      .get_events_of(vec![filter], Some(Duration::from_secs(10)))
+            .get_events_of(vec![filter], Some(Duration::from_secs(10)))
-      .await;
+            .await;
 
-    if let Ok(events) = query {
+        if let Ok(events) = query {
-      if let Some(event) = events.first() {
+            if let Some(event) = events.first() {
-        if let Ok(metadata) = Metadata::from_json(&event.content) {
+                if let Ok(metadata) = Metadata::from_json(&event.content) {
-          Ok(metadata.as_json())
+                    Ok(metadata.as_json())
+                } else {
+                    Err("Parse metadata failed".into())
+                }
+            } else {
+                let rand_metadata = Metadata::new();
+                Ok(rand_metadata.as_json())
+            }
         } else {
-          Err("Parse metadata failed".into())
+            Err("Get metadata failed".into())
         }
-      } else {
-        let rand_metadata = Metadata::new();
-        Ok(rand_metadata.as_json())
-      }
     } else {
-      Err("Get metadata failed".into())
+        Err("Public Key is not valid".into())
     }
-  } else {
-    Err("Public Key is not valid".into())
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn set_contact_list(
-  public_keys: Vec<&str>,
+    public_keys: Vec<&str>,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let contact_list: Vec<Contact> = public_keys
+    let contact_list: Vec<Contact> = public_keys
-    .into_iter()
+        .into_iter()
-    .filter_map(|p| match PublicKey::from_hex(p) {
+        .filter_map(|p| match PublicKey::from_hex(p) {
-      Ok(pk) => Some(Contact::new(pk, None, Some(""))),
+            Ok(pk) => Some(Contact::new(pk, None, Some(""))),
-      Err(_) => None,
+            Err(_) => None,
-    })
+        })
-    .collect();
+        .collect();
 
-  match client.set_contact_list(contact_list).await {
+    match client.set_contact_list(contact_list).await {
-    Ok(_) => Ok(true),
+        Ok(_) => Ok(true),
-    Err(err) => Err(err.to_string()),
+        Err(err) => Err(err.to_string()),
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_contact_list(state: State<'_, Nostr>) -> Result<Vec<String>, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  match client.get_contact_list(Some(Duration::from_secs(10))).await {
+    match client.get_contact_list(Some(Duration::from_secs(10))).await {
-    Ok(contact_list) => {
+        Ok(contact_list) => {
-      if !contact_list.is_empty() {
+            if !contact_list.is_empty() {
-        let list = contact_list
+                let list = contact_list
-          .into_iter()
+                    .into_iter()
-          .map(|f| f.public_key.to_hex())
+                    .map(|f| f.public_key.to_hex())
-          .collect();
+                    .collect();
 
-        Ok(list)
+                Ok(list)
-      } else {
+            } else {
-        Err("Empty.".into())
+                Err("Empty.".into())
-      }
+            }
+        }
+        Err(err) => Err(err.to_string()),
     }
-    Err(err) => Err(err.to_string()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn create_profile(
-  name: &str,
+    name: &str,
-  display_name: &str,
+    display_name: &str,
-  about: &str,
+    about: &str,
-  picture: &str,
+    picture: &str,
-  banner: &str,
+    banner: &str,
-  nip05: &str,
+    nip05: &str,
-  lud16: &str,
+    lud16: &str,
-  website: &str,
+    website: &str,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let mut metadata = Metadata::new()
+    let mut metadata = Metadata::new()
-    .name(name)
+        .name(name)
-    .display_name(display_name)
+        .display_name(display_name)
-    .about(about)
+        .about(about)
-    .nip05(nip05)
+        .nip05(nip05)
-    .lud16(lud16);
+        .lud16(lud16);
 
-  if let Ok(url) = Url::parse(picture) {
+    if let Ok(url) = Url::parse(picture) {
-    metadata = metadata.picture(url)
+        metadata = metadata.picture(url)
-  }
+    }
 
-  if let Ok(url) = Url::parse(banner) {
+    if let Ok(url) = Url::parse(banner) {
-    metadata = metadata.banner(url)
+        metadata = metadata.banner(url)
-  }
+    }
 
-  if let Ok(url) = Url::parse(website) {
+    if let Ok(url) = Url::parse(website) {
-    metadata = metadata.website(url)
+        metadata = metadata.website(url)
-  }
+    }
 
-  if let Ok(event_id) = client.set_metadata(&metadata).await {
+    if let Ok(event_id) = client.set_metadata(&metadata).await {
-    Ok(event_id.to_string())
+        Ok(event_id.to_string())
-  } else {
+    } else {
-    Err("Create profile failed".into())
+        Err("Create profile failed".into())
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn is_contact_list_empty(state: State<'_, Nostr>) -> Result<bool, ()> {
-  let contact_list = state.contact_list.lock().unwrap();
+    let contact_list = state.contact_list.lock().unwrap();
-  Ok(contact_list.is_empty())
+    Ok(contact_list.is_empty())
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn check_contact(hex: &str, state: State<'_, Nostr>) -> Result<bool, String> {
-  let contact_list = state.contact_list.lock().unwrap();
+    let contact_list = state.contact_list.lock().unwrap();
 
-  match PublicKey::from_str(hex) {
+    match PublicKey::from_str(hex) {
-    Ok(public_key) => match contact_list.iter().position(|x| x.public_key == public_key) {
+        Ok(public_key) => match contact_list.iter().position(|x| x.public_key == public_key) {
-      Some(_) => Ok(true),
+            Some(_) => Ok(true),
-      None => Ok(false),
+            None => Ok(false),
-    },
+        },
-    Err(err) => Err(err.to_string()),
+        Err(err) => Err(err.to_string()),
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn toggle_contact(
-  hex: &str,
+    hex: &str,
-  alias: Option<&str>,
+    alias: Option<&str>,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  match client.get_contact_list(None).await {
+    match client.get_contact_list(None).await {
-    Ok(mut contact_list) => {
+        Ok(mut contact_list) => {
-      let public_key = PublicKey::from_str(hex).unwrap();
+            let public_key = PublicKey::from_str(hex).unwrap();
 
-      match contact_list.iter().position(|x| x.public_key == public_key) {
+            match contact_list.iter().position(|x| x.public_key == public_key) {
-        Some(index) => {
+                Some(index) => {
-          // Remove contact
+                    // Remove contact
-          contact_list.remove(index);
+                    contact_list.remove(index);
+                }
+                None => {
+                    // TODO: Add relay_url
+                    let new_contact = Contact::new(public_key, None, alias);
+                    // Add new contact
+                    contact_list.push(new_contact);
+                }
+            }
+
+            // Update local state
+            state.contact_list.lock().unwrap().clone_from(&contact_list);
+
+            // Publish
+            match client.set_contact_list(contact_list).await {
+                Ok(event_id) => Ok(event_id.to_string()),
+                Err(err) => Err(err.to_string()),
+            }
         }
-        None => {
-          // TODO: Add relay_url
-          let new_contact = Contact::new(public_key, None, alias);
-          // Add new contact
-          contact_list.push(new_contact);
-        }
-      }
-
-      // Update local state
-      state.contact_list.lock().unwrap().clone_from(&contact_list);
-
-      // Publish
-      match client.set_contact_list(contact_list).await {
-        Ok(event_id) => Ok(event_id.to_string()),
         Err(err) => Err(err.to_string()),
-      }
     }
-    Err(err) => Err(err.to_string()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn set_nstore(
-  key: &str,
+    key: &str,
-  content: &str,
+    content: &str,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  match client.signer().await {
+    match client.signer().await {
-    Ok(signer) => {
+        Ok(signer) => {
-      let public_key = match signer.public_key().await {
+            let public_key = match signer.public_key().await {
-        Ok(pk) => pk,
+                Ok(pk) => pk,
-        Err(err) => return Err(format!("Failed to get public key: {}", err)),
+                Err(err) => return Err(format!("Failed to get public key: {}", err)),
-      };
+            };
 
-      let encrypted = match signer.nip44_encrypt(public_key, content).await {
+            let encrypted = match signer.nip44_encrypt(public_key, content).await {
-        Ok(enc) => enc,
+                Ok(enc) => enc,
-        Err(err) => return Err(format!("Encryption failed: {}", err)),
+                Err(err) => return Err(format!("Encryption failed: {}", err)),
-      };
+            };
 
-      let tag = Tag::identifier(key);
+            let tag = Tag::identifier(key);
-      let builder = EventBuilder::new(Kind::ApplicationSpecificData, encrypted, vec![tag]);
+            let builder = EventBuilder::new(Kind::ApplicationSpecificData, encrypted, vec![tag]);
 
-      match client.send_event_builder(builder).await {
+            match client.send_event_builder(builder).await {
-        Ok(event_id) => Ok(event_id.to_string()),
+                Ok(event_id) => Ok(event_id.to_string()),
+                Err(err) => Err(err.to_string()),
+            }
+        }
         Err(err) => Err(err.to_string()),
-      }
     }
-    Err(err) => Err(err.to_string()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_nstore(key: &str, state: State<'_, Nostr>) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  if let Ok(signer) = client.signer().await {
+    if let Ok(signer) = client.signer().await {
-    let public_key = match signer.public_key().await {
+        let public_key = match signer.public_key().await {
-      Ok(pk) => pk,
+            Ok(pk) => pk,
-      Err(err) => return Err(format!("Failed to get public key: {}", err)),
+            Err(err) => return Err(format!("Failed to get public key: {}", err)),
-    };
+        };
 
-    let filter = Filter::new()
+        let filter = Filter::new()
-      .author(public_key)
+            .author(public_key)
-      .kind(Kind::ApplicationSpecificData)
+            .kind(Kind::ApplicationSpecificData)
-      .identifier(key)
+            .identifier(key)
-      .limit(1);
+            .limit(1);
 
-    match client
+        match client
-      .get_events_of(vec![filter], Some(Duration::from_secs(5)))
+            .get_events_of(vec![filter], Some(Duration::from_secs(5)))
-      .await
+            .await
-    {
+        {
-      Ok(events) => {
+            Ok(events) => {
-        if let Some(event) = events.first() {
+                if let Some(event) = events.first() {
-          let content = event.content();
+                    let content = event.content();
-          match signer.nip44_decrypt(public_key, content).await {
+                    match signer.nip44_decrypt(public_key, content).await {
-            Ok(decrypted) => Ok(decrypted),
+                        Ok(decrypted) => Ok(decrypted),
-            Err(_) => Err(event.content.to_string()),
+                        Err(_) => Err(event.content.to_string()),
-          }
+                    }
-        } else {
+                } else {
-          Err("Value not found".into())
+                    Err("Value not found".into())
+                }
+            }
+            Err(err) => Err(err.to_string()),
         }
-      }
+    } else {
-      Err(err) => Err(err.to_string()),
+        Err("Signer is required".into())
     }
-  } else {
-    Err("Signer is required".into())
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn set_wallet(uri: &str, state: State<'_, Nostr>) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  if let Ok(nwc_uri) = NostrWalletConnectURI::from_str(uri) {
+    if let Ok(nwc_uri) = NostrWalletConnectURI::from_str(uri) {
-    let nwc = NWC::new(nwc_uri);
+        let nwc = NWC::new(nwc_uri);
-    let keyring = Entry::new("Lume Secret", "Bitcoin Connect").map_err(|e| e.to_string())?;
+        let keyring = Entry::new("Lume Secret", "Bitcoin Connect").map_err(|e| e.to_string())?;
-    keyring.set_password(uri).map_err(|e| e.to_string())?;
+        keyring.set_password(uri).map_err(|e| e.to_string())?;
-    client.set_zapper(nwc).await;
+        client.set_zapper(nwc).await;
 
-    Ok(true)
+        Ok(true)
-  } else {
+    } else {
-    Err("Set NWC failed".into())
+        Err("Set NWC failed".into())
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn load_wallet(state: State<'_, Nostr>) -> Result<String, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let keyring = Entry::new("Lume Secret", "Bitcoin Connect").unwrap();
+    let keyring = Entry::new("Lume Secret", "Bitcoin Connect").unwrap();
 
-  match keyring.get_password() {
+    match keyring.get_password() {
-    Ok(val) => {
+        Ok(val) => {
-      let uri = NostrWalletConnectURI::from_str(&val).unwrap();
+            let uri = NostrWalletConnectURI::from_str(&val).unwrap();
-      let nwc = NWC::new(uri);
+            let nwc = NWC::new(uri);
 
-      // Get current balance
+            // Get current balance
-      let balance = nwc.get_balance().await;
+            let balance = nwc.get_balance().await;
 
-      // Update zapper
+            // Update zapper
-      client.set_zapper(nwc).await;
+            client.set_zapper(nwc).await;
 
-      match balance {
+            match balance {
-        Ok(val) => Ok(val.to_string()),
+                Ok(val) => Ok(val.to_string()),
-        Err(_) => Err("Get balance failed.".into()),
+                Err(_) => Err("Get balance failed.".into()),
-      }
+            }
+        }
+        Err(_) => Err("NWC not found.".into()),
     }
-    Err(_) => Err("NWC not found.".into()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn remove_wallet(state: State<'_, Nostr>) -> Result<(), ()> {
-  let client = &state.client;
+    let client = &state.client;
-  let keyring = Entry::new("Lume Secret", "Bitcoin Connect").unwrap();
+    let keyring = Entry::new("Lume Secret", "Bitcoin Connect").unwrap();
 
-  match keyring.delete_password() {
+    match keyring.delete_credential() {
-    Ok(_) => {
+        Ok(_) => {
-      client.unset_zapper().await;
+            client.unset_zapper().await;
-      Ok(())
+            Ok(())
+        }
+        Err(_) => Err(()),
     }
-    Err(_) => Err(()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn zap_profile(
-  id: &str,
+    id: &str,
-  amount: &str,
+    amount: &str,
-  message: &str,
+    message: &str,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let public_key = match Nip19::from_bech32(id) {
+    let public_key = match Nip19::from_bech32(id) {
-    Ok(val) => match val {
+        Ok(val) => match val {
-      Nip19::Pubkey(key) => key,
+            Nip19::Pubkey(key) => key,
-      Nip19::Profile(profile) => profile.public_key,
+            Nip19::Profile(profile) => profile.public_key,
-      _ => return Err("Public Key is not valid.".into()),
+            _ => return Err("Public Key is not valid.".into()),
-    },
+        },
-    Err(_) => match PublicKey::from_str(id) {
+        Err(_) => match PublicKey::from_str(id) {
-      Ok(val) => val,
+            Ok(val) => val,
-      Err(_) => return Err("Public Key is not valid.".into()),
+            Err(_) => return Err("Public Key is not valid.".into()),
-    },
+        },
-  };
+    };
 
-  let details = ZapDetails::new(ZapType::Private).message(message);
+    let details = ZapDetails::new(ZapType::Private).message(message);
-  let num = match amount.parse::<u64>() {
+    let num = match amount.parse::<u64>() {
-    Ok(val) => val,
+        Ok(val) => val,
-    Err(_) => return Err("Invalid amount.".into()),
+        Err(_) => return Err("Invalid amount.".into()),
-  };
+    };
 
-  if client.zap(public_key, num, Some(details)).await.is_ok() {
+    if client.zap(public_key, num, Some(details)).await.is_ok() {
-    Ok(true)
+        Ok(true)
-  } else {
+    } else {
-    Err("Zap profile failed".into())
+        Err("Zap profile failed".into())
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn zap_event(
-  id: &str,
+    id: &str,
-  amount: &str,
+    amount: &str,
-  message: &str,
+    message: &str,
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
 ) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let event_id = match Nip19::from_bech32(id) {
+    let event_id = match Nip19::from_bech32(id) {
-    Ok(val) => match val {
+        Ok(val) => match val {
-      Nip19::EventId(id) => id,
+            Nip19::EventId(id) => id,
-      Nip19::Event(event) => event.event_id,
+            Nip19::Event(event) => event.event_id,
-      _ => return Err("Event ID is invalid.".into()),
+            _ => return Err("Event ID is invalid.".into()),
-    },
+        },
-    Err(_) => match EventId::from_hex(id) {
+        Err(_) => match EventId::from_hex(id) {
-      Ok(val) => val,
+            Ok(val) => val,
-      Err(_) => return Err("Event ID is invalid.".into()),
+            Err(_) => return Err("Event ID is invalid.".into()),
-    },
+        },
-  };
+    };
 
-  let details = ZapDetails::new(ZapType::Private).message(message);
+    let details = ZapDetails::new(ZapType::Private).message(message);
-  let num = match amount.parse::<u64>() {
+    let num = match amount.parse::<u64>() {
-    Ok(val) => val,
+        Ok(val) => val,
-    Err(_) => return Err("Invalid amount.".into()),
+        Err(_) => return Err("Invalid amount.".into()),
-  };
+    };
 
-  if client.zap(event_id, num, Some(details)).await.is_ok() {
+    if client.zap(event_id, num, Some(details)).await.is_ok() {
-    Ok(true)
+        Ok(true)
-  } else {
+    } else {
-    Err("Zap event failed".into())
+        Err("Zap event failed".into())
-  }
+    }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn friend_to_friend(npub: &str, state: State<'_, Nostr>) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  match PublicKey::from_bech32(npub) {
+    match PublicKey::from_bech32(npub) {
-    Ok(author) => {
+        Ok(author) => {
-      let mut contact_list: Vec<Contact> = Vec::new();
+            let mut contact_list: Vec<Contact> = Vec::new();
-      let contact_list_filter = Filter::new()
+            let contact_list_filter = Filter::new()
-        .author(author)
+                .author(author)
-        .kind(Kind::ContactList)
+                .kind(Kind::ContactList)
-        .limit(1);
+                .limit(1);
 
-      if let Ok(contact_list_events) = client.get_events_of(vec![contact_list_filter], None).await {
+            if let Ok(contact_list_events) =
-        for event in contact_list_events.into_iter() {
+                client.get_events_of(vec![contact_list_filter], None).await
-          for tag in event.into_iter_tags() {
-            if let Some(TagStandard::PublicKey {
-              public_key,
-              relay_url,
-              alias,
-              uppercase: false,
-            }) = tag.to_standardized()
             {
-              contact_list.push(Contact::new(public_key, relay_url, alias))
+                for event in contact_list_events.into_iter() {
+                    for tag in event.into_iter_tags() {
+                        if let Some(TagStandard::PublicKey {
+                            public_key,
+                            relay_url,
+                            alias,
+                            uppercase: false,
+                        }) = tag.to_standardized()
+                        {
+                            contact_list.push(Contact::new(public_key, relay_url, alias))
+                        }
+                    }
+                }
             }
-          }
-        }
-      }
 
-      match client.set_contact_list(contact_list).await {
+            match client.set_contact_list(contact_list).await {
-        Ok(_) => Ok(true),
+                Ok(_) => Ok(true),
+                Err(err) => Err(err.to_string()),
+            }
+        }
         Err(err) => Err(err.to_string()),
-      }
     }
-    Err(err) => Err(err.to_string()),
-  }
 }
 
 pub async fn get_following(
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
-  public_key: &str,
+    public_key: &str,
-  timeout: Option<u64>,
+    timeout: Option<u64>,
 ) -> Result<Vec<String>, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let public_key = match PublicKey::from_str(public_key) {
+    let public_key = match PublicKey::from_str(public_key) {
-    Ok(val) => val,
+        Ok(val) => val,
-    Err(err) => return Err(err.to_string()),
+        Err(err) => return Err(err.to_string()),
-  };
+    };
-  let duration = timeout.map(Duration::from_secs);
+    let duration = timeout.map(Duration::from_secs);
-  let filter = Filter::new().kind(Kind::ContactList).author(public_key);
+    let filter = Filter::new().kind(Kind::ContactList).author(public_key);
-  let events = match client.get_events_of(vec![filter], duration).await {
+    let events = match client.get_events_of(vec![filter], duration).await {
-    Ok(events) => events,
+        Ok(events) => events,
-    Err(err) => return Err(err.to_string()),
+        Err(err) => return Err(err.to_string()),
-  };
+    };
-  let mut ret: Vec<String> = vec![];
+    let mut ret: Vec<String> = vec![];
-  if let Some(latest_event) = events.iter().max_by_key(|event| event.created_at()) {
+    if let Some(latest_event) = events.iter().max_by_key(|event| event.created_at()) {
-    ret.extend(latest_event.tags().iter().filter_map(|tag| {
+        ret.extend(latest_event.tags().iter().filter_map(|tag| {
-      if let Some(TagStandard::PublicKey {
+            if let Some(TagStandard::PublicKey {
-        uppercase: false, ..
+                uppercase: false, ..
-      }) = <nostr_sdk::Tag as Clone>::clone(tag).to_standardized()
+            }) = <nostr_sdk::Tag as Clone>::clone(tag).to_standardized()
-      {
+            {
-        tag.content().map(String::from)
+                tag.content().map(String::from)
-      } else {
+            } else {
-        None
+                None
-      }
+            }
-    }));
+        }));
-  }
+    }
-  Ok(ret)
+    Ok(ret)
 }
 
 pub async fn get_followers(
-  state: State<'_, Nostr>,
+    state: State<'_, Nostr>,
-  public_key: &str,
+    public_key: &str,
-  timeout: Option<u64>,
+    timeout: Option<u64>,
 ) -> Result<Vec<String>, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let public_key = match PublicKey::from_str(public_key) {
+    let public_key = match PublicKey::from_str(public_key) {
-    Ok(val) => val,
+        Ok(val) => val,
-    Err(err) => return Err(err.to_string()),
+        Err(err) => return Err(err.to_string()),
-  };
+    };
-  let duration = timeout.map(Duration::from_secs);
+    let duration = timeout.map(Duration::from_secs);
 
-  let filter = Filter::new().kind(Kind::ContactList).custom_tag(
+    let filter = Filter::new().kind(Kind::ContactList).custom_tag(
-    SingleLetterTag::lowercase(Alphabet::P),
+        SingleLetterTag::lowercase(Alphabet::P),
-    vec![public_key.to_hex()],
+        vec![public_key.to_hex()],
-  );
+    );
-  let events = match client.get_events_of(vec![filter], duration).await {
+    let events = match client.get_events_of(vec![filter], duration).await {
-    Ok(events) => events,
+        Ok(events) => events,
-    Err(err) => return Err(err.to_string()),
+        Err(err) => return Err(err.to_string()),
-  };
+    };
-  let ret: Vec<String> = events
+    let ret: Vec<String> = events
-    .into_iter()
+        .into_iter()
-    .map(|event| event.author().to_hex())
+        .map(|event| event.author().to_hex())
-    .collect();
+        .collect();
-  Ok(ret)
+    Ok(ret)
-  // TODO: get more than 500 events
+    // TODO: get more than 500 events
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_notifications(state: State<'_, Nostr>) -> Result<Vec<String>, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  match client.signer().await {
+    match client.signer().await {
-    Ok(signer) => {
+        Ok(signer) => {
-      let public_key = signer.public_key().await.unwrap();
+            let public_key = signer.public_key().await.unwrap();
-      let filter = Filter::new()
+            let filter = Filter::new()
-        .pubkey(public_key)
+                .pubkey(public_key)
-        .kinds(vec![
+                .kinds(vec![
-          Kind::TextNote,
+                    Kind::TextNote,
-          Kind::Repost,
+                    Kind::Repost,
-          Kind::Reaction,
+                    Kind::Reaction,
-          Kind::ZapReceipt,
+                    Kind::ZapReceipt,
-        ])
+                ])
-        .limit(200);
+                .limit(200);
 
-      match client
+            match client
-        .database()
+                .database()
-        .query(vec![filter], Order::default())
+                .query(vec![filter], Order::default())
-        .await
+                .await
-      {
+            {
-        Ok(events) => Ok(events.into_iter().map(|ev| ev.as_json()).collect()),
+                Ok(events) => Ok(events.into_iter().map(|ev| ev.as_json()).collect()),
+                Err(err) => Err(err.to_string()),
+            }
+        }
         Err(err) => Err(err.to_string()),
-      }
     }
-    Err(err) => Err(err.to_string()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_settings(state: State<'_, Nostr>) -> Result<Settings, ()> {
-  let settings = state.settings.lock().unwrap().clone();
+    let settings = state.settings.lock().unwrap().clone();
-  Ok(settings)
+    Ok(settings)
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn set_new_settings(settings: &str, state: State<'_, Nostr>) -> Result<(), ()> {
-  let parsed: Settings = serde_json::from_str(settings).expect("Could not parse settings payload");
+    let parsed: Settings =
-  *state.settings.lock().unwrap() = parsed;
+        serde_json::from_str(settings).expect("Could not parse settings payload");
+    *state.settings.lock().unwrap() = parsed;
 
-  Ok(())
+    Ok(())
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn verify_nip05(key: &str, nip05: &str) -> Result<bool, String> {
-  match PublicKey::from_str(key) {
+    match PublicKey::from_str(key) {
-    Ok(public_key) => {
+        Ok(public_key) => {
-      let status = nip05::verify(&public_key, nip05, None).await;
+            let status = nip05::verify(&public_key, nip05, None).await;
-      Ok(status.is_ok())
+            Ok(status.is_ok())
+        }
+        Err(err) => Err(err.to_string()),
     }
-    Err(err) => Err(err.to_string()),
-  }
 }

src-tauri/src/nostr/relay.rs

@@ -3,152 +3,155 @@ use nostr_sdk::prelude::*;
 use serde::Serialize;
 use specta::Type;
 use std::{
-  fs::OpenOptions,
+    fs::OpenOptions,
-  io::{self, BufRead, Write},
+    io::{self, BufRead, Write},
 };
 use tauri::{path::BaseDirectory, Manager, State};
 
 #[derive(Serialize, Type)]
 pub struct Relays {
-  connected: Vec<String>,
+    connected: Vec<String>,
-  read: Option<Vec<String>>,
+    read: Option<Vec<String>>,
-  write: Option<Vec<String>>,
+    write: Option<Vec<String>>,
-  both: Option<Vec<String>>,
+    both: Option<Vec<String>>,
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn get_relays(state: State<'_, Nostr>) -> Result<Relays, String> {
-  let client = &state.client;
+    let client = &state.client;
 
-  let connected_relays = client
+    let connected_relays = client
-    .relays()
+        .relays()
-    .await
+        .await
-    .into_keys()
+        .into_keys()
-    .map(|url| url.to_string())
+        .map(|url| url.to_string())
-    .collect::<Vec<_>>();
+        .collect::<Vec<_>>();
 
-  let signer = client.signer().await.map_err(|e| e.to_string())?;
+    let signer = client.signer().await.map_err(|e| e.to_string())?;
-  let public_key = signer.public_key().await.map_err(|e| e.to_string())?;
+    let public_key = signer.public_key().await.map_err(|e| e.to_string())?;
 
-  let filter = Filter::new()
+    let filter = Filter::new()
-    .author(public_key)
+        .author(public_key)
-    .kind(Kind::RelayList)
+        .kind(Kind::RelayList)
-    .limit(1);
+        .limit(1);
 
-  match client.get_events_of(vec![filter], None).await {
+    match client.get_events_of(vec![filter], None).await {
-    Ok(events) => {
+        Ok(events) => {
-      if let Some(event) = events.first() {
+            if let Some(event) = events.first() {
-        let nip65_list = nip65::extract_relay_list(event);
+                let nip65_list = nip65::extract_relay_list(event).collect::<Vec<_>>();
-        let read = nip65_list
+
-          .iter()
+                let read = nip65_list
-          .filter_map(|(url, meta)| {
+                    .iter()
-            if let Some(RelayMetadata::Read) = meta {
+                    .filter_map(|(url, meta)| {
-              Some(url.to_string())
+                        if let Some(RelayMetadata::Read) = meta {
+                            Some(url.to_string())
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+
+                let write = nip65_list
+                    .iter()
+                    .filter_map(|(url, meta)| {
+                        if let Some(RelayMetadata::Write) = meta {
+                            Some(url.to_string())
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+
+                let both = nip65_list
+                    .iter()
+                    .filter_map(|(url, meta)| {
+                        if meta.is_none() {
+                            Some(url.to_string())
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+
+                Ok(Relays {
+                    connected: connected_relays,
+                    read: Some(read),
+                    write: Some(write),
+                    both: Some(both),
+                })
             } else {
-              None
+                Ok(Relays {
+                    connected: connected_relays,
+                    read: None,
+                    write: None,
+                    both: None,
+                })
             }
-          })
+        }
-          .collect();
+        Err(e) => Err(e.to_string()),
-        let write = nip65_list
-          .iter()
-          .filter_map(|(url, meta)| {
-            if let Some(RelayMetadata::Write) = meta {
-              Some(url.to_string())
-            } else {
-              None
-            }
-          })
-          .collect();
-        let both = nip65_list
-          .iter()
-          .filter_map(|(url, meta)| {
-            if meta.is_none() {
-              Some(url.to_string())
-            } else {
-              None
-            }
-          })
-          .collect();
-
-        Ok(Relays {
-          connected: connected_relays,
-          read: Some(read),
-          write: Some(write),
-          both: Some(both),
-        })
-      } else {
-        Ok(Relays {
-          connected: connected_relays,
-          read: None,
-          write: None,
-          both: None,
-        })
-      }
     }
-    Err(e) => Err(e.to_string()),
-  }
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn connect_relay(relay: &str, state: State<'_, Nostr>) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
-  let status = client.add_relay(relay).await.map_err(|e| e.to_string())?;
+    let status = client.add_relay(relay).await.map_err(|e| e.to_string())?;
-  if status {
+    if status {
-    println!("Connecting to relay: {}", relay);
+        println!("Connecting to relay: {}", relay);
-    client
+        client
-      .connect_relay(relay)
+            .connect_relay(relay)
-      .await
+            .await
-      .map_err(|e| e.to_string())?;
+            .map_err(|e| e.to_string())?;
-  }
+    }
-  Ok(status)
+    Ok(status)
 }
 
 #[tauri::command]
 #[specta::specta]
 pub async fn remove_relay(relay: &str, state: State<'_, Nostr>) -> Result<bool, String> {
-  let client = &state.client;
+    let client = &state.client;
-  client
+    client
-    .remove_relay(relay)
+        .remove_relay(relay)
-    .await
+        .await
-    .map_err(|e| e.to_string())?;
+        .map_err(|e| e.to_string())?;
-  client
+    client
-    .disconnect_relay(relay)
+        .disconnect_relay(relay)
-    .await
+        .await
-    .map_err(|e| e.to_string())?;
+        .map_err(|e| e.to_string())?;
-  Ok(true)
+    Ok(true)
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn get_bootstrap_relays(app: tauri::AppHandle) -> Result<Vec<String>, String> {
-  let relays_path = app
+    let relays_path = app
-    .path()
+        .path()
-    .resolve("resources/relays.txt", BaseDirectory::Resource)
+        .resolve("resources/relays.txt", BaseDirectory::Resource)
-    .map_err(|e| e.to_string())?;
+        .map_err(|e| e.to_string())?;
 
-  let file = std::fs::File::open(relays_path).map_err(|e| e.to_string())?;
+    let file = std::fs::File::open(relays_path).map_err(|e| e.to_string())?;
-  let reader = io::BufReader::new(file);
+    let reader = io::BufReader::new(file);
 
-  reader
+    reader
-    .lines()
+        .lines()
-    .collect::<Result<Vec<String>, io::Error>>()
+        .collect::<Result<Vec<String>, io::Error>>()
-    .map_err(|e| e.to_string())
+        .map_err(|e| e.to_string())
 }
 
 #[tauri::command]
 #[specta::specta]
 pub fn save_bootstrap_relays(relays: &str, app: tauri::AppHandle) -> Result<(), String> {
-  let relays_path = app
+    let relays_path = app
-    .path()
+        .path()
-    .resolve("resources/relays.txt", BaseDirectory::Resource)
+        .resolve("resources/relays.txt", BaseDirectory::Resource)
-    .map_err(|e| e.to_string())?;
+        .map_err(|e| e.to_string())?;
 
-  let mut file = OpenOptions::new()
+    let mut file = OpenOptions::new()
-    .write(true)
+        .write(true)
-    .open(relays_path)
+        .open(relays_path)
-    .map_err(|e| e.to_string())?;
+        .map_err(|e| e.to_string())?;
 
-  file.write_all(relays.as_bytes()).map_err(|e| e.to_string())
+    file.write_all(relays.as_bytes()).map_err(|e| e.to_string())
 }

src-tauri/src/nostr/utils.rs

@@ -11,255 +11,255 @@ use url::Url;
 
 #[derive(Debug, Clone, Serialize, Type)]
 pub struct Meta {
-  pub content: String,
+    pub content: String,
-  pub images: Vec<String>,
+    pub images: Vec<String>,
-  pub videos: Vec<String>,
+    pub videos: Vec<String>,
-  pub events: Vec<String>,
+    pub events: Vec<String>,
-  pub mentions: Vec<String>,
+    pub mentions: Vec<String>,
-  pub hashtags: Vec<String>,
+    pub hashtags: Vec<String>,
 }
 
 const NOSTR_EVENTS: [&str; 10] = [
-  "@nevent1",
+    "@nevent1",
-  "@note1",
+    "@note1",
-  "@nostr:note1",
+    "@nostr:note1",
-  "@nostr:nevent1",
+    "@nostr:nevent1",
-  "nostr:note1",
+    "nostr:note1",
-  "note1",
+    "note1",
-  "nostr:nevent1",
+    "nostr:nevent1",
-  "nevent1",
+    "nevent1",
-  "Nostr:note1",
+    "Nostr:note1",
-  "Nostr:nevent1",
+    "Nostr:nevent1",
 ];
 const NOSTR_MENTIONS: [&str; 10] = [
-  "@npub1",
+    "@npub1",
-  "nostr:npub1",
+    "nostr:npub1",
-  "nostr:nprofile1",
+    "nostr:nprofile1",
-  "nostr:naddr1",
+    "nostr:naddr1",
-  "npub1",
+    "npub1",
-  "nprofile1",
+    "nprofile1",
-  "naddr1",
+    "naddr1",
-  "Nostr:npub1",
+    "Nostr:npub1",
-  "Nostr:nprofile1",
+    "Nostr:nprofile1",
-  "Nostr:naddr1",
+    "Nostr:naddr1",
 ];
 const IMAGES: [&str; 7] = ["jpg", "jpeg", "gif", "png", "webp", "avif", "tiff"];
 const VIDEOS: [&str; 5] = ["mp4", "mov", "avi", "webm", "mkv"];
 
 pub fn get_latest_event(events: &[Event]) -> Option<&Event> {
-  events.iter().next()
+    events.iter().next()
 }
 
 pub fn dedup_event(events: &[Event]) -> Vec<Event> {
-  let mut seen_ids = HashSet::new();
+    let mut seen_ids = HashSet::new();
-  events
+    events
-    .iter()
+        .iter()
-    .filter(|&event| {
+        .filter(|&event| {
-      let e = TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::E));
+            let e = TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::E));
-      let e_tags: Vec<&Tag> = event.tags.iter().filter(|el| el.kind() == e).collect();
+            let e_tags: Vec<&Tag> = event.tags.iter().filter(|el| el.kind() == e).collect();
-      let ids: Vec<&str> = e_tags.iter().filter_map(|tag| tag.content()).collect();
+            let ids: Vec<&str> = e_tags.iter().filter_map(|tag| tag.content()).collect();
-      let is_dup = ids.iter().any(|id| seen_ids.contains(*id));
+            let is_dup = ids.iter().any(|id| seen_ids.contains(*id));
 
-      for id in &ids {
+            for id in &ids {
-        seen_ids.insert(*id);
+                seen_ids.insert(*id);
-      }
+            }
 
-      !is_dup
+            !is_dup
-    })
+        })
-    .cloned()
+        .cloned()
-    .collect()
+        .collect()
 }
 
 pub async fn parse_event(content: &str) -> Meta {
-  let mut finder = LinkFinder::new();
+    let mut finder = LinkFinder::new();
-  finder.url_must_have_scheme(false);
+    finder.url_must_have_scheme(false);
 
-  // Get urls
+    // Get urls
-  let urls: Vec<_> = finder.links(content).collect();
+    let urls: Vec<_> = finder.links(content).collect();
-  // Get words
+    // Get words
-  let words: Vec<_> = content.split_whitespace().collect();
+    let words: Vec<_> = content.split_whitespace().collect();
 
-  let hashtags = words
+    let hashtags = words
-    .iter()
+        .iter()
-    .filter(|&&word| word.starts_with('#'))
+        .filter(|&&word| word.starts_with('#'))
-    .map(|&s| s.to_string())
+        .map(|&s| s.to_string())
-    .collect::<Vec<_>>();
+        .collect::<Vec<_>>();
 
-  let events = words
+    let events = words
-    .iter()
+        .iter()
-    .filter(|&&word| NOSTR_EVENTS.iter().any(|&el| word.starts_with(el)))
+        .filter(|&&word| NOSTR_EVENTS.iter().any(|&el| word.starts_with(el)))
-    .map(|&s| s.to_string())
+        .map(|&s| s.to_string())
-    .collect::<Vec<_>>();
+        .collect::<Vec<_>>();
 
-  let mentions = words
+    let mentions = words
-    .iter()
+        .iter()
-    .filter(|&&word| NOSTR_MENTIONS.iter().any(|&el| word.starts_with(el)))
+        .filter(|&&word| NOSTR_MENTIONS.iter().any(|&el| word.starts_with(el)))
-    .map(|&s| s.to_string())
+        .map(|&s| s.to_string())
-    .collect::<Vec<_>>();
+        .collect::<Vec<_>>();
 
-  let mut images = Vec::new();
+    let mut images = Vec::new();
-  let mut videos = Vec::new();
+    let mut videos = Vec::new();
-  let mut text = content.to_string();
+    let mut text = content.to_string();
 
-  if !urls.is_empty() {
+    if !urls.is_empty() {
-    let client = Client::new();
+        let client = Client::new();
 
-    for url in urls {
+        for url in urls {
-      let url_str = url.as_str();
+            let url_str = url.as_str();
 
-      if let Ok(parsed_url) = Url::from_str(url_str) {
+            if let Ok(parsed_url) = Url::from_str(url_str) {
-        if let Some(ext) = parsed_url
+                if let Some(ext) = parsed_url
-          .path_segments()
+                    .path_segments()
-          .and_then(|segments| segments.last().and_then(|s| s.split('.').last()))
+                    .and_then(|segments| segments.last().and_then(|s| s.split('.').last()))
-        {
+                {
-          if IMAGES.contains(&ext) {
+                    if IMAGES.contains(&ext) {
-            text = text.replace(url_str, "");
+                        text = text.replace(url_str, "");
-            images.push(url_str.to_string());
+                        images.push(url_str.to_string());
-            // Process the next item.
+                        // Process the next item.
-            continue;
+                        continue;
-          }
+                    }
-          if VIDEOS.contains(&ext) {
+                    if VIDEOS.contains(&ext) {
-            text = text.replace(url_str, "");
+                        text = text.replace(url_str, "");
-            videos.push(url_str.to_string());
+                        videos.push(url_str.to_string());
-            // Process the next item.
+                        // Process the next item.
-            continue;
+                        continue;
-          }
+                    }
-        }
+                }
 
-        // Check the content type of URL via HEAD request
+                // Check the content type of URL via HEAD request
-        if let Ok(res) = client.head(url_str).send().await {
+                if let Ok(res) = client.head(url_str).send().await {
-          if let Some(content_type) = res.headers().get("Content-Type") {
+                    if let Some(content_type) = res.headers().get("Content-Type") {
-            if content_type.to_str().unwrap_or("").starts_with("image") {
+                        if content_type.to_str().unwrap_or("").starts_with("image") {
-              text = text.replace(url_str, "");
+                            text = text.replace(url_str, "");
-              images.push(url_str.to_string());
+                            images.push(url_str.to_string());
-              // Process the next item.
+                            // Process the next item.
-              continue;
+                            continue;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 
-  // Clean up the resulting content string to remove extra spaces
+    // Clean up the resulting content string to remove extra spaces
-  let cleaned_text = text.trim().to_string();
+    let cleaned_text = text.trim().to_string();
 
-  Meta {
+    Meta {
-    content: cleaned_text,
+        content: cleaned_text,
-    events,
+        events,
-    mentions,
+        mentions,
-    hashtags,
+        hashtags,
-    images,
+        images,
-    videos,
+        videos,
-  }
+    }
 }
 
 pub fn create_event_tags(content: &str) -> Vec<Tag> {
-  let mut tags: Vec<Tag> = vec![];
+    let mut tags: Vec<Tag> = vec![];
-  let mut tag_set: HashSet<String> = HashSet::new();
+    let mut tag_set: HashSet<String> = HashSet::new();
 
-  // Get words
+    // Get words
-  let words: Vec<_> = content.split_whitespace().collect();
+    let words: Vec<_> = content.split_whitespace().collect();
 
-  // Get mentions
+    // Get mentions
-  let mentions = words
+    let mentions = words
-    .iter()
+        .iter()
-    .filter(|&&word| ["nostr:", "@"].iter().any(|&el| word.starts_with(el)))
+        .filter(|&&word| ["nostr:", "@"].iter().any(|&el| word.starts_with(el)))
-    .map(|&s| s.to_string())
+        .map(|&s| s.to_string())
-    .collect::<Vec<_>>();
+        .collect::<Vec<_>>();
 
-  // Get hashtags
+    // Get hashtags
-  let hashtags = words
+    let hashtags = words
-    .iter()
+        .iter()
-    .filter(|&&word| word.starts_with('#'))
+        .filter(|&&word| word.starts_with('#'))
-    .map(|&s| s.to_string())
+        .map(|&s| s.to_string())
-    .collect::<Vec<_>>();
+        .collect::<Vec<_>>();
 
-  for mention in mentions {
+    for mention in mentions {
-    let entity = mention.replace("nostr:", "").replace('@', "");
+        let entity = mention.replace("nostr:", "").replace('@', "");
 
-    if !tag_set.contains(&entity) {
+        if !tag_set.contains(&entity) {
-      if entity.starts_with("npub") {
+            if entity.starts_with("npub") {
-        if let Ok(public_key) = PublicKey::from_bech32(&entity) {
+                if let Ok(public_key) = PublicKey::from_bech32(&entity) {
-          let tag = Tag::public_key(public_key);
+                    let tag = Tag::public_key(public_key);
-          tags.push(tag);
+                    tags.push(tag);
-        } else {
+                } else {
-          continue;
+                    continue;
+                }
+            }
+            if entity.starts_with("nprofile") {
+                if let Ok(public_key) = PublicKey::from_bech32(&entity) {
+                    let tag = Tag::public_key(public_key);
+                    tags.push(tag);
+                } else {
+                    continue;
+                }
+            }
+            if entity.starts_with("note") {
+                if let Ok(event_id) = EventId::from_bech32(&entity) {
+                    let hex = event_id.to_hex();
+                    let tag = Tag::parse(&["e", &hex, "", "mention"]).unwrap();
+                    tags.push(tag);
+                } else {
+                    continue;
+                }
+            }
+            if entity.starts_with("nevent") {
+                if let Ok(event) = Nip19Event::from_bech32(&entity) {
+                    let hex = event.event_id.to_hex();
+                    let relay = event.clone().relays.into_iter().next().unwrap_or("".into());
+                    let tag = Tag::parse(&["e", &hex, &relay, "mention"]).unwrap();
+
+                    if let Some(author) = event.author {
+                        let tag = Tag::public_key(author);
+                        tags.push(tag);
+                    }
+
+                    tags.push(tag);
+                } else {
+                    continue;
+                }
+            }
+            tag_set.insert(entity);
         }
-      }
+    }
-      if entity.starts_with("nprofile") {
-        if let Ok(public_key) = PublicKey::from_bech32(&entity) {
-          let tag = Tag::public_key(public_key);
-          tags.push(tag);
-        } else {
-          continue;
-        }
-      }
-      if entity.starts_with("note") {
-        if let Ok(event_id) = EventId::from_bech32(&entity) {
-          let hex = event_id.to_hex();
-          let tag = Tag::parse(&["e", &hex, "", "mention"]).unwrap();
-          tags.push(tag);
-        } else {
-          continue;
-        }
-      }
-      if entity.starts_with("nevent") {
-        if let Ok(event) = Nip19Event::from_bech32(&entity) {
-          let hex = event.event_id.to_hex();
-          let relay = event.clone().relays.into_iter().next().unwrap_or("".into());
-          let tag = Tag::parse(&["e", &hex, &relay, "mention"]).unwrap();
 
-          if let Some(author) = event.author {
+    for hashtag in hashtags {
-            let tag = Tag::public_key(author);
+        if !tag_set.contains(&hashtag) {
+            let tag = Tag::hashtag(hashtag.clone());
             tags.push(tag);
-          }
+            tag_set.insert(hashtag);
-
-          tags.push(tag);
-        } else {
-          continue;
         }
-      }
-      tag_set.insert(entity);
     }
-  }
 
-  for hashtag in hashtags {
+    tags
-    if !tag_set.contains(&hashtag) {
-      let tag = Tag::hashtag(hashtag.clone());
-      tags.push(tag);
-      tag_set.insert(hashtag);
-    }
-  }
-
-  tags
 }
 
 #[cfg(test)]
 mod tests {
-  use super::*;
+    use super::*;
 
-  #[tokio::test]
+    #[tokio::test]
-  async fn test_parse_event() {
+    async fn test_parse_event() {
-    let content = "Check this image: https://example.com/image.jpg #cool @npub1";
+        let content = "Check this image: https://example.com/image.jpg #cool @npub1";
-    let meta = parse_event(content).await;
+        let meta = parse_event(content).await;
 
-    assert_eq!(meta.content, "Check this image: #cool @npub1");
+        assert_eq!(meta.content, "Check this image: #cool @npub1");
-    assert_eq!(meta.images, vec!["https://example.com/image.jpg"]);
+        assert_eq!(meta.images, vec!["https://example.com/image.jpg"]);
-    assert_eq!(meta.videos, Vec::<String>::new());
+        assert_eq!(meta.videos, Vec::<String>::new());
-    assert_eq!(meta.hashtags, vec!["#cool"]);
+        assert_eq!(meta.hashtags, vec!["#cool"]);
-    assert_eq!(meta.mentions, vec!["@npub1"]);
+        assert_eq!(meta.mentions, vec!["@npub1"]);
-  }
+    }
 
-  #[tokio::test]
+    #[tokio::test]
-  async fn test_parse_video() {
+    async fn test_parse_video() {
-    let content = "Check this video: https://example.com/video.mp4 #cool @npub1";
+        let content = "Check this video: https://example.com/video.mp4 #cool @npub1";
-    let meta = parse_event(content).await;
+        let meta = parse_event(content).await;
 
-    assert_eq!(meta.content, "Check this video: #cool @npub1");
+        assert_eq!(meta.content, "Check this video: #cool @npub1");
-    assert_eq!(meta.images, Vec::<String>::new());
+        assert_eq!(meta.images, Vec::<String>::new());
-    assert_eq!(meta.videos, vec!["https://example.com/video.mp4"]);
+        assert_eq!(meta.videos, vec!["https://example.com/video.mp4"]);
-    assert_eq!(meta.hashtags, vec!["#cool"]);
+        assert_eq!(meta.hashtags, vec!["#cool"]);
-    assert_eq!(meta.mentions, vec!["@npub1"]);
+        assert_eq!(meta.mentions, vec!["@npub1"]);
-  }
+    }
 }

src-tauri/tauri.conf.json

@@ -1,128 +1,116 @@
 {
-  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
+	"$schema": "../node_modules/@tauri-apps/cli/schema.json",
-  "productName": "Lume",
+	"productName": "Lume",
-  "version": "4.0.13",
+	"version": "4.0.15",
-  "identifier": "nu.lume.Lume",
+	"identifier": "nu.lume.Lume",
-  "build": {
+	"build": {
-    "beforeBuildCommand": "pnpm desktop:build",
+		"beforeBuildCommand": "pnpm desktop:build",
-    "beforeDevCommand": "pnpm desktop:dev",
+		"beforeDevCommand": "pnpm desktop:dev",
-    "devUrl": "http://localhost:3000",
+		"devUrl": "http://localhost:3000",
-    "frontendDist": "../dist"
+		"frontendDist": "../dist"
-  },
+	},
-  "app": {
+	"app": {
-    "macOSPrivateApi": true,
+		"macOSPrivateApi": true,
-    "withGlobalTauri": true,
+		"withGlobalTauri": true,
-    "security": {
+		"security": {
-      "assetProtocol": {
+			"assetProtocol": {
-        "enable": true,
+				"enable": true,
-        "scope": [
+				"scope": [
-          "$APPDATA/*",
+					"$APPDATA/*",
-          "$DATA/*",
+					"$DATA/*",
-          "$LOCALDATA/*",
+					"$LOCALDATA/*",
-          "$DESKTOP/*",
+					"$DESKTOP/*",
-          "$DOCUMENT/*",
+					"$DOCUMENT/*",
-          "$DOWNLOAD/*",
+					"$DOWNLOAD/*",
-          "$HOME/*",
+					"$HOME/*",
-          "$PICTURE/*",
+					"$PICTURE/*",
-          "$PUBLIC/*",
+					"$PUBLIC/*",
-          "$VIDEO/*",
+					"$VIDEO/*",
-          "$APPCONFIG/*",
+					"$APPCONFIG/*",
-          "$RESOURCE/*"
+					"$RESOURCE/*"
-        ]
+				]
-      }
+			}
-    }
+		}
-  },
+	},
-  "bundle": {
+	"bundle": {
-    "licenseFile": "../LICENSE",
+		"licenseFile": "../LICENSE",
-    "longDescription": "nostr client for desktop",
+		"homepage": "https://lume.nu",
-    "shortDescription": "nostr client",
+		"longDescription": "nostr client for desktop",
-    "targets": "all",
+		"shortDescription": "nostr client",
-    "active": true,
+		"targets": "all",
-    "category": "SocialNetworking",
+		"active": true,
-    "resources": [
+		"category": "SocialNetworking",
-      "resources/*",
+		"resources": [
-      "locales/*"
+			"resources/*",
-    ],
+			"locales/*"
-    "icon": [
+		],
-      "icons/32x32.png",
+		"icon": [
-      "icons/128x128.png",
+			"icons/32x32.png",
-      "icons/128x128@2x.png",
+			"icons/128x128.png",
-      "icons/icon.icns",
+			"icons/128x128@2x.png",
-      "icons/icon.ico"
+			"icons/icon.icns",
-    ],
+			"icons/icon.ico"
-    "linux": {
+		],
-      "appimage": {
+		"linux": {
-        "bundleMediaFramework": true,
+			"appimage": {
-        "files": {}
+				"bundleMediaFramework": true,
-      },
+				"files": {}
-      "deb": {
+			},
-        "files": {}
+			"deb": {
-      },
+				"files": {}
-      "rpm": {
+			},
-        "epoch": 0,
+			"rpm": {
-        "files": {},
+				"epoch": 0,
-        "release": "1"
+				"files": {},
-      }
+				"release": "1"
-    },
+			}
-    "macOS": {
+		},
-      "dmg": {
+		"macOS": {
-        "appPosition": {
+			"minimumSystemVersion": "10.15"
-          "x": 180,
+		},
-          "y": 170
+		"windows": {
-        },
+			"allowDowngrades": true,
-        "applicationFolderPosition": {
+			"certificateThumbprint": null,
-          "x": 480,
+			"digestAlgorithm": "sha256",
-          "y": 170
+			"nsis": null,
-        },
+			"timestampUrl": null,
-        "windowSize": {
+			"tsp": false,
-          "height": 400,
+			"webviewFixedRuntimePath": null,
-          "width": 660
+			"webviewInstallMode": {
-        }
+				"silent": true,
-      },
+				"type": "downloadBootstrapper"
-      "files": {},
+			},
-      "minimumSystemVersion": "10.15"
+			"wix": null
-    },
+		},
-    "windows": {
+		"fileAssociations": [
-      "allowDowngrades": true,
+			{
-      "certificateThumbprint": null,
+				"name": "bech32",
-      "digestAlgorithm": "sha256",
+				"description": "Nostr BECH32",
-      "nsis": null,
+				"ext": [
-      "timestampUrl": null,
+					"npub",
-      "tsp": false,
+					"nsec",
-      "webviewFixedRuntimePath": null,
+					"nprofile",
-      "webviewInstallMode": {
+					"nevent",
-        "silent": true,
+					"naddr",
-        "type": "downloadBootstrapper"
+					"nrelay"
-      },
+				],
-      "wix": null
+				"role": "Viewer"
-    },
+			}
-    "fileAssociations": [
+		],
-      {
+		"createUpdaterArtifacts": true
-        "name": "bech32",
+	},
-        "description": "Nostr Bech32",
+	"plugins": {
-        "ext": [
+		"updater": {
-          "npub",
+			"active": true,
-          "nsec",
+			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK",
-          "nprofile",
+			"windows": {
-          "nevent",
+				"installMode": "quiet"
-          "naddr",
+			},
-          "nrelay"
+			"endpoints": [
-        ],
+				"https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
-        "role": "Viewer"
+				"https://lus.reya3772.workers.dev/{{target}}/{{current_version}}",
-      }
+				"https://github.com/lumehq/lume/releases/latest/download/latest.json"
-    ]
+			]
-  },
+		}
-  "plugins": {
+	}
-    "updater": {
-      "active": true,
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK",
-      "windows": {
-        "installMode": "quiet"
-      },
-      "endpoints": [
-        "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
-        "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
-      ]
-    }
-  }
 }

src-tauri/tauri.linux.conf.json

@@ -1,16 +1,15 @@
 {
-	"$schema": "../node_modules/@tauri-apps/cli/schema.json",
+  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
-	"app": {
+  "app": {
-		"windows": [
+    "windows": [
-			{
+      {
-				"title": "Lume",
+        "title": "Lume",
-				"label": "main",
+        "label": "main",
-				"titleBarStyle": "Overlay",
+        "width": 1045,
-				"width": 500,
+        "height": 800,
-				"height": 800,
+        "minWidth": 480,
-				"minWidth": 500,
+        "minHeight": 760
-				"minHeight": 800
+      }
-			}
+    ]
-		]
+  }
-	}
 }

src-tauri/tauri.macos.conf.json

@@ -17,6 +17,7 @@
         "minWidth": 480,
         "minHeight": 760,
         "hiddenTitle": true,
+        "transparent": true,
         "windowEffects": {
           "state": "followsWindowActiveState",
           "effects": [

src-tauri/tauri.windows.conf.json

@@ -1,19 +1,21 @@
 {
-	"$schema": "../node_modules/@tauri-apps/cli/schema.json",
+  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
-	"app": {
+  "app": {
-		"windows": [
+    "windows": [
-			{
+      {
-				"title": "Lume",
+        "title": "Lume",
-				"label": "main",
+        "label": "main",
-				"width": 500,
+        "width": 1045,
-				"height": 800,
+        "height": 800,
-				"minWidth": 500,
+        "minWidth": 480,
-				"minHeight": 800,
+        "minHeight": 760,
-				"transparent": true,
+        "transparent": true,
-				"windowEffects": {
+        "windowEffects": {
-					"effects": ["mica"]
+          "effects": [
-				}
+            "mica"
-			}
+          ]
-		]
+        }
-	}
+      }
+    ]
+  }
 }