From 0d43c1392898ff333692f525e98d1664d868d497 Mon Sep 17 00:00:00 2001 From: reya Date: Thu, 7 Dec 2023 11:55:49 +0700 Subject: [PATCH 1/3] bump version --- package.json | 2 +- src-tauri/tauri.conf.json | 2 +- src/shared/nip05.tsx | 20 ++++++++++---------- src/shared/widgets/other/liveUpdater.tsx | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 285211c2..e6858d90 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lume", "description": "the communication app", "private": true, - "version": "2.2.1", + "version": "2.2.2", "scripts": { "dev": "vite", "build": "vite build", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d4b942f2..dfd296cf 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Lume", - "version": "2.2.1" + "version": "2.2.2" }, "plugins": { "fs": { diff --git a/src/shared/nip05.tsx b/src/shared/nip05.tsx index 913ac672..21eb5b4f 100644 --- a/src/shared/nip05.tsx +++ b/src/shared/nip05.tsx @@ -40,7 +40,11 @@ export const NIP05 = memo(function NIP05({ const data: NIP05 = await res.json(); if (data.names) { - if (data.names[localPath.toLowerCase()] !== pubkey) return false; + if ( + data.names[localPath.toLowerCase()] !== pubkey || + data.names[localPath] !== pubkey + ) + return false; return true; } return false; @@ -60,17 +64,13 @@ export const NIP05 = memo(function NIP05({ return (
-

{nip05}

+

+ {nip05.startsWith('_@') ? nip05.replace('_@', '') : nip05} +

{data === true ? ( -
- - Verified -
+ ) : ( -
- - Unverified -
+ )}
); diff --git a/src/shared/widgets/other/liveUpdater.tsx b/src/shared/widgets/other/liveUpdater.tsx index 60fe1250..cd6cf3fa 100644 --- a/src/shared/widgets/other/liveUpdater.tsx +++ b/src/shared/widgets/other/liveUpdater.tsx @@ -30,7 +30,7 @@ export function LiveUpdater({ status }: { status: QueryStatus }) { useEffect(() => { let sub: NDKSubscription = undefined; - if (status === 'success' && db.account && db.account?.follows?.length > 0) { + if (status === 'success' && db.account && db.account?.contacts?.length > 0) { queryClient.fetchQuery({ queryKey: ['notification'] }); const filter: NDKFilter = { From f2b1458bd265f330d7f24fa4b691c7b5d0d2864a Mon Sep 17 00:00:00 2001 From: reya Date: Thu, 7 Dec 2023 18:49:55 +0700 Subject: [PATCH 2/3] bump version & fix using nsecbunker with token --- package.json | 2 +- src-tauri/tauri.conf.json | 2 +- src/app/auth/import.tsx | 4 ++-- src/libs/ndk/instance.ts | 6 +++--- src/shared/accounts/logout.tsx | 2 +- src/shared/layouts/new.tsx | 2 +- src/shared/widgets/other/liveUpdater.tsx | 2 -- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index e6858d90..fff85179 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lume", "description": "the communication app", "private": true, - "version": "2.2.2", + "version": "2.2.3", "scripts": { "dev": "vite", "build": "vite build", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index dfd296cf..56369375 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Lume", - "version": "2.2.2" + "version": "2.2.3" }, "plugins": { "fs": { diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx index 7a995d3a..6897058a 100644 --- a/src/app/auth/import.tsx +++ b/src/app/auth/import.tsx @@ -48,7 +48,7 @@ export function ImportAccountScreen() { const localSigner = NDKPrivateKeySigner.generate(); await db.createSetting('nsecbunker', '1'); - await db.secureSave(`${pubkey}-nsecbunker`, localSigner.privateKey); + await db.secureSave(`${npub}-nsecbunker`, localSigner.privateKey); // open nsecbunker web app in default browser await open('https://app.nsecbunker.com/keys'); @@ -56,7 +56,7 @@ export function ImportAccountScreen() { const bunker = new NDK({ explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'], }); - bunker.connect(); + await bunker.connect(); const remoteSigner = new NDKNip46Signer(bunker, npub, localSigner); await remoteSigner.blockUntilReady(); diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts index d7df1357..6f95c5aa 100644 --- a/src/libs/ndk/instance.ts +++ b/src/libs/ndk/instance.ts @@ -31,16 +31,16 @@ export const NDKInstance = () => { try { // NIP-46 Signer if (nsecbunker) { - const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`); + const localSignerPrivkey = await db.secureLoad(`${db.account.id}-nsecbunker`); if (!localSignerPrivkey) return null; const localSigner = new NDKPrivateKeySigner(localSignerPrivkey); const bunker = new NDK({ explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'], }); - bunker.connect(); + await bunker.connect(); - const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner); + const remoteSigner = new NDKNip46Signer(bunker, db.account.pubkey, localSigner); await remoteSigner.blockUntilReady(); return remoteSigner; diff --git a/src/shared/accounts/logout.tsx b/src/shared/accounts/logout.tsx index 259ee1f9..c8f79420 100644 --- a/src/shared/accounts/logout.tsx +++ b/src/shared/accounts/logout.tsx @@ -19,7 +19,7 @@ export function Logout() { // remove private key await db.secureRemove(db.account.pubkey); - await db.secureRemove(`${db.account.pubkey}-nsecbunker`); + await db.secureRemove(`${db.account.id}-nsecbunker`); // logout await db.accountLogout(); diff --git a/src/shared/layouts/new.tsx b/src/shared/layouts/new.tsx index c92a2799..df6db81f 100644 --- a/src/shared/layouts/new.tsx +++ b/src/shared/layouts/new.tsx @@ -22,7 +22,7 @@ export function NewLayout() {
diff --git a/src/shared/widgets/other/liveUpdater.tsx b/src/shared/widgets/other/liveUpdater.tsx index cd6cf3fa..04c5775d 100644 --- a/src/shared/widgets/other/liveUpdater.tsx +++ b/src/shared/widgets/other/liveUpdater.tsx @@ -31,8 +31,6 @@ export function LiveUpdater({ status }: { status: QueryStatus }) { let sub: NDKSubscription = undefined; if (status === 'success' && db.account && db.account?.contacts?.length > 0) { - queryClient.fetchQuery({ queryKey: ['notification'] }); - const filter: NDKFilter = { kinds: [NDKKind.Text, NDKKind.Repost], authors: db.account.contacts, From 8b434d577feed17f6329de7b1074982a7ae55cb0 Mon Sep 17 00:00:00 2001 From: reya Date: Fri, 8 Dec 2023 08:01:06 +0700 Subject: [PATCH 3/3] fix nip-05 verification --- src/shared/nip05.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/shared/nip05.tsx b/src/shared/nip05.tsx index 21eb5b4f..10c7c22c 100644 --- a/src/shared/nip05.tsx +++ b/src/shared/nip05.tsx @@ -40,12 +40,9 @@ export const NIP05 = memo(function NIP05({ const data: NIP05 = await res.json(); if (data.names) { - if ( - data.names[localPath.toLowerCase()] !== pubkey || - data.names[localPath] !== pubkey - ) - return false; - return true; + if (data.names[localPath.toLowerCase()] === pubkey) return true; + if (data.names[localPath] === pubkey) return true; + return false; } return false; } catch (e) {