From 9112c1c24a5d13fb6ed7c681b3713d62031a7e4b Mon Sep 17 00:00:00 2001
From: reya <reya@lume.nu>
Date: Sat, 25 Nov 2023 17:56:45 +0700
Subject: [PATCH] improve connection

---
 package.json                     |  2 +-
 src-tauri/Cargo.lock             |  2 +-
 src-tauri/Cargo.toml             |  2 +-
 src-tauri/tauri.conf.json        |  2 +-
 src/app/auth/import.tsx          |  3 ++-
 src/app/auth/onboarding/list.tsx |  2 --
 src/libs/ndk/instance.ts         | 44 +++++++++++---------------------
 src/libs/storage/instance.ts     |  4 +--
 src/stores/constants.ts          |  1 -
 9 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index b34fa38d..2eb3de36 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "lume",
   "description": "the communication app",
   "private": true,
-  "version": "2.1.3",
+  "version": "2.1.4",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 02220dee..2a7d193e 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2680,7 +2680,7 @@ dependencies = [
 
 [[package]]
 name = "lume"
-version = "2.1.3"
+version = "2.1.4"
 dependencies = [
  "keyring",
  "serde",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 2eb10400..3bc610ca 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lume"
-version = "2.1.3"
+version = "2.1.4"
 description = "the communication app"
 authors = ["Ren Amamiya"]
 license = "GPL-3.0"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 267f1bf2..7350c35f 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "Lume",
-    "version": "2.1.3"
+    "version": "2.1.4"
   },
   "plugins": {
     "fs": {
diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx
index a438950e..7f683a09 100644
--- a/src/app/auth/import.tsx
+++ b/src/app/auth/import.tsx
@@ -44,7 +44,8 @@ export function ImportAccountScreen() {
     try {
       const pubkey = nip19.decode(npub.split('#')[0]).data as string;
       const localSigner = NDKPrivateKeySigner.generate();
-      await db.secureSave(pubkey + '-bunker', localSigner.privateKey);
+      await db.createSetting('nsecbunker', '1');
+      await db.secureSave(pubkey + '-nsecbunker', localSigner.privateKey);
 
       const remoteSigner = new NDKNip46Signer(ndk, npub, localSigner);
       // await remoteSigner.blockUntilReady();
diff --git a/src/app/auth/onboarding/list.tsx b/src/app/auth/onboarding/list.tsx
index 76287728..19127ce4 100644
--- a/src/app/auth/onboarding/list.tsx
+++ b/src/app/auth/onboarding/list.tsx
@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 import { AllowNotification } from '@app/auth/components/features/allowNotification';
-import { Circle } from '@app/auth/components/features/enableCircle';
 import { OutboxModel } from '@app/auth/components/features/enableOutbox';
 import { FavoriteHashtag } from '@app/auth/components/features/favoriteHashtag';
 import { FollowList } from '@app/auth/components/features/followList';
@@ -41,7 +40,6 @@ export function OnboardingListScreen() {
         <div className="flex flex-col gap-3">
           {newuser ? <SuggestFollow /> : <FollowList />}
           <FavoriteHashtag />
-          <Circle />
           <OutboxModel />
           <AllowNotification />
           <button
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index c91b4955..172ce7bc 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -61,29 +61,26 @@ export const NDKInstance = () => {
     }
   }
 
-  async function getSigner(instance: NDK) {
-    if (!db.account) return null;
-
-    const localSignerPrivkey = await db.secureLoad(db.account.pubkey + '-bunker');
-    const userPrivkey = await db.secureLoad(db.account.pubkey);
+  async function getSigner(nsecbunker?: boolean) {
+    if (!db.account) return;
 
     // NIP-46 Signer
-    if (localSignerPrivkey) {
+    if (nsecbunker) {
+      const localSignerPrivkey = await db.secureLoad(db.account.pubkey + '-nsecbunker');
       const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
-      const remoteSigner = new NDKNip46Signer(instance, db.account.id, localSigner);
       // await remoteSigner.blockUntilReady();
-
-      return remoteSigner;
+      return new NDKNip46Signer(ndk, db.account.id, localSigner);
     }
 
-    // Privkey Signer
-    if (userPrivkey) {
-      return new NDKPrivateKeySigner(userPrivkey);
-    }
+    // Private key Signer
+    const userPrivkey = await db.secureLoad(db.account.pubkey);
+    return new NDKPrivateKeySigner(userPrivkey);
   }
 
   async function initNDK() {
     const outboxSetting = await db.getSettingValue('outbox');
+    const bunkerSetting = await db.getSettingValue('nsecbunker');
+    const signer = await getSigner(!!parseInt(bunkerSetting));
     const explicitRelayUrls = await getExplicitRelays();
 
     const tauriAdapter = new NDKCacheAdapterTauri(db);
@@ -91,34 +88,23 @@ export const NDKInstance = () => {
       explicitRelayUrls,
       cacheAdapter: tauriAdapter,
       outboxRelayUrls: ['wss://purplepag.es'],
-      enableOutboxModel: outboxSetting === '1',
+      blacklistRelayUrls: [],
+      enableOutboxModel: !!parseInt(outboxSetting),
     });
+    instance.signer = signer;
 
     try {
       // connect
       await instance.connect(2000);
 
-      // add signer
-      const signer = await getSigner(instance);
-      instance.signer = signer;
-
       // update account's metadata
       if (db.account) {
-        const circleSetting = await db.getSettingValue('circles');
-
         const user = instance.getUser({ pubkey: db.account.pubkey });
-        const follows = await user.follows();
+        const follows = [...(await user.follows())].map((user) => user.pubkey);
         const relayList = await user.relayList();
 
-        const followsAsArr = [];
-        follows.forEach((user) => {
-          followsAsArr.push(user.pubkey);
-        });
-
         // update user's follows
-        await db.updateAccount('follows', JSON.stringify(followsAsArr));
-        if (circleSetting !== '1')
-          await db.updateAccount('circles', JSON.stringify(followsAsArr));
+        await db.updateAccount('follows', JSON.stringify(follows));
 
         // update user's relay list
         if (relayList) {
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index 60a32a36..23b18402 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -438,7 +438,7 @@ export class LumeStorage {
       [relay, this.account.id]
     );
 
-    if (existRelays.length > 0) return false;
+    if (!existRelays.length) return;
 
     return await this.db.execute(
       'INSERT OR IGNORE INTO relays (account_id, relay, purpose) VALUES ($1, $2, $3);',
@@ -480,7 +480,7 @@ export class LumeStorage {
       'SELECT * FROM settings WHERE key = $1 ORDER BY id DESC LIMIT 1;',
       [key]
     );
-    if (results.length < 1) return null;
+    if (!results.length) return '0';
     return results[0].value;
   }
 
diff --git a/src/stores/constants.ts b/src/stores/constants.ts
index 56b61ddf..b0e140f1 100644
--- a/src/stores/constants.ts
+++ b/src/stores/constants.ts
@@ -1,6 +1,5 @@
 export const FULL_RELAYS = [
   'wss://relay.damus.io',
-  'wss://relayable.org',
   'wss://relay.nostr.band/all',
   'wss://nostr.mutinywallet.com',
 ];