From 41527b2813d467a42e14175485710b065f1ebde1 Mon Sep 17 00:00:00 2001
From: codytseng <codytseng@outlook.com>
Date: Mon, 12 May 2025 17:27:03 +0800
Subject: [PATCH] chore: update nostr-tools

---
 package-lock.json |  8 ++++----
 package.json      |  4 ++--
 src/lib/pubkey.ts | 17 +++++++++++------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e8e95c2..58c87db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "i18next-browser-languagedetector": "^8.0.4",
         "lru-cache": "^11.0.2",
         "lucide-react": "^0.469.0",
-        "nostr-tools": "^2.12.0",
+        "nostr-tools": "^2.13.0",
         "nstart-modal": "^2.0.0",
         "path-to-regexp": "^8.2.0",
         "qrcode.react": "^4.2.0",
@@ -7120,9 +7120,9 @@
       }
     },
     "node_modules/nostr-tools": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/nostr-tools/-/nostr-tools-2.12.0.tgz",
-      "integrity": "sha512-pUWEb020gTvt1XZvTa8AKNIHWFapjsv2NKyk43Ez2nnvz6WSXsrTFE0XtkNLSRBjPn6EpxumKeNiVzLz74jNSA==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/nostr-tools/-/nostr-tools-2.13.0.tgz",
+      "integrity": "sha512-A1arGsvpULqVK0NmZQqK1imwaCiPm8gcG/lo+cTax2NbNqBEYsuplbqAFdVqcGHEopmkByYbTwF76x25+oEbew==",
       "dependencies": {
         "@noble/ciphers": "^0.5.1",
         "@noble/curves": "1.2.0",
diff --git a/package.json b/package.json
index 39f73eb..2b3e3c0 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "i18next-browser-languagedetector": "^8.0.4",
     "lru-cache": "^11.0.2",
     "lucide-react": "^0.469.0",
-    "nostr-tools": "^2.12.0",
+    "nostr-tools": "^2.13.0",
     "nstart-modal": "^2.0.0",
     "path-to-regexp": "^8.2.0",
     "qrcode.react": "^4.2.0",
@@ -82,4 +82,4 @@
     "vite": "^6.0.3",
     "vite-plugin-pwa": "^0.21.1"
   }
-}
+}
\ No newline at end of file
diff --git a/src/lib/pubkey.ts b/src/lib/pubkey.ts
index d325827..f4dccd1 100644
--- a/src/lib/pubkey.ts
+++ b/src/lib/pubkey.ts
@@ -32,12 +32,17 @@ export function pubkeyToNpub(pubkey: string) {
 }
 
 export function userIdToPubkey(userId: string) {
-  if (userId.startsWith('npub1')) {
-    const { data } = nip19.decode(userId as `npub1${string}`)
-    return data
-  } else if (userId.startsWith('nprofile1')) {
-    const { data } = nip19.decode(userId as `nprofile1${string}`)
-    return data.pubkey
+  if (userId.startsWith('npub1') || userId.startsWith('nprofile1')) {
+    try {
+      const { type, data } = nip19.decode(userId)
+      if (type === 'npub') {
+        return data
+      } else if (type === 'nprofile') {
+        return data.pubkey
+      }
+    } catch (error) {
+      console.error('Error decoding userId:', userId, 'error:', error)
+    }
   }
   return userId
 }