Merge pull request #118 from luminous-devs/v2.1.2

v2.1.2

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
         if: matrix.settings.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libssl-dev libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y build-essential libssl-dev javascriptcoregtk-4.1 libayatana-appindicator3-dev libsoup-3.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev webkit2gtk-4.1 librsvg2-dev patchelf
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
@@ -51,17 +51,18 @@ jobs:
       - uses: tauri-apps/tauri-action@dev
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
           ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
         with:
           tagName: v__VERSION__
-          releaseName: 'App v__VERSION__'
+          releaseName: 'v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: true
           prerelease: false

.gitignore

@@ -18,6 +18,8 @@ out
 *.db-journal
 bun.lockb
 
+.direnv
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json

README.md

@@ -10,7 +10,7 @@ Supported platform: macOS, Windows and Linux
 
 ### Prerequisites
 
-- Bun: https://bun.sh/docs/installation
+- PNPM or Bun (experiment)
 
 - Tauri: https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-macos
 
@@ -25,17 +25,26 @@ git clone https://github.com/luminous-devs/lume.git && cd lume
 Install packages
 
 ```
-bun install
+pnpm install
 ```
 
 Run dev build
 
 ```
-bun tauri dev
+pnpm tauri dev
 ```
 
 Generate production build
 
 ```
-bun tauri build
+pnpm tauri build
 ```
+
+#### Nix 
+
+Requirements:
+
+1. [Install Nix](https://zero-to-flakes.com/install)
+1. [Setup `direnv`](https://zero-to-flakes.com/direnv)
+
+`cd` into the root folder of the project to enter `nix develop` shell. Run `direnv allow` (only once). Then run `pnpm` or `bun` (experimental) commands as described above.

flake.lock

@@ -0,0 +1,130 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1697723726,
+        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1681358109,
+        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1697940838,
+        "narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "a3e829c06eadf848f13d109c7648570ce37ebccd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,71 @@
+# Nix.flake to build Lume based on Tauri's Guides: 
+# Prerequisites -> Installing -> Setting Up Linux -> NixOS
+# https://tauri.app/v1/guides/getting-started/prerequisites/#1-system-dependencies
+#
+# To build Rust backend of Tauri `rust-overlay` is used
+# https://github.com/oxalica/rust-overlay
+
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, rust-overlay }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        overlays = [ (import rust-overlay) ];
+        pkgs = import nixpkgs {
+          inherit system overlays;
+        };
+
+        libraries = with pkgs;[
+          webkitgtk
+          gtk3
+          cairo
+          gdk-pixbuf
+          glib
+          dbus
+          openssl_3
+          librsvg     
+        ];
+
+        packages = with pkgs; [
+          curl
+          wget
+          pkg-config
+          dbus
+          openssl_3
+          glib
+          gtk3
+          libsoup
+          webkitgtk
+          librsvg
+        ];
+
+        rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+          extensions = [ "rust-src" ]; # needed by rust-analyzer
+        };
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          buildInputs = [
+            rustToolchain
+            pkgs.nodejs
+            pkgs.nodePackages.pnpm
+            pkgs.bun # experimental in Lume
+          ] ++ packages;
+
+          shellHook =
+            ''
+              export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
+              export XDG_DATA_DIRS=${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS
+            '';
+
+          # Avoid white screen running with Nix
+          # https://github.com/tauri-apps/tauri/issues/4315#issuecomment-1207755694
+          WEBKIT_DISABLE_COMPOSITING_MODE = 1;
+        };
+      });
+}

index.html

@@ -1,11 +1,11 @@
-<html lang="en" class="dark">
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Lume</title>
   </head>
-  <body class="relative cursor-default select-none overflow-hidden font-sans antialiased h-screen w-screen text-white">
+  <body class="relative cursor-default select-none overflow-hidden font-sans antialiased h-screen w-screen text-neutral-950 dark:text-neutral-50">
     <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
+    <script type="module" src="/src/main.jsx"></script>
   </body>
 </html>

package.json

@@ -2,7 +2,7 @@
   "name": "lume",
   "description": "the communication app",
   "private": true,
-  "version": "1.2.6",
+  "version": "2.1.2",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -18,11 +18,10 @@
     "**/*.{ts, tsx, css, md, html, json}": "prettier --cache --write"
   },
   "dependencies": {
-    "@dnd-kit/core": "^6.0.8",
-    "@getalby/sdk": "^2.4.0",
-    "@nostr-dev-kit/ndk": "^1.3.1",
-    "@nostr-dev-kit/ndk-cache-dexie": "^1.3.0",
-    "@nostr-fetch/adapter-ndk": "^0.12.2",
+    "@evilmartians/harmony": "^1.1.0",
+    "@getalby/sdk": "^2.6.0",
+    "@nostr-dev-kit/ndk": "^2.0.5",
+    "@nostr-fetch/adapter-ndk": "^0.13.1",
     "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
@@ -30,76 +29,96 @@
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-hover-card": "^1.0.7",
     "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-switch": "^1.0.3",
+    "@radix-ui/react-toolbar": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@tanstack/react-query": "^4.35.3",
-    "@tauri-apps/api": "^1.5.0",
-    "@tiptap/extension-image": "^2.1.11",
-    "@tiptap/extension-mention": "^2.1.11",
-    "@tiptap/extension-placeholder": "^2.1.11",
-    "@tiptap/pm": "^2.1.11",
-    "@tiptap/react": "^2.1.11",
-    "@tiptap/starter-kit": "^2.1.11",
-    "@tiptap/suggestion": "^2.1.11",
-    "@vidstack/react": "^1.0.5",
+    "@tanstack/react-query": "^5.8.4",
+    "@tauri-apps/api": "2.0.0-alpha.11",
+    "@tauri-apps/cli": "2.0.0-alpha.17",
+    "@tauri-apps/plugin-autostart": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-dialog": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-fs": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-http": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-notification": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-os": "2.0.0-alpha.4",
+    "@tauri-apps/plugin-process": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-shell": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-sql": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-updater": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-upload": "2.0.0-alpha.3",
+    "@tiptap/extension-character-count": "^2.1.12",
+    "@tiptap/extension-document": "^2.1.12",
+    "@tiptap/extension-image": "^2.1.12",
+    "@tiptap/extension-mention": "^2.1.12",
+    "@tiptap/extension-paragraph": "^2.1.12",
+    "@tiptap/extension-placeholder": "^2.1.12",
+    "@tiptap/extension-text": "^2.1.12",
+    "@tiptap/pm": "^2.1.12",
+    "@tiptap/react": "^2.1.12",
+    "@tiptap/starter-kit": "^2.1.12",
+    "@tiptap/suggestion": "^2.1.12",
     "dayjs": "^1.11.10",
-    "destr": "^2.0.1",
+    "framer-motion": "^10.16.5",
     "html-to-text": "^9.0.5",
+    "idb-keyval": "^6.2.1",
     "light-bolt11-decoder": "^3.0.0",
-    "lru-cache": "^10.0.1",
+    "lru-cache": "^10.0.3",
+    "markdown-to-jsx": "^7.3.2",
+    "media-chrome": "^1.5.3",
     "minidenticons": "^4.2.0",
-    "nostr-fetch": "^0.13.0",
-    "nostr-tools": "^1.16.0",
+    "nanoid": "^5.0.3",
+    "nostr-fetch": "^0.13.1",
+    "nostr-tools": "^1.17.0",
     "qrcode.react": "^3.1.0",
     "re-resizable": "^6.9.11",
     "react": "^18.2.0",
-    "react-currency-input-field": "^3.6.11",
+    "react-currency-input-field": "^3.6.12",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.46.2",
-    "react-markdown": "^8.0.7",
-    "react-router-dom": "^6.16.0",
-    "react-textarea-autosize": "^8.5.3",
-    "reactflow": "^11.9.2",
-    "remark-gfm": "^3.0.1",
-    "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql#v1",
-    "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
-    "tauri-plugin-stronghold-api": "github:tauri-apps/tauri-plugin-stronghold#v1",
-    "tauri-plugin-upload-api": "github:tauri-apps/tauri-plugin-upload#v1",
+    "react-hook-form": "^7.48.2",
+    "react-hotkeys-hook": "^4.4.1",
+    "react-router-dom": "^6.19.0",
+    "react-string-replace": "^1.1.1",
+    "reactflow": "^11.10.1",
+    "sonner": "^1.2.2",
+    "tailwind-scrollbar": "^3.0.5",
+    "tauri-controls": "github:reyamir/tauri-controls",
     "tippy.js": "^6.3.7",
-    "virtua": "^0.9.1",
-    "zustand": "^4.4.1"
+    "tiptap-markdown": "^0.8.4",
+    "virtua": "^0.16.5",
+    "zustand": "^4.4.6"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
-    "@tauri-apps/cli": "^1.5.0",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
-    "@types/html-to-text": "^9.0.2",
-    "@types/node": "^20.8.0",
-    "@types/react": "^18.2.23",
-    "@types/react-dom": "^18.2.8",
-    "@types/youtube-player": "^5.5.8",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
-    "@vitejs/plugin-react-swc": "^3.4.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/html-to-text": "^9.0.4",
+    "@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",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.2",
     "encoding": "^0.1.13",
-    "eslint": "^8.50.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.1.0",
     "postcss": "^8.4.31",
-    "prettier": "^3.0.3",
-    "prettier-plugin-tailwindcss": "^0.5.4",
+    "prettier": "^3.1.0",
+    "prettier-plugin-tailwindcss": "^0.5.7",
     "prop-types": "^15.8.1",
     "tailwind-merge": "^1.14.0",
-    "tailwindcss": "^3.3.3",
-    "typescript": "^5.2.2",
-    "vite": "^4.4.9",
+    "tailwindcss": "^3.3.5",
+    "typescript": "^5.3.2",
+    "vite": "^4.5.0",
     "vite-tsconfig-paths": "^4.2.1"
   }
 }

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lume"
-version = "1.2.6"
+version = "2.1.2"
 description = "the communication app"
 authors = ["Ren Amamiya"]
 license = "GPL-3.0"
@@ -8,56 +8,40 @@ repository = "https://github.com/luminous-devs/lume"
 edition = "2021"
 rust-version = "1.66"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [build-dependencies]
-tauri-build = { version = "1.4.1", features = [] }
+tauri-build = { version = "2.0.0-alpha", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5", features = [
+tauri = { version = "2.0.0-alpha", features = [
   "macos-private-api",
-  "window-close",
-  "window-print",
-  "window-create",
-  "fs-read-dir",
-  "fs-read-file",
-  "window-start-dragging",
-  "path-all",
-  "http-all",
-  "clipboard-write-text",
-  "os-all",
-  "notification-all",
-  "clipboard-read-text",
-  "window-set-resizable",
-  "window-set-size",
-  "shell-open",
-  "fs-write-file",
-  "app-all",
-  "fs-remove-file",
-  "window-center",
-  "dialog-all",
-  "http-multipart",
+  "native-tls-vendored",
 ] }
-tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v1", features = [
+tauri-plugin-cli = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+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/wyhaya/tauri-plugin-theme" }
+tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
   "sqlite",
 ] }
-tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" }
 sqlx-cli = { version = "0.7.0", default-features = false, features = [
   "sqlite",
 ] }
-rust-argon2 = "1.0"
 webpage = { version = "1.6.0", features = ["serde"] }
-
-[target.'cfg(any(target_os = "macos"))'.dependencies]
-cocoa = "0.25.0"
-objc = "0.2.7"
+keyring = "2"
 
 [features]
 # by default Tauri runs in production mode

src-tauri/migrations/20230418013219_initial_data.sql

@@ -1,45 +1,29 @@
--- Add migration script here
 -- create accounts table
--- is_active (multi-account feature), value:
--- 0: false
--- 1: true
 CREATE TABLE
   accounts (
-    id INTEGER NOT NULL PRIMARY KEY,
-    npub TEXT NOT NULL UNIQUE,
+    id TEXT NOT NULL PRIMARY KEY,
     pubkey TEXT NOT NULL UNIQUE,
-    privkey TEXT NOT NULL,
-    follows JSON,
+    follows TEXT,
+    circles TEXT,
     is_active INTEGER NOT NULL DEFAULT 0,
+    last_login_at NUMBER NOT NULL DEFAULT 0,
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
   );
 
 -- create notes table
 CREATE TABLE
-  notes (
-    id INTEGER NOT NULL PRIMARY KEY,
-    event_id TEXT NOT NULL UNIQUE,
+  events (
+    id TEXT NOT NULL PRIMARY KEY,
     account_id INTEGER NOT NULL,
-    pubkey TEXT NOT NULL,
-    kind INTEGER NOT NULL DEFAULT 1,
-    tags JSON,
-    content TEXT NOT NULL,
+    event TEXT NOT NULL,
+    author TEXT NOT NULL,
+    kind NUMBER NOT NULL DEFAULt 1,
+    root_id TEXT,
+    reply_id TEXT,
     created_at INTEGER NOT NULL,
-    parent_id TEXT,
     FOREIGN KEY (account_id) REFERENCES accounts (id)
   );
 
--- create channels table
-CREATE TABLE
-  channels (
-    id INTEGER NOT NULL PRIMARY KEY,
-    event_id TEXT NOT NULL UNIQUE,
-    name TEXT,
-    about TEXT,
-    picture TEXT,
-    created_at INTEGER NOT NULL
-  );
-
 -- create settings table
 CREATE TABLE
   settings (
@@ -49,11 +33,23 @@ CREATE TABLE
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
   );
 
--- create metadata table
 CREATE TABLE
-  metadata (
-    id TEXT NOT NULL PRIMARY KEY,
-    pubkey TEXT NOT NULL,
+  widgets (
+    id INTEGER NOT NULL PRIMARY KEY,
+    account_id INTEGER NOT NULL,
+    kind INTEGER NOT NULL,
+    title TEXT NOT NULL,
     content TEXT NOT NULL,
-    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (account_id) REFERENCES accounts (id)
+  );
+
+CREATE TABLE
+  relays (
+    id INTEGER NOT NULL PRIMARY KEY,
+    account_id INTEGER NOT NULL,
+    relay TEXT NOT NULL UNIQUE,
+    purpose TEXT NOT NULL DEFAULT '',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (account_id) REFERENCES accounts (id)
   );

src-tauri/migrations/20230418080146_create_chats.sql

@@ -1,12 +0,0 @@
--- Add migration script here
--- create chats table
-CREATE TABLE
-  chats (
-    id INTEGER NOT NULL PRIMARY KEY,
-    event_id TEXT NOT NULL UNIQUE,
-    receiver_pubkey INTEGER NOT NULL,
-    sender_pubkey TEXT NOT NULL,
-    content TEXT NOT NULL,
-    tags JSON,
-    created_at INTEGER NOT NULL
-  );

src-tauri/migrations/20230420040005_insert_last_login_to_settings.sql

@@ -1,14 +0,0 @@
--- Add migration script here
-INSERT INTO
-  settings (key, value)
-VALUES
-  ("last_login", "0"),
-  (
-    "relays",
-    '["wss://relayable.org","wss://relay.damus.io","wss://relay.nostr.band/all","wss://relay.nostrgraph.net","wss://nostr.mutinywallet.com"]'
-  ),
-  ("auto_start", "0"),
-  ("cache_time", "86400000"),
-  ("compose_shortcut", "meta+n"),
-  ("add_imageblock_shortcut", "meta+i"),
-  ("add_feedblock_shortcut", "meta+f")

src-tauri/migrations/20230425023912_add_pubkey_to_channel.sql

@@ -1,3 +0,0 @@
--- Add migration script here
--- add pubkey to channel
-ALTER TABLE channels ADD pubkey TEXT NOT NULL DEFAULT '';

src-tauri/migrations/20230425024708_add_default_channels.sql

@@ -1,38 +0,0 @@
--- Add migration script here
-INSERT
-OR IGNORE INTO channels (
-  event_id,
-  pubkey,
-  name,
-  about,
-  picture,
-  created_at
-)
-VALUES
-  (
-    "e3cadf5beca1b2af1cddaa41a633679bedf263e3de1eb229c6686c50d85df753",
-    "126103bfddc8df256b6e0abfd7f3797c80dcc4ea88f7c2f87dd4104220b4d65f",
-    "lume-general",
-    "General channel for Lume",
-    "https://void.cat/d/UNyxBmAh1MUx5gQTX95jyf.webp",
-    1681898574
-  );
-
-INSERT
-OR IGNORE INTO channels (
-  event_id,
-  pubkey,
-  name,
-  about,
-  picture,
-  created_at
-)
-VALUES
-  (
-    "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb",
-    "ed1d0e1f743a7d19aa2dfb0162df73bacdbc699f67cc55bb91a98c35f7deac69",
-    "Nostr",
-    "",
-    "https://cloudflare-ipfs.com/ipfs/QmTN4Eas9atUULVbEAbUU8cowhtvK7g3t7jfKztY7wc8eP?.png",
-    1661333723
-  );

src-tauri/migrations/20230425050745_add_blacklist_model.sql

@@ -1,11 +0,0 @@
--- Add migration script here
--- create blacklist table
-CREATE TABLE
-  blacklist (
-    id INTEGER NOT NULL PRIMARY KEY,
-    account_id INTEGER NOT NULL,
-    content TEXT NOT NULL UNIQUE,
-    status INTEGER NOT NULL DEFAULT 0,
-    kind INTEGER NOT NULL,
-    FOREIGN KEY (account_id) REFERENCES accounts (id)
-  );

src-tauri/migrations/20230521092300_add_block_model.sql

@@ -1,11 +0,0 @@
--- Add migration script here
-CREATE TABLE
-  blocks (
-    id INTEGER NOT NULL PRIMARY KEY,
-    account_id INTEGER NOT NULL,
-    kind INTEGER NOT NULL,
-    title TEXT NOT NULL,
-    content TEXT NOT NULL,
-    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (account_id) REFERENCES accounts (id)
-  );

src-tauri/migrations/20230617003135_add_channel_messages.sql

@@ -1,15 +0,0 @@
--- Add migration script here
-CREATE TABLE
-  channel_messages (
-    id INTEGER NOT NULL PRIMARY KEY,
-    channel_id TEXT NOT NULL,
-    event_id TEXT NOT NULL UNIQUE,
-    pubkey TEXT NOT NULL,
-    kind INTEGER NOT NULL,
-    content TEXT NOT NULL,
-    tags JSON,
-    mute BOOLEAN DEFAULT 0,
-    hide BOOLEAN DEFAULT 0,
-    created_at INTEGER NOT NULL,
-    FOREIGN KEY (channel_id) REFERENCES channels (event_id)
-  );

src-tauri/migrations/20230619082415_add_replies.sql

@@ -1,13 +0,0 @@
--- Add migration script here
-CREATE TABLE
-  replies (
-    id INTEGER NOT NULL PRIMARY KEY,
-    parent_id TEXT NOT NULL,
-    event_id TEXT NOT NULL UNIQUE,
-    pubkey TEXT NOT NULL,
-    kind INTEGER NOT NULL DEFAULT 1,
-    tags JSON,
-    content TEXT NOT NULL,
-    created_at INTEGER NOT NULL,
-    FOREIGN KEY (parent_id) REFERENCES notes (event_id)
-  );

src-tauri/migrations/20230718072634_clean_up_old_tables.sql

@@ -1,6 +0,0 @@
--- Add migration script here
-DROP TABLE IF EXISTS blacklist;
-
-DROP TABLE IF EXISTS channel_messages;
-
-DROP TABLE IF EXISTS channels;

src-tauri/migrations/20230725010250_update_default_relays.sql

@@ -1,6 +0,0 @@
--- Add migration script here
-UPDATE settings
-SET
-  value = '["wss://relayable.org","wss://relay.damus.io","wss://relay.nostr.band/all","wss://nostr.mutinywallet.com"]'
-WHERE
-  key = 'relays';

src-tauri/migrations/20230804083544_add_network_to_account.sql

@@ -1,2 +0,0 @@
--- Add migration script here
-ALTER TABLE accounts ADD network JSON;

src-tauri/migrations/20230808085847_add_relays_table.sql

@@ -1,10 +0,0 @@
--- Add migration script here
-CREATE TABLE
-  relays (
-    id INTEGER NOT NULL PRIMARY KEY,
-    account_id INTEGER NOT NULL,
-    relay TEXT NOT NULL,
-    purpose TEXT NOT NULL DEFAULT '',
-    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (account_id) REFERENCES accounts (id)
-  );

src-tauri/migrations/20230811074423_rename_blocks_to_widgets.sql

@@ -1,3 +0,0 @@
--- Add migration script here
-ALTER TABLE blocks
-RENAME TO widgets;

src-tauri/migrations/20230814083543_add_events_table.sql

@@ -1,13 +0,0 @@
--- Add migration script here
-CREATE TABLE
-  events (
-    id TEXT NOT NULL PRIMARY KEY,
-    account_id INTEGER NOT NULL,
-    event TEXT NOT NULL,
-    author TEXT NOT NULL,
-    kind NUMBER NOT NULL DEFAULt 1,
-    root_id TEXT,
-    reply_id TEXT,
-    created_at INTEGER NOT NULL,
-    FOREIGN KEY (account_id) REFERENCES accounts (id)
-  );

src-tauri/migrations/20230816090508_clean_up_tables.sql

@@ -1,8 +0,0 @@
--- Add migration script here
-DROP TABLE IF EXISTS notes;
-
-DROP TABLE IF EXISTS chats;
-
-DROP TABLE IF EXISTS metadata;
-
-DROP TABLE IF EXISTS replies;

src-tauri/migrations/20230817014932_add_last_login_time_to_account.sql

@@ -1,3 +0,0 @@
--- Add migration script here
-ALTER TABLE accounts
-ADD COLUMN last_login_at NUMBER NOT NULL DEFAULT 0;

src-tauri/migrations/20230918235335_add_uniq_to_relay.sql

@@ -1,2 +0,0 @@
--- Add migration script here
-CREATE UNIQUE INDEX unique_relay ON relays (relay);

src-tauri/migrations/20231028083224_add_ndk_cache_table.sql

@@ -0,0 +1,27 @@
+-- Add migration script here
+CREATE TABLE
+  ndk_users (
+    pubkey TEXT NOT NULL PRIMARY KEY,
+    profile TEXT,
+    createdAt NUMBER
+  );
+
+CREATE TABLE
+  ndk_events (
+    id TEXT NOT NULL PRIMARY KEY,
+    pubkey TEXT,
+    content TEXT,
+    kind NUMBER,
+    createdAt NUMBER,
+    relay TEXT,
+    event TEXT
+  );
+
+CREATE TABLE
+  ndk_eventtags (
+    id TEXT NOT NULL PRIMARY KEY,
+    eventId TEXT,
+    tag TEXT,
+    value TEXT,
+    tagValue TEXT
+  );

src-tauri/src/main.rs

@@ -3,25 +3,13 @@
   windows_subsystem = "windows"
 )]
 
-#[cfg(target_os = "macos")]
-#[macro_use]
-extern crate objc;
-
+use keyring::Entry;
 use std::time::Duration;
-use tauri::{Manager, WindowEvent};
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
+use tauri_plugin_theme::ThemePlugin;
 use webpage::{Webpage, WebpageOptions};
 
-#[cfg(target_os = "macos")]
-use window_vibrancy::{apply_vibrancy, NSVisualEffectMaterial};
-
-#[cfg(target_os = "macos")]
-use traffic_light::TrafficLight;
-
-#[cfg(target_os = "macos")]
-mod traffic_light;
-
 #[derive(Clone, serde::Serialize)]
 struct Payload {
   args: Vec<String>,
@@ -94,40 +82,44 @@ async fn opengraph(url: String) -> OpenGraphResponse {
 }
 
 #[tauri::command]
-async fn close_splashscreen(window: tauri::Window) {
-  // Close splashscreen
-  if let Some(splashscreen) = window.get_window("splashscreen") {
-    splashscreen.close().unwrap();
+fn secure_save(key: String, value: String) -> Result<(), ()> {
+  let entry = Entry::new("lume", &key).expect("Failed to create entry");
+  let _ = entry.set_password(&value);
+  Ok(())
+}
+
+#[tauri::command]
+fn secure_load(key: String) -> Result<String, String> {
+  let entry = Entry::new("lume", &key).expect("Failed to create entry");
+  if let Ok(password) = entry.get_password() {
+    Ok(password)
+  } else {
+    Err("not found".to_string())
   }
-  // Show main window
-  window.get_window("main").unwrap().show().unwrap();
+}
+
+#[tauri::command]
+fn secure_remove(key: String) -> Result<(), ()> {
+  let entry = Entry::new("lume", &key).expect("Failed to create entry");
+  let _ = entry.delete_password();
+  Ok(())
 }
 
 fn main() {
+  let mut ctx = tauri::generate_context!();
   tauri::Builder::default()
     .setup(|app| {
-      let window = app.get_window("main").unwrap();
-
-      #[cfg(target_os = "macos")]
-      apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None)
-        .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS");
-
-      #[cfg(target_os = "macos")]
-      window.position_traffic_lights(16.0, 25.0);
-
+      #[cfg(desktop)]
+      app
+        .handle()
+        .plugin(tauri_plugin_updater::Builder::new().build())?;
       Ok(())
     })
-    .on_window_event(|e| {
-      #[cfg(target_os = "macos")]
-      if let WindowEvent::Resized(..) = e.event() {
-        let window = e.window();
-        window.position_traffic_lights(16.0, 25.0);
-      }
-    })
+    .plugin(ThemePlugin::init(ctx.config_mut()))
     .plugin(
       tauri_plugin_sql::Builder::default()
         .add_migrations(
-          "sqlite:lume.db",
+          "sqlite:lume_v2.db",
           vec![
             Migration {
               version: 20230418013219,
@@ -136,146 +128,35 @@ fn main() {
               kind: MigrationKind::Up,
             },
             Migration {
-              version: 20230418080146,
-              description: "create chats",
-              sql: include_str!("../migrations/20230418080146_create_chats.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230420040005,
-              description: "insert last login to settings",
-              sql: include_str!("../migrations/20230420040005_insert_last_login_to_settings.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230425023912,
-              description: "add pubkey to channel",
-              sql: include_str!("../migrations/20230425023912_add_pubkey_to_channel.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230425024708,
-              description: "add default channels",
-              sql: include_str!("../migrations/20230425024708_add_default_channels.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230425050745,
-              description: "create blacklist",
-              sql: include_str!("../migrations/20230425050745_add_blacklist_model.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230521092300,
-              description: "create block",
-              sql: include_str!("../migrations/20230521092300_add_block_model.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230617003135,
-              description: "add channel messages",
-              sql: include_str!("../migrations/20230617003135_add_channel_messages.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230619082415,
-              description: "add replies",
-              sql: include_str!("../migrations/20230619082415_add_replies.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230718072634,
-              description: "clean up",
-              sql: include_str!("../migrations/20230718072634_clean_up_old_tables.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230725010250,
-              description: "update default relays",
-              sql: include_str!("../migrations/20230725010250_update_default_relays.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230804083544,
-              description: "add network to accounts",
-              sql: include_str!("../migrations/20230804083544_add_network_to_account.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230808085847,
-              description: "add relays",
-              sql: include_str!("../migrations/20230808085847_add_relays_table.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230811074423,
-              description: "rename blocks to widgets",
-              sql: include_str!("../migrations/20230811074423_rename_blocks_to_widgets.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230814083543,
-              description: "add events",
-              sql: include_str!("../migrations/20230814083543_add_events_table.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230816090508,
-              description: "clean up tables",
-              sql: include_str!("../migrations/20230816090508_clean_up_tables.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230817014932,
-              description: "add last login to account",
-              sql: include_str!("../migrations/20230817014932_add_last_login_time_to_account.sql"),
-              kind: MigrationKind::Up,
-            },
-            Migration {
-              version: 20230918235335,
-              description: "add unique to relay",
-              sql: include_str!("../migrations/20230918235335_add_uniq_to_relay.sql"),
+              version: 20231028083224,
+              description: "add ndk cache table",
+              sql: include_str!("../migrations/20231028083224_add_ndk_cache_table.sql"),
               kind: MigrationKind::Up,
             },
           ],
         )
         .build(),
     )
-    .plugin(
-      tauri_plugin_stronghold::Builder::new(|password| {
-        let config = argon2::Config {
-          lanes: 2,
-          mem_cost: 50_000,
-          time_cost: 30,
-          thread_mode: argon2::ThreadMode::from_threads(2),
-          variant: argon2::Variant::Argon2id,
-          ..Default::default()
-        };
-
-        let key = argon2::hash_raw(
-          password.as_ref(),
-          b"LUME_NEED_RUST_DEVELOPER_HELP_MAKE_SALT_RANDOM",
-          &config,
-        )
-        .expect("failed to hash password");
-
-        key.to_vec()
-      })
-      .build(),
-    )
+    .plugin(tauri_plugin_clipboard_manager::init())
+    .plugin(tauri_plugin_dialog::init())
+    .plugin(tauri_plugin_fs::init())
+    .plugin(tauri_plugin_http::init())
+    .plugin(tauri_plugin_notification::init())
+    .plugin(tauri_plugin_os::init())
+    .plugin(tauri_plugin_process::init())
+    .plugin(tauri_plugin_shell::init())
+    .plugin(tauri_plugin_upload::init())
+    .plugin(tauri_plugin_window_state::Builder::default().build())
     .plugin(tauri_plugin_autostart::init(
       MacosLauncher::LaunchAgent,
-      Some(vec!["--flag1", "--flag2"]),
+      Some(vec![]),
     ))
-    .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
-      println!("{}, {argv:?}, {cwd}", app.package_info().name);
-      app
-        .emit_all("single-instance", Payload { args: argv, cwd })
-        .unwrap();
-    }))
-    .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_store::Builder::default().build())
-    .invoke_handler(tauri::generate_handler![close_splashscreen, opengraph])
-    .run(tauri::generate_context!())
+    .invoke_handler(tauri::generate_handler![
+      opengraph,
+      secure_save,
+      secure_load,
+      secure_remove
+    ])
+    .run(ctx)
     .expect("error while running tauri application");
 }

src-tauri/src/traffic_light.rs

@@ -1,60 +0,0 @@
-use tauri::{Runtime, Window};
-
-pub trait TrafficLight {
-  #[cfg(target_os = "macos")]
-  fn set_transparent_titlebar(&self, transparent: bool);
-  fn position_traffic_lights(&self, x: f64, y: f64);
-}
-
-impl<R: Runtime> TrafficLight for Window<R> {
-  #[cfg(target_os = "macos")]
-  fn set_transparent_titlebar(&self, transparent: bool) {
-    use cocoa::appkit::{NSWindow, NSWindowTitleVisibility};
-
-    let window = self.ns_window().unwrap() as cocoa::base::id;
-
-    unsafe {
-      window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden);
-
-      if transparent {
-        window.setTitlebarAppearsTransparent_(cocoa::base::YES);
-      } else {
-        window.setTitlebarAppearsTransparent_(cocoa::base::NO);
-      }
-    }
-  }
-
-  #[cfg(target_os = "macos")]
-  fn position_traffic_lights(&self, x: f64, y: f64) {
-    use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
-    use cocoa::foundation::NSRect;
-
-    let window = self.ns_window().unwrap() as cocoa::base::id;
-
-    unsafe {
-      let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
-      let miniaturize = window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
-      let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
-
-      let title_bar_container_view = close.superview().superview();
-
-      let close_rect: NSRect = msg_send![close, frame];
-      let button_height = close_rect.size.height;
-
-      let title_bar_frame_height = button_height + y;
-      let mut title_bar_rect = NSView::frame(title_bar_container_view);
-      title_bar_rect.size.height = title_bar_frame_height;
-      title_bar_rect.origin.y = NSView::frame(window).size.height - title_bar_frame_height;
-      let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect];
-
-      let window_buttons = vec![close, miniaturize, zoom];
-      let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
-
-      for (i, button) in window_buttons.into_iter().enumerate() {
-        let mut rect: NSRect = NSView::frame(button);
-        rect.origin.x = x + (i as f64 * space_between);
-        button.setFrameOrigin(rect.origin);
-      }
-    }
-  }
-}

src-tauri/tauri.conf.json

@@ -9,89 +9,48 @@
   },
   "package": {
     "productName": "Lume",
-    "version": "1.2.6"
+    "version": "2.1.2"
+  },
+  "plugins": {
+    "fs": {
+      "scope": [
+        "$APPDATA/*",
+        "$DATA/*",
+        "$LOCALDATA/*",
+        "$DESKTOP/*",
+        "$DOCUMENT/*",
+        "$DOWNLOAD/*",
+        "$HOME/*",
+        "$PICTURE/*",
+        "$PUBLIC/*",
+        "$VIDEO/*"
+      ]
+    },
+    "http": {
+      "scope": [
+        "http://**/",
+        "https://**/"
+      ]
+    },
+    "shell": {
+      "open": true
+    },
+    "updater": {
+      "endpoints": [
+        "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
+        "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
+      ]
+    }
   },
   "tauri": {
-    "allowlist": {
-      "app": {
-        "all": true,
-        "show": true,
-        "hide": true
-      },
-      "path": {
-        "all": true
-      },
-      "dialog": {
-        "all": true,
-        "ask": true,
-        "confirm": true,
-        "message": true,
-        "open": true,
-        "save": true
-      },
-      "fs": {
-        "all": false,
-        "removeFile": true,
-        "writeFile": true,
-        "readDir": true,
-        "readFile": true,
-        "scope": [
-          "$APPDATA/*",
-          "$DATA/*",
-          "$LOCALDATA/*",
-          "$DESKTOP/*",
-          "$DOCUMENT/*",
-          "$DOWNLOAD/*",
-          "$HOME/*",
-          "$PICTURE/*",
-          "$PUBLIC/*",
-          "$VIDEO/*"
-        ]
-      },
-      "http": {
-        "all": true,
-        "scope": [
-          "http://**",
-          "https://**"
-        ]
-      },
-      "shell": {
-        "all": false,
-        "open": true
-      },
-      "os": {
-        "all": true
-      },
-      "window": {
-        "all": false,
-        "center": true,
-        "setResizable": true,
-        "setSize": true,
-        "startDragging": true,
-        "create": true,
-        "close": true,
-        "print": true
-      },
-      "clipboard": {
-        "all": false,
-        "writeText": true,
-        "readText": true
-      },
-      "notification": {
-        "all": true
-      }
-    },
     "bundle": {
       "active": true,
-      "appimage": {
-        "bundleMediaFramework": true
-      },
       "category": "SocialNetworking",
-      "copyright": "",
       "deb": {
         "depends": []
       },
       "externalBin": [],
+      "resources": [],
       "icon": [
         "icons/32x32.png",
         "icons/128x128.png",
@@ -99,44 +58,36 @@
         "icons/icon.icns",
         "icons/icon.ico"
       ],
+      "copyright": "",
       "identifier": "com.lume.nu",
-      "longDescription": "",
+      "longDescription": "The communication app build on Nostr Protocol",
+      "shortDescription": "",
+      "targets": "all",
+      "updater": {
+        "active": true,
+        "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK",
+        "windows": {
+          "installMode": "quiet"
+        }
+      },
+      "appimage": {
+        "bundleMediaFramework": true
+      },
       "macOS": {
         "entitlements": null,
         "exceptionDomain": "",
         "frameworks": [],
+        "license": "../LICENSE",
+        "minimumSystemVersion": "10.15.0",
         "providerShortName": null,
-        "signingIdentity": null,
-        "minimumSystemVersion": "10.15.0"
+        "signingIdentity": null
       },
-      "resources": [],
-      "shortDescription": "",
-      "targets": "all",
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",
         "timestampUrl": ""
       }
     },
-    "updater": {
-      "endpoints": [
-        "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
-        "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
-      ]
-    },
-    "security": {
-      "csp": {
-        "content-security-policy": "upgrade-insecure-requests"
-      },
-      "dangerousUseHttpScheme": true,
-      "dangerousRemoteDomainIpcAccess": [
-        {
-          "scheme": "https",
-          "domain": "nwc.getalby.com",
-          "windows": ["alby"],
-          "enableTauriAPI": true
-        }
-      ]
-    }
+    "macOSPrivateApi": true
   }
 }

src-tauri/tauri.linux.conf.json

@@ -2,30 +2,19 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "windows": [
-      {
-        "width": 300,
-        "height": 300,
-        "decorations": false,
-        "title": "Lume",
-        "center": true,
-        "resizable": false,
-        "label": "splashscreen",
-        "url": "splashscreen"
-      },
       {
         "width": 1080,
         "height": 800,
-        "minWidth": 1080,
+        "minWidth": 560,
         "minHeight": 800,
         "resizable": true,
-        "theme": "Dark",
         "title": "Lume",
-        "transparent": false,
         "center": true,
         "fullscreen": false,
         "hiddenTitle": true,
-        "visible": false,
-        "fileDropEnabled": true
+        "fileDropEnabled": true,
+        "decorations": false,
+        "transparent": false
       }
     ]
   }

src-tauri/tauri.macos.conf.json

@@ -1,35 +1,24 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
-    "macOSPrivateApi": true,
     "windows": [
-      {
-        "width": 300,
-        "height": 300,
-        "decorations": false,
-        "title": "Lume",
-        "titleBarStyle": "Overlay",
-        "hiddenTitle": true,
-        "center": true,
-        "resizable": false,
-        "label": "splashscreen",
-        "url": "splashscreen"
-      },
       {
         "width": 1080,
         "height": 800,
-        "minWidth": 1080,
+        "minWidth": 560,
         "minHeight": 800,
         "resizable": true,
-        "theme": "Dark",
         "title": "Lume",
         "titleBarStyle": "Overlay",
-        "transparent": true,
         "center": true,
         "fullscreen": false,
         "hiddenTitle": true,
-        "visible": false,
-        "fileDropEnabled": true
+        "fileDropEnabled": true,
+        "decorations": true,
+        "transparent": true,
+        "windowEffects": {
+          "effects": ["sidebar"]
+        }
       }
     ]
   }

src-tauri/tauri.windows.conf.json

@@ -2,30 +2,22 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "tauri": {
     "windows": [
-      {
-        "width": 300,
-        "height": 300,
-        "decorations": false,
-        "title": "Lume",
-        "center": true,
-        "resizable": false,
-        "label": "splashscreen",
-        "url": "splashscreen"
-      },
       {
         "width": 1080,
         "height": 800,
-        "minWidth": 1080,
+        "minWidth": 560,
         "minHeight": 800,
         "resizable": true,
-        "theme": "Dark",
         "title": "Lume",
-        "transparent": false,
         "center": true,
         "fullscreen": false,
         "hiddenTitle": true,
-        "visible": false,
-        "fileDropEnabled": true
+        "fileDropEnabled": true,
+        "decorations": false,
+        "transparent": true,
+        "windowEffects": {
+          "effects": ["micaLight", "micaDark"]
+        }
       }
     ]
   }

src/app.css

@@ -0,0 +1,70 @@
+@import 'reactflow/dist/style.css';
+
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer utilities {
+  .break-p {
+    word-break: break-word;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+  }
+
+  .prose :where(iframe):not(:where([class~="not-prose"] *)) {
+		@apply aspect-video w-full h-auto mx-auto;
+	}
+}
+
+html {
+  font-size: 14px;
+}
+
+a {
+  @apply cursor-default no-underline !important;
+}
+
+button {
+  @apply cursor-default focus:outline-none;
+}
+
+input::-ms-reveal,
+input::-ms-clear {
+  display: none;
+}
+
+::-webkit-input-placeholder {
+  line-height: normal;
+}
+
+.border {
+  background-clip: padding-box;
+}
+
+.player {
+  --brand-color: #f5f5f5;
+  --focus-color: #4e9cf6;
+  --audio-brand: var(--brand-color);
+  --audio-focus-ring-color: var(--focus-color);
+  --audio-border-radius: 2px;
+  --video-brand: var(--brand-color);
+  --video-focus-ring-color: var(--focus-color);
+  --video-border-radius: 8px;
+  width: 100%;
+}
+
+.player[data-view-type='video'] {
+  aspect-ratio: 16 /9;
+}
+
+.ProseMirror p.is-empty::before {
+  @apply text-neutral-600 dark:text-neutral-400;
+  content: attr(data-placeholder);
+  float: left;
+  height: 0;
+  pointer-events: none;
+}
+
+.ProseMirror img.ProseMirror-selectednode {
+  @apply outline-blue-500;
+}

src/app.tsx

@@ -1,49 +1,32 @@
-import { message } from '@tauri-apps/api/dialog';
-import { fetch } from '@tauri-apps/api/http';
+import { message } from '@tauri-apps/plugin-dialog';
+import { fetch } from '@tauri-apps/plugin-http';
 import { RouterProvider, createBrowserRouter, defer, redirect } from 'react-router-dom';
 import { ReactFlowProvider } from 'reactflow';
 
-import { AuthCreateScreen } from '@app/auth/create';
-import { AuthImportScreen } from '@app/auth/import';
 import { OnboardingScreen } from '@app/auth/onboarding';
+import { ChatsScreen } from '@app/chats';
 import { ErrorScreen } from '@app/error';
 import { ExploreScreen } from '@app/explore';
 
 import { useStorage } from '@libs/storage/provider';
 
-import { Frame } from '@shared/frame';
 import { LoaderIcon } from '@shared/icons';
 import { AppLayout } from '@shared/layouts/app';
 import { AuthLayout } from '@shared/layouts/auth';
+import { NewLayout } from '@shared/layouts/new';
 import { NoteLayout } from '@shared/layouts/note';
 import { SettingsLayout } from '@shared/layouts/settings';
 
-import './index.css';
+import './app.css';
 
 export default function App() {
   const { db } = useStorage();
 
   const accountLoader = async () => {
     try {
+      // redirect to welcome screen if none user exist
       const totalAccount = await db.checkAccount();
-
-      const stronghold = sessionStorage.getItem('stronghold');
-      const privkey = JSON.parse(stronghold).state.privkey || null;
-
-      const onboarding = localStorage.getItem('onboarding');
-      const step = JSON.parse(onboarding).state.step || null;
-
-      if (totalAccount === 0) {
-        return redirect('/auth/welcome');
-      } else {
-        if (step) {
-          return redirect(step);
-        }
-
-        if (!privkey) {
-          return redirect('/auth/unlock');
-        }
-      }
+      if (totalAccount === 0) return redirect('/auth/welcome');
 
       return null;
     } catch (e) {
@@ -58,7 +41,7 @@ export default function App() {
         headers: {
           Accept: 'application/nostr+json',
         },
-      }).then((res) => res.data),
+      }).then((res) => res.json()),
     });
   };
 
@@ -72,8 +55,8 @@ export default function App() {
         {
           path: '',
           async lazy() {
-            const { SpaceScreen } = await import('@app/space');
-            return { Component: SpaceScreen };
+            const { HomeScreen } = await import('@app/home');
+            return { Component: HomeScreen };
           },
         },
         {
@@ -83,20 +66,6 @@ export default function App() {
             return { Component: UserScreen };
           },
         },
-        {
-          path: 'chats/:pubkey',
-          async lazy() {
-            const { ChatScreen } = await import('@app/chats');
-            return { Component: ChatScreen };
-          },
-        },
-        {
-          path: 'notifications',
-          async lazy() {
-            const { NotificationScreen } = await import('@app/notifications');
-            return { Component: NotificationScreen };
-          },
-        },
         {
           path: 'nwc',
           async lazy() {
@@ -104,15 +73,6 @@ export default function App() {
             return { Component: NWCScreen };
           },
         },
-        {
-          path: 'explore',
-          element: (
-            <ReactFlowProvider>
-              <ExploreScreen />
-            </ReactFlowProvider>
-          ),
-          errorElement: <ErrorScreen />,
-        },
         {
           path: 'relays',
           async lazy() {
@@ -128,6 +88,64 @@ export default function App() {
             return { Component: RelayScreen };
           },
         },
+        {
+          path: 'explore',
+          element: (
+            <ReactFlowProvider>
+              <ExploreScreen />
+            </ReactFlowProvider>
+          ),
+          errorElement: <ErrorScreen />,
+        },
+        {
+          path: 'chats',
+          element: <ChatsScreen />,
+          errorElement: <ErrorScreen />,
+          children: [
+            {
+              path: 'chat/:pubkey',
+              async lazy() {
+                const { ChatScreen } = await import('@app/chats/chat');
+                return { Component: ChatScreen };
+              },
+            },
+          ],
+        },
+      ],
+    },
+    {
+      path: '/new',
+      element: <NewLayout />,
+      errorElement: <ErrorScreen />,
+      children: [
+        {
+          path: '',
+          async lazy() {
+            const { NewPostScreen } = await import('@app/new/post');
+            return { Component: NewPostScreen };
+          },
+        },
+        {
+          path: 'article',
+          async lazy() {
+            const { NewArticleScreen } = await import('@app/new/article');
+            return { Component: NewArticleScreen };
+          },
+        },
+        {
+          path: 'file',
+          async lazy() {
+            const { NewFileScreen } = await import('@app/new/file');
+            return { Component: NewFileScreen };
+          },
+        },
+        {
+          path: 'privkey',
+          async lazy() {
+            const { NewPrivkeyScreen } = await import('@app/new/privkey');
+            return { Component: NewPrivkeyScreen };
+          },
+        },
       ],
     },
     {
@@ -151,14 +169,6 @@ export default function App() {
         },
       ],
     },
-    {
-      path: '/splashscreen',
-      errorElement: <ErrorScreen />,
-      async lazy() {
-        const { SplashScreen } = await import('@app/splash');
-        return { Component: SplashScreen };
-      },
-    },
     {
       path: '/auth',
       element: <AuthLayout />,
@@ -172,60 +182,18 @@ export default function App() {
           },
         },
         {
-          path: 'import',
-          element: <AuthImportScreen />,
-          errorElement: <ErrorScreen />,
-          children: [
-            {
-              path: '',
-              async lazy() {
-                const { ImportStep1Screen } = await import('@app/auth/import/step-1');
-                return { Component: ImportStep1Screen };
-              },
-            },
-            {
-              path: 'step-2',
-              async lazy() {
-                const { ImportStep2Screen } = await import('@app/auth/import/step-2');
-                return { Component: ImportStep2Screen };
-              },
-            },
-            {
-              path: 'step-3',
-              async lazy() {
-                const { ImportStep3Screen } = await import('@app/auth/import/step-3');
-                return { Component: ImportStep3Screen };
-              },
-            },
-          ],
+          path: 'create',
+          async lazy() {
+            const { CreateAccountScreen } = await import('@app/auth/create');
+            return { Component: CreateAccountScreen };
+          },
         },
         {
-          path: 'create',
-          element: <AuthCreateScreen />,
-          errorElement: <ErrorScreen />,
-          children: [
-            {
-              path: '',
-              async lazy() {
-                const { CreateStep1Screen } = await import('@app/auth/create/step-1');
-                return { Component: CreateStep1Screen };
-              },
-            },
-            {
-              path: 'step-2',
-              async lazy() {
-                const { CreateStep2Screen } = await import('@app/auth/create/step-2');
-                return { Component: CreateStep2Screen };
-              },
-            },
-            {
-              path: 'step-3',
-              async lazy() {
-                const { CreateStep3Screen } = await import('@app/auth/create/step-3');
-                return { Component: CreateStep3Screen };
-              },
-            },
-          ],
+          path: 'import',
+          async lazy() {
+            const { ImportAccountScreen } = await import('@app/auth/import');
+            return { Component: ImportAccountScreen };
+          },
         },
         {
           path: 'onboarding',
@@ -235,58 +203,32 @@ export default function App() {
             {
               path: '',
               async lazy() {
-                const { OnboardStep1Screen } = await import(
-                  '@app/auth/onboarding/step-1'
+                const { OnboardingListScreen } = await import(
+                  '@app/auth/onboarding/list'
                 );
-                return { Component: OnboardStep1Screen };
+                return { Component: OnboardingListScreen };
               },
             },
             {
-              path: 'step-2',
+              path: 'enrich',
               async lazy() {
-                const { OnboardStep2Screen } = await import(
-                  '@app/auth/onboarding/step-2'
+                const { OnboardEnrichScreen } = await import(
+                  '@app/auth/onboarding/enrich'
                 );
-                return { Component: OnboardStep2Screen };
+                return { Component: OnboardEnrichScreen };
+              },
+            },
+            {
+              path: 'hashtag',
+              async lazy() {
+                const { OnboardHashtagScreen } = await import(
+                  '@app/auth/onboarding/hashtag'
+                );
+                return { Component: OnboardHashtagScreen };
               },
             },
           ],
         },
-        {
-          path: 'complete',
-          async lazy() {
-            const { CompleteScreen } = await import('@app/auth/complete');
-            return { Component: CompleteScreen };
-          },
-        },
-        {
-          path: 'unlock',
-          async lazy() {
-            const { UnlockScreen } = await import('@app/auth/unlock');
-            return { Component: UnlockScreen };
-          },
-        },
-        {
-          path: 'lock',
-          async lazy() {
-            const { LockScreen } = await import('@app/auth/lock');
-            return { Component: LockScreen };
-          },
-        },
-        {
-          path: 'migrate',
-          async lazy() {
-            const { MigrateScreen } = await import('@app/auth/migrate');
-            return { Component: MigrateScreen };
-          },
-        },
-        {
-          path: 'reset',
-          async lazy() {
-            const { ResetScreen } = await import('@app/auth/reset');
-            return { Component: ResetScreen };
-          },
-        },
       ],
     },
     {
@@ -297,15 +239,50 @@ export default function App() {
         {
           path: '',
           async lazy() {
-            const { GeneralSettingsScreen } = await import('@app/settings/general');
-            return { Component: GeneralSettingsScreen };
+            const { UserSettingScreen } = await import('@app/settings');
+            return { Component: UserSettingScreen };
+          },
+        },
+        {
+          path: 'edit-profile',
+          async lazy() {
+            const { EditProfileScreen } = await import('@app/settings/editProfile');
+            return { Component: EditProfileScreen };
+          },
+        },
+        {
+          path: 'edit-contact',
+          async lazy() {
+            const { EditContactScreen } = await import('@app/settings/editContact');
+            return { Component: EditContactScreen };
+          },
+        },
+        {
+          path: 'general',
+          async lazy() {
+            const { GeneralSettingScreen } = await import('@app/settings/general');
+            return { Component: GeneralSettingScreen };
           },
         },
         {
           path: 'backup',
           async lazy() {
-            const { AccountSettingsScreen } = await import('@app/settings/account');
-            return { Component: AccountSettingsScreen };
+            const { BackupSettingScreen } = await import('@app/settings/backup');
+            return { Component: BackupSettingScreen };
+          },
+        },
+        {
+          path: 'advanced',
+          async lazy() {
+            const { AdvancedSettingScreen } = await import('@app/settings/advanced');
+            return { Component: AdvancedSettingScreen };
+          },
+        },
+        {
+          path: 'about',
+          async lazy() {
+            const { AboutScreen } = await import('@app/settings/about');
+            return { Component: AboutScreen };
           },
         },
       ],
@@ -316,9 +293,9 @@ export default function App() {
     <RouterProvider
       router={router}
       fallbackElement={
-        <Frame className="flex h-full w-full items-center justify-center">
+        <div className="flex h-full w-full items-center justify-center">
           <LoaderIcon className="h-6 w-6 animate-spin text-white" />
-        </Frame>
+        </div>
       }
       future={{ v7_startTransition: true }}
     />

src/app/auth/complete.tsx

@@ -1,42 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-export function CompleteScreen() {
-  const navigate = useNavigate();
-  const [count, setCount] = useState(5);
-
-  useEffect(() => {
-    let counter: NodeJS.Timeout;
-
-    if (count > 0) {
-      counter = setTimeout(() => setCount(count - 1), 1000);
-    }
-
-    if (count === 0) {
-      navigate('/', { replace: true });
-    }
-
-    return () => {
-      clearTimeout(counter);
-    };
-  }, [count]);
-
-  return (
-    <div className="relative flex h-full w-full flex-col items-center justify-center">
-      <div className="mx-auto flex max-w-xl flex-col gap-1.5 text-center">
-        <h1 className="text-2xl font-light leading-none text-white">
-          <span className="font-semibold">You&apos;re ready</span>, redirecting in {count}
-        </h1>
-        <p className="text-white/70">
-          Thank you for using Lume. Lume doesn&apos;t use telemetry. If you encounter any
-          problems, please submit a report via the &quot;Report Issue&quot; button.
-          <br />
-          You can find it while using the application.
-        </p>
-      </div>
-      <div className="absolute bottom-6 left-1/2 flex -translate-x-1/2 transform items-center justify-center">
-        <img src="/lume.png" alt="lume" className="h-auto w-1/5" />
-      </div>
-    </div>
-  );
-}

src/app/auth/components/features/allowNotification.tsx

@@ -0,0 +1,50 @@
+import { isPermissionGranted, requestPermission } from '@tauri-apps/plugin-notification';
+
+import { CheckCircleIcon } from '@shared/icons';
+
+import { useOnboarding } from '@stores/onboarding';
+
+export function AllowNotification() {
+  const [notification, setNotification] = useOnboarding((state) => [
+    state.notification,
+    state.toggleNotification,
+  ]);
+
+  const allow = async () => {
+    let permissionGranted = await isPermissionGranted();
+    if (!permissionGranted) {
+      const permission = await requestPermission();
+      permissionGranted = permission === 'granted';
+    }
+    if (permissionGranted) {
+      setNotification();
+    }
+  };
+
+  return (
+    <div className="rounded-xl bg-neutral-100 p-3 text-neutral-800 dark:bg-neutral-900 dark:text-neutral-200">
+      <div className="flex items-start justify-between gap-2">
+        <div>
+          <h5 className="font-semibold">Allow notification</h5>
+          <p className="text-sm">
+            By allowing Lume to send notifications in your OS settings, you will receive
+            notification messages when someone interacts with you or your content.
+          </p>
+        </div>
+        {notification ? (
+          <div className="mt-1 inline-flex h-9 w-24 shrink-0 items-center justify-center rounded-lg bg-teal-500 text-white">
+            <CheckCircleIcon className="h-4 w-4" />
+          </div>
+        ) : (
+          <button
+            type="button"
+            onClick={allow}
+            className="mt-1 inline-flex h-9 w-24 shrink-0 items-center justify-center rounded-lg bg-neutral-200 font-medium hover:bg-blue-500 hover:text-white dark:bg-neutral-800"
+          >
+            Allow
+          </button>
+        )}
+      </div>
+    </div>
+  );
+}