Merge pull request #120 from luminous-devs/fix/logout

Fix logout function and other issues
bump version
2023-11-23 08:54:24 +07:00 · 2023-11-23 08:52:47 +07:00 · 2023-11-23 08:52:04 +07:00 · 2023-11-23 08:49:05 +07:00 · 2023-11-22 17:27:09 +07:00 · 2023-11-22 16:18:02 +07:00
12 changed files with 739 additions and 678 deletions
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "lume",
  "description": "the communication app",
  "private": true,
-  "version": "2.1.1",
+  "version": "2.1.3",
  "scripts": {
    "dev": "vite",
    "build": "vite build",
@@ -63,7 +63,7 @@
    "html-to-text": "^9.0.5",
    "idb-keyval": "^6.2.1",
    "light-bolt11-decoder": "^3.0.0",
-    "lru-cache": "^10.0.3",
+    "lru-cache": "^10.1.0",
    "markdown-to-jsx": "^7.3.2",
    "media-chrome": "^1.5.3",
    "minidenticons": "^4.2.0",
@@ -77,27 +77,27 @@
    "react-dom": "^18.2.0",
    "react-hook-form": "^7.48.2",
    "react-hotkeys-hook": "^4.4.1",
-    "react-router-dom": "^6.19.0",
+    "react-router-dom": "^6.20.0",
    "react-string-replace": "^1.1.1",
    "reactflow": "^11.10.1",
-    "sonner": "^1.2.0",
+    "sonner": "^1.2.2",
    "tailwind-scrollbar": "^3.0.5",
    "tauri-controls": "github:reyamir/tauri-controls",
    "tippy.js": "^6.3.7",
    "tiptap-markdown": "^0.8.4",
-    "virtua": "^0.16.4",
+    "virtua": "^0.16.6",
    "zustand": "^4.4.6"
  },
  "devDependencies": {
    "@tailwindcss/typography": "^0.5.10",
    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
    "@types/html-to-text": "^9.0.4",
-    "@types/node": "^20.9.2",
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
-    "@types/youtube-player": "^5.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@types/node": "^20.9.4",
+    "@types/react": "^18.2.38",
+    "@types/react-dom": "^18.2.17",
+    "@types/youtube-player": "^5.5.11",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
    "@vitejs/plugin-react-swc": "^3.5.0",
    "autoprefixer": "^10.4.16",
    "clsx": "^2.0.0",
@@ -117,7 +117,7 @@
    "prop-types": "^15.8.1",
    "tailwind-merge": "^1.14.0",
    "tailwindcss": "^3.3.5",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.2",
    "vite": "^4.5.0",
    "vite-tsconfig-paths": "^4.2.1"
  }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -154,9 +154,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"

 [[package]]
 name = "arboard"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc"
+checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08"
 dependencies = [
 "clipboard-win",
 "core-graphics 0.22.3",
@@ -637,9 +637,9 @@ dependencies = [

 [[package]]
 name = "cargo_toml"
-version = "0.16.3"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3"
+checksum = "4d1ece59890e746567b467253aea0adbe8a21784d0b025d8a306f66c391c2957"
 dependencies = [
 "serde",
 "toml 0.8.8",
@@ -1776,9 +1776,9 @@ dependencies = [

 [[package]]
 name = "gethostname"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
+checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
 dependencies = [
 "libc",
 "winapi",
@@ -2660,7 +2660,7 @@ dependencies = [

 [[package]]
 name = "lume"
-version = "2.1.1"
+version = "2.1.3"
 dependencies = [
 "keyring",
 "serde",
@@ -2678,7 +2678,6 @@ dependencies = [
 "tauri-plugin-os",
 "tauri-plugin-process",
 "tauri-plugin-shell",
- "tauri-plugin-single-instance",
 "tauri-plugin-sql",
 "tauri-plugin-store",
 "tauri-plugin-theme",
@@ -2841,9 +2840,9 @@ dependencies = [

 [[package]]
 name = "muda"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9767ce3b12d2928f17ff4f91b29e7e872a8594033d82bf00e56017cc23bb8410"
+checksum = "b564d551449738387fb4541aef5fbfceaa81b2b732f2534c1c7c89dc7d673eaa"
 dependencies = [
 "cocoa 0.25.0",
 "crossbeam-channel",
@@ -2852,8 +2851,9 @@ dependencies = [
 "objc",
 "once_cell",
 "png",
+ "serde",
 "thiserror",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -2931,18 +2931,6 @@ dependencies = [
 "memoffset 0.6.5",
 ]

-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.4"
@@ -3984,9 +3972,9 @@ dependencies = [

 [[package]]
 name = "rsa"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d"
+checksum = "6a3211b01eea83d80687da9eef70e39d65144a3894866a5153a2723e425a157f"
 dependencies = [
 "const-oid",
 "digest",
@@ -4189,18 +4177,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4935,9 +4923,9 @@ checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"

 [[package]]
 name = "tauri"
-version = "2.0.0-alpha.17"
+version = "2.0.0-alpha.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "892f45e7f10c9481488633f506496eeb3c69034c17fc71d5562d1e87b5442f78"
+checksum = "6dc6ec8c246fa16092a3e650de2f10f3af3362915b7caab1aeed364a60829fcc"
 dependencies = [
 "anyhow",
 "bytes",
@@ -4983,9 +4971,9 @@ dependencies = [

 [[package]]
 name = "tauri-build"
-version = "2.0.0-alpha.11"
+version = "2.0.0-alpha.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5f06f1cbb5507f4de803f8e1fab01c71cb9515297a90d3adba4fa6c06a194c"
+checksum = "f0997a36aa2a1431500ef6ef92e7076521ae3258a8f73914b49ba876361ba2fe"
 dependencies = [
 "anyhow",
 "cargo_toml",
@@ -5004,9 +4992,9 @@ dependencies = [

 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-alpha.10"
+version = "2.0.0-alpha.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28094b389b0981aba46eeba7dcda6216c23fdf7288b2e0414e69fbc55aa55676"
+checksum = "71c36db748f557c1f89f075e37ab22ad77e8798fb9432367cf4013ea364811de"
 dependencies = [
 "base64",
 "brotli",
@@ -5030,14 +5018,14 @@ dependencies = [

 [[package]]
 name = "tauri-macros"
-version = "2.0.0-alpha.10"
+version = "2.0.0-alpha.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1df582259285a81324d4d38846433bfd3c0440c7a268f730acb7c29350f25cf"
+checksum = "83c895e684477cfb07aeeb0fdb11076bee98219806b68d1f3ddf99d893038a93"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 1.0.109",
+ "syn 2.0.39",
 "tauri-codegen",
 "tauri-utils",
 ]
@@ -5045,7 +5033,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-autostart"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "auto-launch",
 "log",
@@ -5058,7 +5046,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-cli"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "clap",
 "log",
@@ -5071,7 +5059,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-clipboard-manager"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "arboard",
 "log",
@@ -5085,7 +5073,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-dialog"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "glib 0.16.9",
 "log",
@@ -5102,7 +5090,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "anyhow",
 "glob",
@@ -5115,7 +5103,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-http"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "data-url",
 "glob",
@@ -5132,7 +5120,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-notification"
 version = "2.0.0-alpha.5"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "log",
 "notify-rust",
@@ -5150,7 +5138,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-os"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "gethostname 0.4.3",
 "log",
@@ -5166,7 +5154,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-process"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "tauri",
 ]
@@ -5174,7 +5162,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-shell"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "encoding_rs",
 "log",
@@ -5188,24 +5176,10 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "tauri-plugin-single-instance"
-version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
-dependencies = [
- "log",
- "serde",
- "serde_json",
- "tauri",
- "thiserror",
- "windows-sys 0.48.0",
- "zbus",
-]
-
 [[package]]
 name = "tauri-plugin-sql"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "futures-core",
 "log",
@@ -5221,7 +5195,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-store"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "log",
 "serde",
@@ -5232,11 +5206,12 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-theme"
-version = "0.2.0"
-source = "git+https://github.com/reyamir/tauri-plugin-theme?branch=tauri-v2#1b8bab206915329f40e0382eb752bcbdbc2e43f0"
+version = "0.3.0"
+source = "git+https://github.com/wyhaya/tauri-plugin-theme#cccc9b3fbc308a475ef8720f3535ae657ce1924b"
 dependencies = [
 "cocoa 0.25.0",
- "futures-lite 1.13.0",
+ "dirs-next",
+ "futures-lite 2.0.1",
 "gtk",
 "once_cell",
 "serde",
@@ -5248,7 +5223,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-updater"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "base64",
 "dirs-next",
@@ -5274,7 +5249,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-upload"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "futures-util",
 "log",
@@ -5291,7 +5266,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-window-state"
 version = "2.0.0-alpha.4"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#5a8bbe296704f679063ef8b820d582d7f728400b"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#445c1e6cb6971ef644a08d1224fc689923be301b"
 dependencies = [
 "bincode",
 "bitflags 2.4.1",
@@ -5304,9 +5279,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime"
-version = "1.0.0-alpha.4"
+version = "1.0.0-alpha.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46889d91efc090ac4031c7c423c30c5280d6984cb071b729b748d643aa3df40"
+checksum = "16cc441e5bcb3332a0af069b7580083104aacf09b66e27938b47517790d7b384"
 dependencies = [
 "gtk",
 "http",
@@ -5322,9 +5297,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime-wry"
-version = "1.0.0-alpha.5"
+version = "1.0.0-alpha.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b083797e147019c318db883a51868014751b578ba0d1ef3aadd34199a3bbcf61"
+checksum = "7c9229a7caf9c63eeaf4389789e1c983757135f4ece3355d0ae647c492682f61"
 dependencies = [
 "cocoa 0.24.1",
 "gtk",
@@ -5342,9 +5317,9 @@ dependencies = [

 [[package]]
 name = "tauri-utils"
-version = "2.0.0-alpha.10"
+version = "2.0.0-alpha.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68e138783ca404416a4afe34f22f804d533c28fb73f87870f365c6ecdcee6c23"
+checksum = "ce0dbf67341adad8d48255d605b45b25bf1c7445116355e61ed6219d204e94e0"
 dependencies = [
 "brotli",
 "ctor",
@@ -5367,7 +5342,7 @@ dependencies = [
 "thiserror",
 "url",
 "walkdir",
- "windows 0.51.1",
+ "windows-version",
 ]

 [[package]]
@@ -5718,9 +5693,9 @@ dependencies = [

 [[package]]
 name = "tray-icon"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7dce8a4b6d7a566ca78fa43f37efc7a3ec427480828d35fe3474c4f0c75396"
+checksum = "5375d350db4ccd3c783a4c683be535e70df5c62b07a824e7bcd6d43ef6d74181"
 dependencies = [
 "cocoa 0.25.0",
 "core-graphics 0.23.1",
@@ -5731,8 +5706,9 @@ dependencies = [
 "objc",
 "once_cell",
 "png",
+ "serde",
 "thiserror",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5831,9 +5807,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58fe91d841bc04822c9801002db4ea904b9e4b8e6bbad25127b46eff8dc516b"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
 "getrandom 0.2.11",
 ]
@@ -6522,12 +6498,12 @@ dependencies = [

 [[package]]
 name = "x11rb"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
+checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
 dependencies = [
- "gethostname 0.2.3",
- "nix 0.24.3",
+ "gethostname 0.3.0",
+ "nix 0.26.4",
 "winapi",
 "winapi-wsapoll",
 "x11rb-protocol",
@@ -6535,11 +6511,11 @@ dependencies = [

 [[package]]
 name = "x11rb-protocol"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
+checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
 dependencies = [
- "nix 0.24.3",
+ "nix 0.26.4",
 ]

 [[package]]
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lume"
-version = "2.1.1"
+version = "2.1.3"
 description = "the communication app"
 authors = ["Ren Amamiya"]
 license = "GPL-3.0"
@@ -28,12 +28,11 @@ tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", bra
 tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 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-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-theme = { git = "https://github.com/reyamir/tauri-plugin-theme", branch = "tauri-v2" }
+tauri-plugin-theme = { git = "https://github.com/wyhaya/tauri-plugin-theme" }
 tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
  "sqlite",
 ] }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
  },
  "package": {
    "productName": "Lume",
-    "version": "2.1.1"
+    "version": "2.1.3"
  },
  "plugins": {
    "fs": {
--- a/src/app/auth/create.tsx
+++ b/src/app/auth/create.tsx
@@ -45,8 +45,6 @@ export function CreateAccountScreen() {

  const onSubmit = async (data: { name: string; about: string }) => {
    try {
-      if (!ndk.signer) return navigate('/new/privkey');
-
      setLoading(true);

      const profile = {
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -57,7 +57,7 @@ export function ErrorScreen() {
            Sorry, an unexpected error has occurred.
          </h1>
          <h3 className="text-3xl font-semibold leading-snug text-white">
-            Don&apos;t be panic, your account is safe.
+            Don&apos;t panic, your account is safe.
            <br />
            Here are what things you can do:
          </h3>
@@ -65,7 +65,7 @@ export function ErrorScreen() {
        <div className="flex w-full flex-col gap-3">
          <div className="flex items-center justify-between rounded-xl bg-blue-700 px-3 py-4">
            <div className="text-xl font-semibold text-white">
-              1. Try close and re-open app
+              1. Try to close and re-open the app
            </div>
            <button
              type="button"
@@ -112,12 +112,12 @@ export function ErrorScreen() {
          <div className="rounded-xl bg-blue-700 px-3 py-4">
            <div className="flex w-full flex-col gap-1.5">
              <div className="text-xl font-semibold text-white">
-                4. Use other Nostr client
+                4. Use another Nostr client
              </div>
              <div className="select-text text-lg font-medium text-blue-300">
                <p>
-                  While waiting Lume&apos;s Devs release the bug fixes, you always can use
-                  other Nostr client with your account:
+                  While waiting for Lume&apos;s Devs to release the bug fixes, you always can use
+                  other Nostr clients with your account:
                </p>
                <div className="mt-2 flex flex-col gap-1 text-white">
                  <a href="https://snort.social" className="hover:!underline">
--- a/src/app/settings/about.tsx
+++ b/src/app/settings/about.tsx
@@ -1,9 +1,24 @@
 import { getVersion } from '@tauri-apps/api/app';
+import { relaunch } from '@tauri-apps/plugin-process';
+import { Update, check } from '@tauri-apps/plugin-updater';
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
+import { toast } from 'sonner';

 export function AboutScreen() {
  const [version, setVersion] = useState('');
+  const [newUpdate, setNewUpdate] = useState<Update>(null);
+
+  const checkUpdate = async () => {
+    const update = await check();
+    if (!update) toast.info('There is no update available');
+    setNewUpdate(update);
+  };
+
+  const installUpdate = async () => {
+    await newUpdate.downloadAndInstall();
+    await relaunch();
+  };

  useEffect(() => {
    async function loadVersion() {
@@ -20,19 +35,38 @@ export function AboutScreen() {
        <img src="/icon.png" alt="Lume's logo" className="w-16 shrink-0" />
        <div>
          <h1 className="text-xl font-semibold">Lume</h1>
-          <p className="text-neutral-700 dark:text-neutral-300">Version {version}</p>
+          <p className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
+            Version {version}
+          </p>
        </div>
      </div>
      <div className="mx-auto mt-4 flex w-full max-w-xs flex-col gap-2">
+        {!newUpdate ? (
+          <button
+            type="button"
+            onClick={() => checkUpdate()}
+            className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-blue-500 text-sm font-medium text-white hover:bg-blue-600"
+          >
+            Check for update
+          </button>
+        ) : (
+          <button
+            type="button"
+            onClick={() => installUpdate()}
+            className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-blue-500 text-sm font-medium text-white hover:bg-blue-600"
+          >
+            Install {newUpdate.version}
+          </button>
+        )}
        <Link
          to="https://lume.nu"
-          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-100 text-sm font-medium hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
        >
          Website
        </Link>
        <Link
          to="https://github.com/luminous-devs/lume/issues"
-          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-100 text-sm font-medium hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
        >
          Report a issue
        </Link>
--- a/src/app/settings/general.tsx
+++ b/src/app/settings/general.tsx
@@ -13,6 +13,7 @@ import { DarkIcon, LightIcon, SystemModeIcon } from '@shared/icons';
 export function GeneralSettingScreen() {
  const { db } = useStorage();
  const [settings, setSettings] = useState({
+    autoupdate: false,
    autolaunch: false,
    outbox: false,
    media: true,
@@ -59,6 +60,13 @@ export function GeneralSettingScreen() {
    setSettings((prev) => ({ ...prev, hashtag: !settings.hashtag }));
  };

+  const toggleAutoupdate = async () => {
+    await db.createSetting('autoupdate', String(+!settings.autoupdate));
+    db.settings.autoupdate = !settings.autoupdate;
+    // update state
+    setSettings((prev) => ({ ...prev, autoupdate: !settings.autoupdate }));
+  };
+
  const toggleNofitication = async () => {
    if (settings.notification) return;

@@ -82,6 +90,12 @@ export function GeneralSettingScreen() {
      if (!data) return;

      data.forEach((item) => {
+        if (item.key === 'autoupdate')
+          setSettings((prev) => ({
+            ...prev,
+            autoupdate: !!parseInt(item.value),
+          }));
+
        if (item.key === 'outbox')
          setSettings((prev) => ({
            ...prev,
@@ -114,6 +128,19 @@ export function GeneralSettingScreen() {
  return (
    <div className="mx-auto w-full max-w-lg">
      <div className="flex flex-col gap-6">
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Updater</div>
+            <div className="text-sm">Auto download new update at Login</div>
+          </div>
+          <Switch.Root
+            checked={settings.autoupdate}
+            onClick={() => toggleAutoupdate()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
        <div className="flex w-full items-center justify-between">
          <div className="flex items-center gap-8">
            <div className="w-24 shrink-0 text-end text-sm font-semibold">Startup</div>
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -20,13 +20,18 @@ export class LumeStorage {
  public db: Database;
  public account: Account | null;
  public platform: Platform | null;
-  public settings: { outbox: boolean; media: boolean; hashtag: boolean };
+  public settings: {
+    autoupdate: boolean;
+    outbox: boolean;
+    media: boolean;
+    hashtag: boolean;
+  };

  constructor(sqlite: Database, platform: Platform) {
    this.db = sqlite;
    this.account = null;
    this.platform = platform;
-    this.settings = { outbox: false, media: true, hashtag: true };
+    this.settings = { autoupdate: false, outbox: false, media: true, hashtag: true };
  }

  public async secureSave(key: string, value: string) {
@@ -158,7 +163,7 @@ export class LumeStorage {

  public async checkAccount() {
    const result: Array<{ total: string }> = await this.db.select(
-      'SELECT COUNT(*) AS "total" FROM accounts;'
+      'SELECT COUNT(*) AS "total" FROM accounts WHERE is_active = "1" ORDER BY id DESC LIMIT 1;'
    );
    return parseInt(result[0].total);
  }
--- a/src/libs/storage/provider.tsx
+++ b/src/libs/storage/provider.tsx
@@ -20,7 +20,7 @@ const StorageContext = createContext<StorageContext>({
  db: undefined,
 });

-const StorageProvider = ({ children }: PropsWithChildren<object>) => {
+const StorageInstance = () => {
  const [db, setDB] = useState<LumeStorage>(undefined);
  const [isNewVersion, setIsNewVersion] = useState(false);

@@ -33,6 +33,8 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
      if (!lumeStorage.account) await lumeStorage.getActiveAccount();

      const settings = await lumeStorage.getAllSettings();
+      let autoUpdater = false;
+
      if (settings) {
        settings.forEach((item) => {
          if (item.key === 'outbox') lumeStorage.settings.outbox = !!parseInt(item.value);
@@ -41,16 +43,23 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {

          if (item.key === 'hashtag')
            lumeStorage.settings.hashtag = !!parseInt(item.value);
+
+          if (item.key === 'autoupdate') {
+            if (parseInt(item.value)) autoUpdater = true;
+          }
        });
      }

-      // check update
-      const update = await check();
-      if (update) {
-        setIsNewVersion(true);
+      if (autoUpdater) {
+        // check update
+        const update = await check();
+        // install new version
+        if (update) {
+          setIsNewVersion(true);

-        await update.downloadAndInstall();
-        await relaunch();
+          await update.downloadAndInstall();
+          await relaunch();
+        }
      }

      setDB(lumeStorage);
@@ -66,6 +75,12 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
    if (!db) initLumeStorage();
  }, []);

+  return { db, isNewVersion };
+};
+
+const StorageProvider = ({ children }: PropsWithChildren<object>) => {
+  const { db, isNewVersion } = StorageInstance();
+
  if (!db)
    return (
      <div
@@ -93,7 +108,7 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
        <div className="absolute bottom-5 right-5 inline-flex items-center gap-2.5">
          <LoaderIcon className="h-6 w-6 animate-spin text-blue-500" />
          <p className="font-semibold">
-            {isNewVersion ? 'Found a new version, updating' : 'Checking for updates...'}
+            {isNewVersion ? 'Found a new version, updating...' : 'Starting...'}
          </p>
        </div>
      </div>
--- a/src/shared/logout.tsx
+++ b/src/shared/logout.tsx
@@ -1,5 +1,6 @@
 import * as AlertDialog from '@radix-ui/react-alert-dialog';
 import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';

 import { useNDK } from '@libs/ndk/provider';
 import { useStorage } from '@libs/storage/provider';
@@ -11,15 +12,21 @@ export function Logout() {
  const navigate = useNavigate();

  const logout = async () => {
-    ndk.signer = null;
+    try {
+      ndk.signer = null;

-    // remove account
-    await db.accountLogout();
-    await db.secureRemove(db.account.pubkey);
-    await db.secureRemove(db.account.pubkey + '-bunker');
+      // remove private key
+      await db.secureRemove(db.account.pubkey);
+      await db.secureRemove(db.account.pubkey + '-bunker');

-    // redirect to welcome screen
-    navigate('/auth/welcome');
+      // logout
+      await db.accountLogout();
+
+      // redirect to welcome screen
+      navigate('/auth/welcome');
+    } catch (e) {
+      toast.error(e);
+    }
  };

  return (
@@ -33,7 +40,7 @@ export function Logout() {
        </button>
      </AlertDialog.Trigger>
      <AlertDialog.Portal>
-        <AlertDialog.Overlay className="fixed inset-0 z-50 bg-black/50 backdrop-blur-2xl dark:bg-white/50" />
+        <AlertDialog.Overlay className="fixed inset-0 z-50 bg-black/20 backdrop-blur-sm dark:bg-black/20" />
        <AlertDialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
          <div className="relative h-min w-full max-w-md rounded-xl bg-neutral-100 dark:bg-neutral-900">
            <div className="flex flex-col gap-1 border-b border-white/5 px-5 py-4">
@@ -54,13 +61,15 @@ export function Logout() {
                  Cancel
                </button>
              </AlertDialog.Cancel>
-              <button
-                type="button"
-                onClick={() => logout()}
-                className="inline-flex h-9 items-center justify-center rounded-lg bg-red-500 px-4 text-sm font-medium text-white outline-none hover:bg-red-600"
-              >
-                Logout
-              </button>
+              <AlertDialog.Action asChild>
+                <button
+                  type="button"
+                  onClick={() => logout()}
+                  className="inline-flex h-9 items-center justify-center rounded-lg bg-red-500 px-4 text-sm font-medium text-white outline-none hover:bg-red-600"
+                >
+                  Logout
+                </button>
+              </AlertDialog.Action>
            </div>
          </div>
        </AlertDialog.Content>
Author	SHA1	Message	Date
Ren Amamiya	2fdf437789	Merge pull request #120 from luminous-devs/fix/logout Fix logout function and other issues	2023-11-23 08:54:24 +07:00
reya	731c72535c	bump version	2023-11-23 08:52:47 +07:00
reya	628102087e	fix total account count function	2023-11-23 08:52:04 +07:00
reya	536ea30ed2	fix logout function	2023-11-23 08:49:05 +07:00
reya	8ee38cdb42	temp disable single-instance plugin	2023-11-22 17:27:09 +07:00
Ren Amamiya	a896300f23	Merge pull request #118 from luminous-devs/v2.1.2 v2.1.2	2023-11-22 16:18:02 +07:00
reya	d3cf1200ba	bump version	2023-11-22 16:13:06 +07:00
reya	b5ac3df090	fix package	2023-11-22 16:10:20 +07:00
reya	3b40dd6903	update dependencies	2023-11-22 15:27:19 +07:00
Ren Amamiya	efba6b20ea	Merge pull request #117 from luminous-devs/feat/optional-updater Make auto update is optional	2023-11-22 10:34:49 +07:00
Ren Amamiya	05fb56e5fc	Merge pull request #116 from vivganes/patch-1 Little grammar corrections	2023-11-22 10:32:47 +07:00
Vivek Ganesan	59d9646e9f	Little grammar corrections	2023-11-22 08:43:31 +05:30
reya	b73d84fccb	update storage provider	2023-11-22 09:05:10 +07:00
reya	1929ceb72d	add toast message	2023-11-22 08:31:58 +07:00
reya	a1d22c1daf	make auto update is optional	2023-11-22 08:30:43 +07:00