-
Account
+
+
+
Account
+
+ {status === "loading" ? (
+
Loading...
+ ) : (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+
);
}
diff --git a/src/app/settings/components/autoStart.tsx b/src/app/settings/components/autoStart.tsx
new file mode 100644
index 00000000..0dff7c88
--- /dev/null
+++ b/src/app/settings/components/autoStart.tsx
@@ -0,0 +1,61 @@
+import { Switch } from "@headlessui/react";
+import { getSetting, updateSetting } from "@libs/storage";
+import { useEffect, useState } from "react";
+import { twMerge } from "tailwind-merge";
+import { disable, enable, isEnabled } from "tauri-plugin-autostart-api";
+
+export function AutoStartSetting() {
+ const [enabled, setEnabled] = useState(false);
+
+ const toggle = async () => {
+ if (!enabled) {
+ await enable();
+ await updateSetting("auto_start", 1);
+ console.log(`registered for autostart? ${await isEnabled()}`);
+ } else {
+ await disable();
+ await updateSetting("auto_start", 0);
+ }
+ setEnabled(!enabled);
+ };
+
+ useEffect(() => {
+ async function getAppSetting() {
+ const setting = await getSetting("auto_start");
+ if (parseInt(setting) === 0) {
+ setEnabled(false);
+ } else {
+ setEnabled(true);
+ }
+ }
+ getAppSetting();
+ }, []);
+
+ return (
+
+
+
+ Auto start
+
+
+ Auto start at login
+
+
+
+
+
+
+ );
+}
diff --git a/src/app/settings/components/cacheTime.tsx b/src/app/settings/components/cacheTime.tsx
new file mode 100644
index 00000000..2cacac5d
--- /dev/null
+++ b/src/app/settings/components/cacheTime.tsx
@@ -0,0 +1,43 @@
+import { getSetting, updateSetting } from "@libs/storage";
+import { CheckCircleIcon } from "@shared/icons";
+import { useState } from "react";
+
+const setting = await getSetting("cache_time");
+const cacheTime = setting;
+
+export function CacheTimeSetting() {
+ const [time, setTime] = useState(cacheTime);
+
+ const update = async () => {
+ await updateSetting("cache_time", time);
+ };
+
+ return (
+
+
+
+ Cache time
+
+
+ The length of time before inactive data gets removed from the cache
+
+
+
+ setTime(e.currentTarget.value)}
+ autoCapitalize="none"
+ autoCorrect="none"
+ className="w-24 h-8 rounded-md px-2 bg-zinc-800 text-zinc-300 text-right font-medium focus:outline-none"
+ />
+
+
+
+ );
+}
diff --git a/src/app/settings/components/version.tsx b/src/app/settings/components/version.tsx
new file mode 100644
index 00000000..dfe9905e
--- /dev/null
+++ b/src/app/settings/components/version.tsx
@@ -0,0 +1,26 @@
+import { RefreshIcon } from "@shared/icons";
+import { getVersion } from "@tauri-apps/api/app";
+
+const appVersion = await getVersion();
+
+export function VersionSetting() {
+ return (
+
+
+ Version
+
+ You're using latest version
+
+
+
+ {appVersion}
+
+
+
+ );
+}
diff --git a/src/app/settings/general.tsx b/src/app/settings/general.tsx
index df9e5701..45939715 100644
--- a/src/app/settings/general.tsx
+++ b/src/app/settings/general.tsx
@@ -1,7 +1,20 @@
+import { AutoStartSetting } from "@app/settings/components/autoStart";
+import { CacheTimeSetting } from "@app/settings/components/cacheTime";
+import { VersionSetting } from "@app/settings/components/version";
+
export function GeneralSettingsScreen() {
return (
-
-
General
+
);
}
diff --git a/src/app/settings/shortcuts.tsx b/src/app/settings/shortcuts.tsx
index 610fce3b..b05ff9b3 100644
--- a/src/app/settings/shortcuts.tsx
+++ b/src/app/settings/shortcuts.tsx
@@ -1,7 +1,110 @@
+import { CommandIcon } from "@shared/icons";
+
export function ShortcutsSettingsScreen() {
return (
-
-
Shortcuts
+
+
+
Shortcuts
+
+
+
+
+
+ Open composer
+
+
+
+
+
+
+
+ Add image block
+
+
+
+
+
+
+
+ Add newsfeed block
+
+
+
+
+
+
+
+ Open personal page
+
+
+
+
+
+
+
+ Open notification
+
+
+
+
+
+
+
);
}
diff --git a/src/app/settings/update.tsx b/src/app/settings/update.tsx
deleted file mode 100644
index 362a35a1..00000000
--- a/src/app/settings/update.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export function UpdateSettingsScreen() {
- return (
-
-
Update
-
- );
-}
diff --git a/src/libs/ndk.tsx b/src/libs/ndk.tsx
index f8862ce1..5eed4ac6 100644
--- a/src/libs/ndk.tsx
+++ b/src/libs/ndk.tsx
@@ -39,7 +39,7 @@ export async function prefetchEvents(
});
relaySetSubscription.on("eose", () => {
- setTimeout(() => resolve(new Set(events.values())), 1200);
+ setTimeout(() => resolve(new Set(events.values())), 3000);
});
});
}
diff --git a/src/libs/storage.tsx b/src/libs/storage.tsx
index 1f02bcd2..32c754dd 100644
--- a/src/libs/storage.tsx
+++ b/src/libs/storage.tsx
@@ -325,13 +325,34 @@ export async function createChat(
return sender_pubkey;
}
+// get setting
+export async function getSetting(key: string) {
+ const db = await connect();
+ const result = await db.select(
+ `SELECT value FROM settings WHERE key = "${key}";`,
+ );
+ return result[0]?.value;
+}
+
+// update setting
+export async function updateSetting(key: string, value: string | number) {
+ const db = await connect();
+ return await db.execute(
+ `UPDATE settings SET value = "${value}" WHERE key = "${key}";`,
+ );
+}
+
// get last login
export async function getLastLogin() {
const db = await connect();
const result = await db.select(
`SELECT value FROM settings WHERE key = "last_login";`,
);
- return result[0]?.value;
+ if (result[0]) {
+ return parseInt(result[0].value);
+ } else {
+ return 0;
+ }
}
// update last login
diff --git a/src/main.tsx b/src/main.tsx
index 1ec94619..e979c738 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,12 +1,15 @@
import App from "./app";
+import { getSetting } from "@libs/storage";
import { RelayProvider } from "@shared/relayProvider";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { createRoot } from "react-dom/client";
+const cacheTime = await getSetting("cache_time");
+
const queryClient = new QueryClient({
defaultOptions: {
queries: {
- cacheTime: 1000 * 60 * 60 * 24,
+ cacheTime: parseInt(cacheTime),
},
},
});
diff --git a/src/shared/notes/preview/video.tsx b/src/shared/notes/preview/video.tsx
index a7b2dd1f..5b6ef340 100644
--- a/src/shared/notes/preview/video.tsx
+++ b/src/shared/notes/preview/video.tsx
@@ -8,7 +8,8 @@ export function VideoPreview({ urls }: { urls: string[] }) {
key={url}
url={url}
width="100%"
- className="w-full h-auto border border-zinc-800/50 rounded-lg"
+ height="auto"
+ className="!h-auto object-fill rounded-lg overflow-hidden"
controls={true}
pip={true}
/>
diff --git a/src/shared/relayProvider.tsx b/src/shared/relayProvider.tsx
index b137fa64..bba6832a 100644
--- a/src/shared/relayProvider.tsx
+++ b/src/shared/relayProvider.tsx
@@ -1,11 +1,13 @@
import { initNDK } from "@libs/ndk";
+import { getSetting } from "@libs/storage";
import NDK from "@nostr-dev-kit/ndk";
-import { FULL_RELAYS } from "@stores/constants";
import { createContext } from "react";
export const RelayContext = createContext
(null);
-const ndk = await initNDK(FULL_RELAYS);
+const relays = await getSetting("relays");
+const relaysArray = JSON.parse(relays);
+const ndk = await initNDK(relaysArray);
export function RelayProvider({ children }: { children: React.ReactNode }) {
return {children};
diff --git a/src/shared/settingsLayout.tsx b/src/shared/settingsLayout.tsx
index f5a79bcf..74e91199 100644
--- a/src/shared/settingsLayout.tsx
+++ b/src/shared/settingsLayout.tsx
@@ -49,17 +49,6 @@ export function SettingsLayout() {
>
Account
-
- twMerge(
- "flex h-9 items-center gap-2.5 rounded-md px-2.5 text-zinc-200",
- isActive ? "bg-zinc-900/50" : "",
- )
- }
- >
- Update
-