chore: clean up

src/routes/$account/_app/home.lazy.tsx

@@ -1,6 +1,7 @@
+import { commands } from "@/commands.gen";
 import { Spinner } from "@/components";
 import { Column } from "@/components/column";
-import { LumeWindow, NostrQuery } from "@/system";
+import { LumeWindow } from "@/system";
 import type { ColumnEvent, LumeColumn } from "@/types";
 import { ArrowLeft, ArrowRight, Plus, StackPlus } from "@phosphor-icons/react";
 import { createLazyFileRoute } from "@tanstack/react-router";
@@ -24,7 +25,7 @@ export const Route = createLazyFileRoute("/$account/_app/home")({
 });
 
 function Screen() {
-	const initialColumnList = Route.useLoaderData();
+	const { initialColumns } = Route.useRouteContext();
 
 	const [columns, setColumns] = useState<LumeColumn[]>([]);
 	const [emblaRef, emblaApi] = useEmblaCarousel({
@@ -105,6 +106,18 @@ function Screen() {
 		event.preventDefault();
 	}, 150);
 
+	const saveAllColumns = useDebouncedCallback(async () => {
+		const key = "lume_v4:columns";
+		const content = JSON.stringify(columns);
+		const res = await commands.setLumeStore(key, content);
+
+		if (res.status === "ok") {
+			return res.data;
+		} else {
+			console.log(res.error);
+		}
+	}, 200);
+
 	useEffect(() => {
 		if (emblaApi) {
 			emblaApi.on("scroll", emitScrollEvent);
@@ -120,14 +133,12 @@ function Screen() {
 	}, [emblaApi, emitScrollEvent, emitResizeEvent]);
 
 	useEffect(() => {
-		if (columns) {
-			NostrQuery.setColumns(columns).then(() => console.log("saved"));
-		}
+		if (columns) saveAllColumns();
 	}, [columns]);
 
 	useEffect(() => {
-		setColumns(initialColumnList);
-	}, [initialColumnList]);
+		setColumns(initialColumns);
+	}, [initialColumns]);
 
 	// Listen for keyboard event
 	useEffect(() => {

src/routes/$account/_app/home.tsx

@@ -3,16 +3,18 @@ import type { LumeColumn } from "@/types";
 import { createFileRoute } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/$account/_app/home")({
-	loader: async ({ context }) => {
+	beforeLoad: async ({ context }) => {
 		const key = "lume_v4:columns";
 		const defaultColumns = context.systemColumns.filter((col) => col.default);
 		const query = await commands.getLumeStore(key);
 
+		let initialColumns: LumeColumn[] = defaultColumns;
+
 		if (query.status === "ok") {
-			const columns: LumeColumn[] = JSON.parse(query.data);
-			return columns;
-		} else {
-			return defaultColumns;
+			initialColumns = JSON.parse(query.data);
+			return { initialColumns };
 		}
+
+		return { initialColumns };
 	},
 });

src/routes/$account/_settings/bitcoin-connect.lazy.tsx

@@ -1,3 +1,4 @@
+import { commands } from "@/commands.gen";
 import { NostrAccount } from "@/system";
 import { Button } from "@getalby/bitcoin-connect-react";
 import { createLazyFileRoute } from "@tanstack/react-router";
@@ -11,8 +12,13 @@ export const Route = createLazyFileRoute("/$account/_settings/bitcoin-connect")(
 
 function Screen() {
 	const setNwcUri = async (uri: string) => {
-		const cmd = await NostrAccount.setWallet(uri);
-		if (cmd) getCurrentWebviewWindow().close();
+		const res = await commands.setWallet(uri);
+
+		if (res.status === "ok") {
+			await getCurrentWebviewWindow().close();
+		} else {
+			throw new Error(res.error);
+		}
 	};
 
 	return (

src/routes/$account/_settings/profile.lazy.tsx

@@ -1,8 +1,6 @@
-import { commands } from "@/commands.gen";
-import { cn } from "@/commons";
+import { type Profile, commands } from "@/commands.gen";
+import { cn, upload } from "@/commons";
 import { Spinner } from "@/components";
-import { NostrAccount, NostrQuery } from "@/system";
-import type { Metadata } from "@/types";
 import { Plus } from "@phosphor-icons/react";
 import { createLazyFileRoute } from "@tanstack/react-router";
 import { writeText } from "@tauri-apps/plugin-clipboard-manager";
@@ -27,15 +25,16 @@ function Screen() {
 	const [isPending, startTransition] = useTransition();
 	const [picture, setPicture] = useState<string>("");
 
-	const onSubmit = (data: Metadata) => {
+	const onSubmit = (data: Profile) => {
 		startTransition(async () => {
-			try {
-				const newProfile: Metadata = { ...profile, ...data, picture };
-				await NostrAccount.createProfile(newProfile);
-			} catch (e) {
-				await message(String(e), { title: "Profile", kind: "error" });
-				return;
+			const newProfile: Profile = { ...profile, ...data, picture };
+			const res = await commands.setProfile(newProfile);
+
+			if (res.status === "error") {
+				await message(res.error, { title: "Profile", kind: "error" });
 			}
+
+			return;
 		});
 	};
 
@@ -220,17 +219,18 @@ function AvatarUploader({
 	children: ReactNode;
 	className?: string;
 }) {
-	const [loading, setLoading] = useState(false);
+	const [isPending, startTransition] = useTransition();
 
-	const uploadAvatar = async () => {
-		try {
-			setLoading(true);
-			const image = await NostrQuery.upload();
-			setPicture(image);
-		} catch (e) {
-			setLoading(false);
-			await message(String(e), { title: "Lume", kind: "error" });
-		}
+	const uploadAvatar = () => {
+		startTransition(async () => {
+			try {
+				const image = await upload();
+				setPicture(image);
+			} catch (e) {
+				await message(String(e));
+				return;
+			}
+		});
 	};
 
 	return (
@@ -239,7 +239,7 @@ function AvatarUploader({
 			onClick={() => uploadAvatar()}
 			className={cn("size-4", className)}
 		>
-			{loading ? <Spinner className="size-4" /> : children}
+			{isPending ? <Spinner className="size-4" /> : children}
 		</button>
 	);
 }

src/routes/$account/_settings/profile.tsx

@@ -1,5 +1,4 @@
-import { commands } from "@/commands.gen";
-import type { Metadata } from "@/types";
+import { type Profile, commands } from "@/commands.gen";
 import { createFileRoute } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/$account/_settings/profile")({
@@ -7,7 +6,7 @@ export const Route = createFileRoute("/$account/_settings/profile")({
 		const res = await commands.getProfile(params.account);
 
 		if (res.status === "ok") {
-			const profile: Metadata = JSON.parse(res.data);
+			const profile: Profile = JSON.parse(res.data);
 			return { profile };
 		} else {
 			throw new Error(res.error);

src/routes/$account/_settings/relay.lazy.tsx

@@ -1,5 +1,4 @@
 import { commands } from "@/commands.gen";
-import { NostrQuery } from "@/system";
 import { Plus, X } from "@phosphor-icons/react";
 import { createLazyFileRoute } from "@tanstack/react-router";
 import { message } from "@tauri-apps/plugin-dialog";
@@ -16,6 +15,16 @@ function Screen() {
 	const [newRelay, setNewRelay] = useState("");
 	const [isPending, startTransition] = useTransition();
 
+	const removeRelay = async (relay: string) => {
+		const res = await commands.removeRelay(relay);
+
+		if (res.status === "ok") {
+			return res.data;
+		} else {
+			throw new Error(res.error);
+		}
+	};
+
 	const addNewRelay = () => {
 		startTransition(async () => {
 			try {
@@ -69,7 +78,7 @@ function Screen() {
 								<div>
 									<button
 										type="button"
-										onClick={() => NostrQuery.removeRelay(relay)}
+										onClick={() => removeRelay(relay)}
 										className="inline-flex items-center justify-center rounded-md size-7 hover:bg-black/10 dark:hover:bg-white/10"
 									>
 										<X className="size-4" />

src/routes/$account/_settings/wallet.lazy.tsx

@@ -1,4 +1,4 @@
-import { NostrAccount } from "@/system";
+import { commands } from "@/commands.gen";
 import { createLazyFileRoute, redirect } from "@tanstack/react-router";
 
 export const Route = createLazyFileRoute("/$account/_settings/wallet")({
@@ -10,10 +10,14 @@ function Screen() {
 	const { balance } = Route.useRouteContext();
 
 	const disconnect = async () => {
-		window.localStorage.removeItem("bc:config");
-		await NostrAccount.removeWallet();
+		const res = await commands.removeWallet();
 
-		return redirect({ to: "/$account/bitcoin-connect", params: { account } });
+		if (res.status === "ok") {
+			window.localStorage.removeItem("bc:config");
+			return redirect({ to: "/$account/bitcoin-connect", params: { account } });
+		} else {
+			throw new Error(res.error);
+		}
 	};
 
 	return (