chore: release

feat: improve dark mode and some copy
feat: allow user enter custom relay for relayfeeds
2024-11-06 07:45:00 +07:00 · 2024-11-05 19:33:47 +07:00 · 2024-11-05 15:04:39 +07:00
16 changed files with 297 additions and 268 deletions
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -444,8 +444,9 @@ dependencies = [

 [[package]]
 name = "async-wsocket"
-version = "0.9.0"
-source = "git+https://github.com/shadowylab/async-wsocket?rev=4d6a5b1780e65dc657ac36e5990a97c10feef072#4d6a5b1780e65dc657ac36e5990a97c10feef072"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a107e3bdbe61e8e1e1341c57241b4b2d50501127b44bd2eff13b4635ab42d35a"
 dependencies = [
 "async-utility",
 "futures",
@@ -3479,8 +3480,8 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"

 [[package]]
 name = "nostr"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "aes",
 "async-trait",
@@ -3510,8 +3511,8 @@ dependencies = [

 [[package]]
 name = "nostr-connect"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "async-trait",
 "async-utility",
@@ -3524,8 +3525,8 @@ dependencies = [

 [[package]]
 name = "nostr-database"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "async-trait",
 "flatbuffers",
@@ -3538,8 +3539,8 @@ dependencies = [

 [[package]]
 name = "nostr-lmdb"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "heed",
 "nostr",
@@ -3551,8 +3552,8 @@ dependencies = [

 [[package]]
 name = "nostr-relay-pool"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "async-utility",
 "async-wsocket",
@@ -3569,8 +3570,8 @@ dependencies = [

 [[package]]
 name = "nostr-sdk"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "async-utility",
 "atomic-destructor",
@@ -3588,8 +3589,8 @@ dependencies = [

 [[package]]
 name = "nostr-zapper"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "async-trait",
 "nostr",
@@ -3732,8 +3733,8 @@ dependencies = [

 [[package]]
 name = "nwc"
-version = "0.35.0"
-source = "git+https://github.com/rust-nostr/nostr#4da48df74e494f8705e4887ce31a63adeba7b47b"
+version = "0.36.0"
+source = "git+https://github.com/rust-nostr/nostr#33fb0699baf3a98b22b67ee6a86317a22cac927c"
 dependencies = [
 "async-trait",
 "async-utility",
--- a/src-tauri/src/commands/metadata.rs
+++ b/src-tauri/src/commands/metadata.rs
@@ -381,6 +381,35 @@ pub async fn get_all_local_interests(
    Ok(alt_events)
 }

+#[tauri::command]
+#[specta::specta]
+pub async fn get_relay_list(id: String, state: State<'_, Nostr>) -> Result<String, String> {
+    let client = &state.client;
+    let public_key = PublicKey::parse(&id).map_err(|e| e.to_string())?;
+
+    let filter = Filter::new()
+        .author(public_key)
+        .kind(Kind::RelayList)
+        .limit(1);
+
+    let mut events = Events::new(&[filter.clone()]);
+
+    let mut rx = client
+        .stream_events(vec![filter], Some(Duration::from_secs(3)))
+        .await
+        .map_err(|e| e.to_string())?;
+
+    while let Some(event) = rx.next().await {
+        events.insert(event);
+    }
+
+    if let Some(event) = events.first() {
+        Ok(event.as_json())
+    } else {
+        Err("Relay list not found".into())
+    }
+}
+
 #[tauri::command]
 #[specta::specta]
 pub async fn get_all_profiles(state: State<'_, Nostr>) -> Result<Vec<Mention>, String> {
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -67,11 +67,11 @@ impl Default for Settings {

 pub const DEFAULT_DIFFICULTY: u8 = 0;
 pub const FETCH_LIMIT: usize = 50;
-pub const QUEUE_DELAY: u64 = 300;
+pub const QUEUE_DELAY: u64 = 150;
 pub const NOTIFICATION_SUB_ID: &str = "lume_notification";

 fn main() {
-    // tracing_subscriber::fmt::init();
+    tracing_subscriber::fmt::init();

    let builder = Builder::<tauri::Wry>::new().commands(collect_commands![
        get_relays,
@@ -105,6 +105,7 @@ fn main() {
        get_interest,
        get_all_interests,
        get_all_local_interests,
+        get_relay_list,
        set_wallet,
        load_wallet,
        remove_wallet,
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
 	"productName": "Lume",
-	"version": "24.11.3",
+	"version": "24.11.4",
 	"identifier": "nu.lume.Lume",
 	"build": {
 		"beforeDevCommand": "pnpm dev",
@@ -46,10 +46,7 @@
 		"targets": "all",
 		"active": true,
 		"category": "SocialNetworking",
-		"resources": [
-			"resources/*",
-			"locales/*"
-		],
+		"resources": ["resources/*", "locales/*"],
 		"icon": [
 			"icons/32x32.png",
 			"icons/128x128.png",
--- a/src/commands.gen.ts
+++ b/src/commands.gen.ts
@@ -248,6 +248,14 @@ async getAllLocalInterests(until: string | null) : Promise<Result<RichEvent[], s
    else return { status: "error", error: e  as any };
 }
 },
+async getRelayList(id: string) : Promise<Result<string, string>> {
+    try {
+    return { status: "ok", data: await TAURI_INVOKE("get_relay_list", { id }) };
+} catch (e) {
+    if(e instanceof Error) throw e;
+    else return { status: "error", error: e  as any };
+}
+},
 async setWallet(uri: string) : Promise<Result<boolean, string>> {
    try {
    return { status: "ok", data: await TAURI_INVOKE("set_wallet", { uri }) };
--- a/src/commons.ts
+++ b/src/commons.ts
@@ -21,6 +21,15 @@ export function cn(...inputs: ClassValue[]) {
 	return twMerge(clsx(inputs));
 }

+export function isValidRelayUrl(string: string) {
+	try {
+		const newUrl = new URL(string);
+		return newUrl.protocol === "ws:" || newUrl.protocol === "wss:";
+	} catch (err) {
+		return false;
+	}
+}
+
 export const isImagePath = (path: string) => {
 	const exts = ["jpg", "jpeg", "gif", "png", "webp", "avif", "tiff"];

--- a/src/components/note/buttons/quote.tsx
+++ b/src/components/note/buttons/quote.tsx
@@ -16,7 +16,7 @@ export function NoteQuote({
 				<Tooltip.Trigger asChild>
 					<button
 						type="button"
-						onClick={() => LumeWindow.openEditor(null, event.id)}
+						onClick={() => LumeWindow.openEditor(undefined, event.id)}
 						className={cn(
 							"inline-flex items-center justify-center text-neutral-800 dark:text-neutral-200",
 							label
--- a/src/routes.gen.ts
+++ b/src/routes.gen.ts
@@ -13,7 +13,6 @@ import { createFileRoute } from '@tanstack/react-router'
 // Import Routes

 import { Route as rootRoute } from './routes/__root'
-import { Route as BootstrapRelaysImport } from './routes/bootstrap-relays'
 import { Route as AppImport } from './routes/_app'
 import { Route as NewPostIndexImport } from './routes/new-post/index'
 import { Route as AppIndexImport } from './routes/_app/index'
@@ -91,14 +90,6 @@ const NewLazyRoute = NewLazyImport.update({
  getParentRoute: () => rootRoute,
 } as any).lazy(() => import('./routes/new.lazy').then((d) => d.Route))

-const BootstrapRelaysRoute = BootstrapRelaysImport.update({
-  id: '/bootstrap-relays',
-  path: '/bootstrap-relays',
-  getParentRoute: () => rootRoute,
-} as any).lazy(() =>
-  import('./routes/bootstrap-relays.lazy').then((d) => d.Route),
-)
-
 const AppRoute = AppImport.update({
  id: '/_app',
  getParentRoute: () => rootRoute,
@@ -389,13 +380,6 @@ declare module '@tanstack/react-router' {
      preLoaderRoute: typeof AppImport
      parentRoute: typeof rootRoute
    }
-    '/bootstrap-relays': {
-      id: '/bootstrap-relays'
-      path: '/bootstrap-relays'
-      fullPath: '/bootstrap-relays'
-      preLoaderRoute: typeof BootstrapRelaysImport
-      parentRoute: typeof rootRoute
-    }
    '/new': {
      id: '/new'
      path: '/new'
@@ -758,7 +742,6 @@ const SettingsIdLazyRouteWithChildren = SettingsIdLazyRoute._addFileChildren(

 export interface FileRoutesByFullPath {
  '': typeof AppRouteWithChildren
-  '/bootstrap-relays': typeof BootstrapRelaysRoute
  '/new': typeof NewLazyRoute
  '/$id/set-group': typeof IdSetGroupRoute
  '/$id/set-interest': typeof IdSetInterestRoute
@@ -797,7 +780,6 @@ export interface FileRoutesByFullPath {
 }

 export interface FileRoutesByTo {
-  '/bootstrap-relays': typeof BootstrapRelaysRoute
  '/new': typeof NewLazyRoute
  '/$id/set-group': typeof IdSetGroupRoute
  '/$id/set-interest': typeof IdSetInterestRoute
@@ -838,7 +820,6 @@ export interface FileRoutesByTo {
 export interface FileRoutesById {
  __root__: typeof rootRoute
  '/_app': typeof AppRouteWithChildren
-  '/bootstrap-relays': typeof BootstrapRelaysRoute
  '/new': typeof NewLazyRoute
  '/$id/set-group': typeof IdSetGroupRoute
  '/$id/set-interest': typeof IdSetInterestRoute
@@ -881,7 +862,6 @@ export interface FileRouteTypes {
  fileRoutesByFullPath: FileRoutesByFullPath
  fullPaths:
    | ''
-    | '/bootstrap-relays'
    | '/new'
    | '/$id/set-group'
    | '/$id/set-interest'
@@ -919,7 +899,6 @@ export interface FileRouteTypes {
    | '/columns/users/$id'
  fileRoutesByTo: FileRoutesByTo
  to:
-    | '/bootstrap-relays'
    | '/new'
    | '/$id/set-group'
    | '/$id/set-interest'
@@ -958,7 +937,6 @@ export interface FileRouteTypes {
  id:
    | '__root__'
    | '/_app'
-    | '/bootstrap-relays'
    | '/new'
    | '/$id/set-group'
    | '/$id/set-interest'
@@ -1000,7 +978,6 @@ export interface FileRouteTypes {

 export interface RootRouteChildren {
  AppRoute: typeof AppRouteWithChildren
-  BootstrapRelaysRoute: typeof BootstrapRelaysRoute
  NewLazyRoute: typeof NewLazyRoute
  IdSetGroupRoute: typeof IdSetGroupRoute
  IdSetInterestRoute: typeof IdSetInterestRoute
@@ -1016,7 +993,6 @@ export interface RootRouteChildren {

 const rootRouteChildren: RootRouteChildren = {
  AppRoute: AppRouteWithChildren,
-  BootstrapRelaysRoute: BootstrapRelaysRoute,
  NewLazyRoute: NewLazyRoute,
  IdSetGroupRoute: IdSetGroupRoute,
  IdSetInterestRoute: IdSetInterestRoute,
@@ -1043,7 +1019,6 @@ export const routeTree = rootRoute
      "filePath": "__root.tsx",
      "children": [
        "/_app",
-        "/bootstrap-relays",
        "/new",
        "/$id/set-group",
        "/$id/set-interest",
@@ -1063,9 +1038,6 @@ export const routeTree = rootRoute
        "/_app/"
      ]
    },
-    "/bootstrap-relays": {
-      "filePath": "bootstrap-relays.tsx"
-    },
    "/new": {
      "filePath": "new.lazy.tsx"
    },
--- a/src/routes/bootstrap-relays.lazy.tsx
+++ b/src/routes/bootstrap-relays.lazy.tsx
@@ -1,159 +0,0 @@
-import { commands } from "@/commands.gen";
-import { GoBack } from "@/components";
-import { Frame } from "@/components/frame";
-import { Spinner } from "@/components/spinner";
-import { ArrowLeft, Plus, X } from "@phosphor-icons/react";
-import { createLazyFileRoute } from "@tanstack/react-router";
-import { message } from "@tauri-apps/plugin-dialog";
-import { relaunch } from "@tauri-apps/plugin-process";
-import { useEffect, useState, useTransition } from "react";
-
-export const Route = createLazyFileRoute("/bootstrap-relays")({
-	component: Screen,
-});
-
-function Screen() {
-	const bootstrapRelays = Route.useLoaderData();
-
-	const [relays, setRelays] = useState<string[]>([]);
-	const [newRelay, setNewRelay] = useState("");
-	const [isPending, startTransition] = useTransition();
-
-	const add = () => {
-		try {
-			let url = newRelay;
-
-			if (!url.startsWith("wss://")) {
-				url = `wss://${url}`;
-			}
-
-			// Validate URL
-			const relay = new URL(url);
-
-			// Update
-			setRelays((prev) => [...prev, relay.toString()]);
-			setNewRelay("");
-		} catch {
-			message("URL is not valid.", { kind: "error" });
-		}
-	};
-
-	const remove = (relay: string) => {
-		setRelays((prev) => prev.filter((item) => item !== relay));
-	};
-
-	const submit = () => {
-		startTransition(async () => {
-			if (!relays.length) {
-				await message("You need to add at least 1 relay", {
-					title: "Manage Relays",
-					kind: "info",
-				});
-				return;
-			}
-
-			const merged = relays.join("\r\n");
-			const res = await commands.setBootstrapRelays(merged);
-
-			if (res.status === "ok") {
-				return await relaunch();
-			} else {
-				await message(res.error, {
-					title: "Manage Relays",
-					kind: "error",
-				});
-				return;
-			}
-		});
-	};
-
-	useEffect(() => {
-		setRelays(bootstrapRelays);
-	}, [bootstrapRelays]);
-
-	return (
-		<div
-			data-tauri-drag-region
-			className="relative size-full flex items-center justify-center"
-		>
-			<div className="w-[320px] flex flex-col gap-8">
-				<div className="flex flex-col gap-1 text-center">
-					<h1 className="leading-tight text-xl font-semibold">Manage Relays</h1>
-					<p className="text-sm text-neutral-700 dark:text-neutral-300">
-						The default relays that Lume will connected.
-					</p>
-				</div>
-				<div className="flex flex-col gap-3">
-					<Frame
-						className="flex flex-col gap-3 p-3 rounded-xl overflow-hidden"
-						shadow
-					>
-						<div className="flex gap-2">
-							<input
-								name="relay"
-								type="text"
-								placeholder="ex: relay.nostr.net, ..."
-								value={newRelay}
-								onChange={(e) => setNewRelay(e.target.value)}
-								onKeyDown={(e) => {
-									if (e.key === "Enter") add();
-								}}
-								className="flex-1 px-3 rounded-lg h-9 bg-transparent border border-neutral-200 dark:border-neutral-800 focus:border-blue-500 focus:outline-none placeholder:text-neutral-400 dark:placeholder:text-neutral-600"
-							/>
-							<button
-								type="submit"
-								onClick={() => add()}
-								className="inline-flex items-center justify-center size-9 rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
-							>
-								<Plus className="size-5" />
-							</button>
-						</div>
-						<div className="flex flex-col gap-2">
-							{relays.map((relay) => (
-								<div
-									key={relay}
-									className="flex items-center justify-between h-9 px-2 rounded-lg bg-neutral-100 dark:bg-neutral-900"
-								>
-									<div className="text-sm font-medium">{relay}</div>
-									<div className="flex items-center gap-2">
-										<button
-											type="button"
-											onClick={() => remove(relay)}
-											className="inline-flex items-center justify-center rounded-md size-7 text-neutral-700 dark:text-white/20 hover:bg-black/10 dark:hover:bg-white/10"
-										>
-											<X className="size-3" />
-										</button>
-									</div>
-								</div>
-							))}
-						</div>
-						<div className="text-xs text-neutral-600 dark:text-neutral-400">
-							<p>
-								Lume is heavily depend on Negentropy for syncing data. You need
-								to use at least 1 relay that support Negentropy. If you not
-								sure, you can keep using the default relay list.
-							</p>
-						</div>
-					</Frame>
-					<div className="flex flex-col items-center gap-1">
-						<button
-							type="button"
-							onClick={() => submit()}
-							disabled={isPending || !relays.length}
-							className="inline-flex items-center justify-center w-full h-9 text-sm font-semibold text-white bg-blue-500 rounded-lg shrink-0 hover:bg-blue-600 disabled:opacity-50"
-						>
-							{isPending ? <Spinner /> : "Save & Restart"}
-						</button>
-						<span className="mt-2 w-full text-sm text-neutral-600 dark:text-neutral-400 inline-flex items-center justify-center">
-							Lume will relaunch after saving.
-						</span>
-					</div>
-				</div>
-			</div>
-			<GoBack className="fixed top-11 left-2 flex items-center gap-1.5 text-sm font-medium">
-				<ArrowLeft className="size-5" />
-				Back
-			</GoBack>
-		</div>
-	);
-}
--- a/src/routes/bootstrap-relays.tsx
+++ b/src/routes/bootstrap-relays.tsx
@@ -1,14 +0,0 @@
-import { commands } from "@/commands.gen";
-import { createFileRoute } from "@tanstack/react-router";
-
-export const Route = createFileRoute("/bootstrap-relays")({
-	loader: async () => {
-		const res = await commands.getBootstrapRelays();
-
-		if (res.status === "ok") {
-			return res.data.map((item) => item.replace(",", ""));
-		} else {
-			throw new Error(res.error);
-		}
-	},
-});
--- a/src/routes/columns/_layout/discover-interests.lazy.tsx
+++ b/src/routes/columns/_layout/discover-interests.lazy.tsx
@@ -143,12 +143,14 @@ function Screen() {
 							</p>
 						</div>
 					) : isError ? (
-						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
-							<p className="text-sm text-center">{error?.message ?? "Error"}</p>
+						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+							<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
+								{error?.message ?? "Error"}
+							</p>
 						</div>
 					) : !data?.length ? (
-						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
-							<p className="text-sm text-center">
+						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+							<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
 								Nothing to show yet, you can use Lume more and comeback lack to
 								see new events.
 							</p>
@@ -156,6 +158,13 @@ function Screen() {
 					) : (
 						data?.map((item) => renderItem(item))
 					)}
+					<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+						<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
+							Lume running sync in the background,
+							<br />
+							the more you use the more event you see.
+						</p>
+					</div>
 					{hasNextPage ? (
 						<button
 							type="button"
--- a/src/routes/columns/_layout/discover-newsfeeds.lazy.tsx
+++ b/src/routes/columns/_layout/discover-newsfeeds.lazy.tsx
@@ -137,12 +137,14 @@ function Screen() {
 							</p>
 						</div>
 					) : isError ? (
-						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
-							<p className="text-sm text-center">{error?.message ?? "Error"}</p>
+						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+							<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
+								{error?.message ?? "Error"}
+							</p>
 						</div>
 					) : !data?.length ? (
-						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
-							<p className="text-sm text-center">
+						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+							<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
 								Nothing to show yet, you can use Lume more and comeback lack to
 								see new events.
 							</p>
@@ -150,6 +152,13 @@ function Screen() {
 					) : (
 						data?.map((item) => renderItem(item))
 					)}
+					<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+						<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
+							Lume running sync in the background,
+							<br />
+							the more you use the more event you see.
+						</p>
+					</div>
 					{hasNextPage ? (
 						<button
 							type="button"
--- a/src/routes/columns/_layout/discover-relays.lazy.tsx
+++ b/src/routes/columns/_layout/discover-relays.lazy.tsx
@@ -115,12 +115,14 @@ function Screen() {
 							</p>
 						</div>
 					) : isError ? (
-						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
-							<p className="text-sm text-center">{error?.message ?? "Error"}</p>
+						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+							<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
+								{error?.message ?? "Error"}
+							</p>
 						</div>
 					) : !data?.length ? (
-						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
-							<p className="text-sm text-center">
+						<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+							<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
 								Nothing to show yet, you can use Lume more and comeback lack to
 								see new events.
 							</p>
@@ -128,6 +130,13 @@ function Screen() {
 					) : (
 						data?.map((item) => renderItem(item))
 					)}
+					<div className="mb-3 flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/20">
+						<p className="text-xs text-center px-4 text-neutral-500 dark:text-neutral-400">
+							Lume running sync in the background,
+							<br />
+							the more you use the more event you see.
+						</p>
+					</div>
 					{hasNextPage ? (
 						<button
 							type="button"
--- a/src/routes/columns/_layout/events.$id.lazy.tsx
+++ b/src/routes/columns/_layout/events.$id.lazy.tsx
@@ -175,7 +175,6 @@ function ReplyList() {

 			return events.filter((ev) => !removeQueues.has(ev.id));
 		},
-		refetchOnWindowFocus: false,
 	});

 	useEffect(() => {
--- a/src/routes/columns/_layout/launchpad.$id.lazy.tsx
+++ b/src/routes/columns/_layout/launchpad.$id.lazy.tsx
@@ -1,5 +1,5 @@
 import { commands } from "@/commands.gen";
-import { cn, toLumeEvents } from "@/commons";
+import { cn, isValidRelayUrl, toLumeEvents } from "@/commons";
 import { Spinner, User } from "@/components";
 import { LumeWindow } from "@/system";
 import type { LumeColumn, NostrEvent } from "@/types";
@@ -8,9 +8,10 @@ import * as ScrollArea from "@radix-ui/react-scroll-area";
 import { useQuery } from "@tanstack/react-query";
 import { createLazyFileRoute } from "@tanstack/react-router";
 import { resolveResource } from "@tauri-apps/api/path";
+import { message } from "@tauri-apps/plugin-dialog";
 import { readTextFile } from "@tauri-apps/plugin-fs";
 import { nanoid } from "nanoid";
-import { useCallback } from "react";
+import { useCallback, useState, useTransition } from "react";

 export const Route = createLazyFileRoute("/columns/_layout/launchpad/$id")({
 	component: Screen,
@@ -25,6 +26,7 @@ function Screen() {
 		>
 			<ScrollArea.Viewport className="relative h-full px-3 pb-3">
 				<Newsfeeds />
+				<Relayfeeds />
 				<Interests />
 				<Core />
 			</ScrollArea.Viewport>
@@ -178,14 +180,14 @@ function Newsfeeds() {
 					type="button"
 					onClick={() =>
 						LumeWindow.openColumn({
-							name: "Newsfeeds",
+							name: "Browse Newsfeeds",
 							url: "/columns/discover-newsfeeds",
 							label: "discover_newsfeeds",
 						})
 					}
 					className="h-9 w-full px-3 flex items-center justify-between bg-neutral-200/50 hover:bg-neutral-200 rounded-lg dark:bg-neutral-800/50 dark:hover:bg-neutral-800"
 				>
-					<span className="text-xs font-medium">Discover newsfeeds</span>
+					<span className="text-xs font-medium">Browse newsfeeds</span>
 					<ArrowRight className="size-4" weight="bold" />
 				</button>
 			</div>
@@ -193,6 +195,179 @@ function Newsfeeds() {
 	);
 }

+function Relayfeeds() {
+	const { id } = Route.useParams();
+	const { isLoading, isError, error, data, refetch, isRefetching } = useQuery({
+		queryKey: ["relays", id],
+		queryFn: async () => {
+			const res = await commands.getRelayList(id);
+
+			if (res.status === "ok") {
+				const event: NostrEvent = JSON.parse(res.data);
+				return event;
+			} else {
+				throw new Error(res.error);
+			}
+		},
+		refetchOnWindowFocus: false,
+	});
+
+	return (
+		<div className="mb-12 flex flex-col gap-3">
+			<div className="flex items-center justify-between px-2">
+				<h3 className="font-semibold">Relayfeeds</h3>
+				<div className="inline-flex items-center justify-center gap-2">
+					<button
+						type="button"
+						onClick={() => refetch()}
+						className={cn(
+							"size-7 inline-flex items-center justify-center rounded-full",
+							isRefetching ? "animate-spin" : "",
+						)}
+					>
+						<ArrowClockwise className="size-4" />
+					</button>
+					<button
+						type="button"
+						onClick={() => LumeWindow.openPopup(`${id}/set-group`, "New group")}
+						className="h-7 w-max px-2 inline-flex items-center justify-center gap-1 text-sm font-medium rounded-full bg-neutral-300 dark:bg-neutral-700 hover:bg-blue-500 hover:text-white"
+					>
+						<Plus className="size-3" weight="bold" />
+						New
+					</button>
+				</div>
+			</div>
+			<div className="flex flex-col gap-3">
+				{isLoading ? (
+					<div className="inline-flex items-center gap-1.5">
+						<Spinner className="size-4" />
+						Loading...
+					</div>
+				) : isError ? (
+					<div className="flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
+						<p className="text-center">{error?.message ?? "Error"}</p>
+					</div>
+				) : !data ? (
+					<div className="flex flex-col items-center justify-center h-16 w-full rounded-xl overflow-hidden bg-neutral-200/50 dark:bg-neutral-800/50">
+						<p className="text-center">You don't have any relay list yet.</p>
+					</div>
+				) : (
+					<div className="flex flex-col rounded-xl overflow-hidden bg-white dark:bg-neutral-800/50 shadow-lg shadow-primary dark:ring-1 dark:ring-neutral-800">
+						<div className="flex flex-col gap-2 p-2">
+							{data?.tags.map((tag) =>
+								tag[1]?.startsWith("wss://") ? (
+									<div
+										key={tag[1]}
+										className="group px-3 flex items-center justify-between h-11 rounded-lg bg-neutral-100 dark:bg-neutral-800"
+									>
+										<div className="flex-1 truncate select-text text-sm font-medium">
+											{tag[1]}
+										</div>
+										<button
+											type="button"
+											onClick={() =>
+												LumeWindow.openColumn({
+													name: tag[1],
+													label: `relays_${tag[1].replace(/[^\w\s]/gi, "")}`,
+													url: `/columns/relays/${encodeURIComponent(tag[1])}`,
+												})
+											}
+											className="h-6 w-16 hidden group-hover:inline-flex items-center justify-center gap-1 text-xs font-semibold rounded-full bg-neutral-200 dark:bg-neutral-700 hover:bg-blue-500 hover:text-white"
+										>
+											Add
+										</button>
+									</div>
+								) : null,
+							)}
+						</div>
+						<div className="p-2 flex items-center">
+							<User.Provider pubkey={data?.pubkey}>
+								<User.Root className="inline-flex items-center gap-2">
+									<User.Avatar className="size-7 rounded-full" />
+									<User.Name className="text-xs font-medium" />
+								</User.Root>
+							</User.Provider>
+						</div>
+					</div>
+				)}
+				<div className="flex flex-col rounded-xl overflow-hidden bg-white dark:bg-neutral-800/50 shadow-lg shadow-primary dark:ring-1 dark:ring-neutral-800">
+					<RelayForm />
+				</div>
+				<button
+					type="button"
+					onClick={() =>
+						LumeWindow.openColumn({
+							name: "Browse Relays",
+							url: "/columns/discover-relays",
+							label: "discover_relays",
+						})
+					}
+					className="h-9 w-full px-3 flex items-center justify-between bg-neutral-200/50 hover:bg-neutral-200 rounded-lg dark:bg-neutral-800/50 dark:hover:bg-neutral-800"
+				>
+					<span className="text-xs font-medium">Browse relays</span>
+					<ArrowRight className="size-4" weight="bold" />
+				</button>
+			</div>
+		</div>
+	);
+}
+
+function RelayForm() {
+	const [url, setUrl] = useState("");
+	const [isPending, startTransition] = useTransition();
+
+	const submit = () => {
+		startTransition(async () => {
+			if (!isValidRelayUrl(url)) {
+				await message("Relay URL is not valid", { kind: "error" });
+				return;
+			}
+
+			await LumeWindow.openColumn({
+				name: url,
+				label: `relays_${url.replace(/[^\w\s]/gi, "")}`,
+				url: `/columns/relays/${encodeURIComponent(url)}`,
+			});
+
+			setUrl("");
+		});
+	};
+
+	return (
+		<div className="flex flex-col gap-2 p-2">
+			<label
+				htmlFor="url"
+				className="text-xs font-semibold text-neutral-700 dark:text-neutral-300"
+			>
+				Add custom relay
+			</label>
+			<div className="flex gap-2">
+				<input
+					name="url"
+					type="url"
+					onChange={(e) => setUrl(e.currentTarget.value)}
+					onKeyDown={(event) => {
+						if (event.key === "Enter") submit();
+					}}
+					value={url}
+					disabled={isPending}
+					placeholder="wss://..."
+					spellCheck={false}
+					className="flex-1 px-3 bg-neutral-100 border-transparent rounded-lg h-9 dark:bg-neutral-900 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:placeholder:text-neutral-400"
+				/>
+				<button
+					type="button"
+					disabled={isPending}
+					onClick={() => submit()}
+					className="shrink-0 h-9 w-16 inline-flex items-center justify-center gap-1 text-xs font-semibold rounded-lg bg-neutral-200 dark:bg-neutral-700 hover:bg-blue-500 hover:text-white"
+				>
+					Add
+				</button>
+			</div>
+		</div>
+	);
+}
+
 function Interests() {
 	const { id } = Route.useParams();
 	const { isLoading, isError, error, data, refetch, isRefetching } = useQuery({
@@ -332,14 +507,14 @@ function Interests() {
 					type="button"
 					onClick={() =>
 						LumeWindow.openColumn({
-							name: "Interests",
+							name: "Browse Interests",
 							url: "/columns/discover-interests",
 							label: "discover_interests",
 						})
 					}
 					className="h-9 w-full px-3 flex items-center justify-between bg-neutral-200/50 hover:bg-neutral-200 rounded-lg dark:bg-neutral-800/50 dark:hover:bg-neutral-800"
 				>
-					<span className="text-xs font-medium">Discover interests</span>
+					<span className="text-xs font-medium">Browse interests</span>
 					<ArrowRight className="size-4" weight="bold" />
 				</button>
 			</div>
@@ -391,22 +566,6 @@ function Core() {
 							Add
 						</button>
 					</div>
-					<div className="px-3 flex items-center justify-between h-11 rounded-lg bg-neutral-100 dark:bg-neutral-800">
-						<div className="text-sm font-medium">Relays</div>
-						<button
-							type="button"
-							onClick={() =>
-								LumeWindow.openColumn({
-									name: "Relays",
-									label: "relays",
-									url: "/columns/discover-relays",
-								})
-							}
-							className="h-6 w-16 inline-flex items-center justify-center gap-1 text-xs font-semibold rounded-full bg-neutral-200 dark:bg-neutral-700 hover:bg-blue-500 hover:text-white"
-						>
-							Add
-						</button>
-					</div>
 					{data?.map((column) => (
 						<div
 							key={column.label}
--- a/src/routes/new.lazy.tsx
+++ b/src/routes/new.lazy.tsx
@@ -27,32 +27,32 @@ function Screen() {
 				<div className="flex flex-col gap-4">
 					<a
 						href="/new-account/connect"
-						className="w-full p-4 rounded-xl hover:shadow-lg hover:ring-0 hover:bg-white dark:hover:bg-neutral-800 ring-1 ring-black/5 dark:ring-white/5"
+						className="w-full p-4 rounded-xl hover:shadow-lg hover:ring-0 hover:bg-white dark:hover:bg-neutral-600 ring-1 ring-black/5 dark:ring-white/5"
 					>
 						<h3 className="mb-1 font-medium">Continue with Nostr Connect</h3>
-						<p className="text-xs text-neutral-500 dark:text-neutral-500">
+						<p className="text-xs text-neutral-500 dark:text-neutral-400">
 							Your account will be handled by a remote signer. Lume will not
 							store your account keys.
 						</p>
 					</a>
 					<a
 						href="/new-account/import"
-						className="w-full p-4 rounded-xl hover:shadow-lg hover:ring-0 hover:bg-white dark:hover:bg-neutral-800 ring-1 ring-black/5 dark:ring-white/5"
+						className="w-full p-4 rounded-xl hover:shadow-lg hover:ring-0 hover:bg-white dark:hover:bg-neutral-600 ring-1 ring-black/5 dark:ring-white/5"
 					>
 						<h3 className="mb-1 font-medium">Continue with Secret Key</h3>
-						<p className="text-xs text-neutral-500 dark:text-neutral-500">
+						<p className="text-xs text-neutral-500 dark:text-neutral-400">
 							Lume will store your keys in secure storage. You can provide a
 							password to add extra security.
 						</p>
 					</a>
 					<a
 						href="/new-account/watch"
-						className="w-full p-4 rounded-xl hover:shadow-lg hover:ring-0 hover:bg-white dark:hover:bg-neutral-800 ring-1 ring-black/5 dark:ring-white/5"
+						className="w-full p-4 rounded-xl hover:shadow-lg hover:ring-0 hover:bg-white dark:hover:bg-neutral-600 ring-1 ring-black/5 dark:ring-white/5"
 					>
 						<h3 className="mb-1 font-medium">
 							Continue with Public Key (Watch Mode)
 						</h3>
-						<p className="text-xs text-neutral-500 dark:text-neutral-500">
+						<p className="text-xs text-neutral-500 dark:text-neutral-400">
 							Use for experience without provide your private key, you can add
 							it later to publish new note.
 						</p>
Author	SHA1	Message	Date
reya	4e279f127d	chore: release	2024-11-06 07:45:00 +07:00
reya	5655a8136d	feat: improve dark mode and some copy	2024-11-05 19:33:47 +07:00
reya	d80534c51f	feat: allow user enter custom relay for relayfeeds	2024-11-05 15:04:39 +07:00