From 170feb1bd797e9793c8df33e93adcd56185adb08 Mon Sep 17 00:00:00 2001
From: Gigi <dergigi@pm.me>
Date: Thu, 2 Oct 2025 09:33:33 +0200
Subject: [PATCH] fix: implement proper NIP-44 decryption using applesauce
 hidden-content helpers

- Replace direct signer method calls with applesauce hidden-content helpers
- Use unlockHiddenContent, getHiddenContent, and isHiddenContentLocked functions
- Add proper error handling for decryption failures
- This follows the correct applesauce pattern for NIP-44 decryption
---
 applesauce                      |  1 +
 src/services/bookmarkService.ts | 34 ++++++++++++---------------------
 2 files changed, 13 insertions(+), 22 deletions(-)
 create mode 120000 applesauce

diff --git a/applesauce b/applesauce
new file mode 120000
index 00000000..25ea0f3f
--- /dev/null
+++ b/applesauce
@@ -0,0 +1 @@
+../applesauce
\ No newline at end of file
diff --git a/src/services/bookmarkService.ts b/src/services/bookmarkService.ts
index 3e847538..125d4caf 100644
--- a/src/services/bookmarkService.ts
+++ b/src/services/bookmarkService.ts
@@ -1,6 +1,7 @@
 import { RelayPool } from 'applesauce-relay'
 import { completeOnEose } from 'applesauce-relay'
 import { getParsedContent } from 'applesauce-content/text'
+import { unlockHiddenContent, getHiddenContent, isHiddenContentLocked } from 'applesauce-core/helpers/hidden-content'
 import { Filter } from 'nostr-tools'
 import { lastValueFrom, takeUntil, timer, toArray } from 'rxjs'
 import { Bookmark, IndividualBookmark, ParsedContent, ActiveAccount } from '../types/bookmarks'
@@ -143,33 +144,22 @@ export const fetchBookmarks = async (
           if (bookmarkListEvent.content && activeAccount.signer) {
             try {
               console.log('Decrypting private bookmarks...')
-              console.log('Signer methods:', Object.getOwnPropertyNames(activeAccount.signer))
-              console.log('Signer prototype methods:', Object.getOwnPropertyNames(Object.getPrototypeOf(activeAccount.signer)))
               
-              // Try different possible method names
-              let decryptedContent = null
-              if (typeof activeAccount.signer.nip44_decrypt === 'function') {
-                decryptedContent = await activeAccount.signer.nip44_decrypt(
-                  bookmarkListEvent.content,
-                  activeAccount.pubkey
-                )
-              } else if (typeof activeAccount.signer.decrypt === 'function') {
-                decryptedContent = await activeAccount.signer.decrypt(
-                  bookmarkListEvent.content,
-                  activeAccount.pubkey
-                )
-              } else if (typeof activeAccount.signer.nip44Decrypt === 'function') {
-                decryptedContent = await activeAccount.signer.nip44Decrypt(
-                  bookmarkListEvent.content,
-                  activeAccount.pubkey
-                )
-              } else {
-                console.log('No suitable decrypt method found on signer')
-                throw new Error('No suitable decrypt method found on signer')
+              // Check if content is locked (encrypted)
+              if (isHiddenContentLocked(bookmarkListEvent)) {
+                console.log('Content is encrypted, attempting to unlock...')
+                await unlockHiddenContent(bookmarkListEvent, activeAccount.signer, 'nip44')
               }
               
+              // Get the decrypted content using applesauce helper
+              const decryptedContent = getHiddenContent(bookmarkListEvent)
               console.log('Decrypted content:', decryptedContent)
               
+              if (!decryptedContent) {
+                console.log('No decrypted content available')
+                throw new Error('Failed to decrypt content')
+              }
+              
               // Parse the decrypted JSON content
               const privateTags = JSON.parse(decryptedContent)