applesauce-core 0.0.0-next-20250628162548 → 0.0.0-next-20250630164258

package/dist/helpers/encrypted-content-cache.d.ts

@@ -1,3 +1,4 @@
+import { NostrEvent } from "nostr-tools";
 import { Observable } from "rxjs";
 import { IEventStoreStreams } from "../event-store/interface.js";
 /** A symbol that is used to mark encrypted content as being from a cache */
@@ -11,5 +12,11 @@ export interface EncryptedContentCache {
 export declare function markEncryptedContentFromCache<T extends object>(event: T): void;
 /** Checks if the encrypted content is from a cache */
 export declare function isEncryptedContentFromCache<T extends object>(event: T): boolean;
-/** Starts a process that persists and restores all encrypted content */
-export declare function persistEncryptedContent(eventStore: IEventStoreStreams, storage: EncryptedContentCache | Observable<EncryptedContentCache>): () => void;
+/**
+ * Starts a process that persists and restores all encrypted content
+ * @param eventStore - The event store to listen to
+ * @param storage - The storage to use
+ * @param fallback - A function that will be called when the encrypted content is not found in storage
+ * @returns A function that can be used to stop the process
+ */
+export declare function persistEncryptedContent(eventStore: IEventStoreStreams, storage: EncryptedContentCache | Observable<EncryptedContentCache>, fallback?: (event: NostrEvent) => any | Promise<any>): () => void;

package/dist/helpers/encrypted-content-cache.js

@@ -15,9 +15,19 @@ export function isEncryptedContentFromCache(event) {
     return Reflect.has(event, EncryptedContentFromCacheSymbol);
 }
 const log = logger.extend("EncryptedContentCache");
-/** Starts a process that persists and restores all encrypted content */
-export function persistEncryptedContent(eventStore, storage) {
+/**
+ * Starts a process that persists and restores all encrypted content
+ * @param eventStore - The event store to listen to
+ * @param storage - The storage to use
+ * @param fallback - A function that will be called when the encrypted content is not found in storage
+ * @returns A function that can be used to stop the process
+ */
+export function persistEncryptedContent(eventStore, storage, fallback) {
     const storage$ = isObservable(storage) ? storage : of(storage);
+    // Get the encrypted content from storage or call the fallback
+    const getItem = async (storage, event) => {
+        return (await storage.getItem(event.id)) || (fallback ? await fallback(event) : null);
+    };
     // Restore encrypted content when it is inserted
     const restore = eventStore.insert$
         .pipe(
@@ -26,7 +36,7 @@ export function persistEncryptedContent(eventStore, storage) {
     // Get the encrypted content from storage
     mergeMap((event) => 
     // Wait for storage to be available
-    storage$.pipe(switchMap((storage) => combineLatest([of(event), storage.getItem(event.id)])), catchError((error) => {
+    storage$.pipe(switchMap((storage) => combineLatest([of(event), getItem(storage, event)])), catchError((error) => {
         log(`Failed to restore encrypted content for ${event.id}`, error);
         return EMPTY;
     }))))
@@ -52,7 +62,7 @@ export function persistEncryptedContent(eventStore, storage) {
     // Get encrypted content from storage
     mergeMap(([gift, seal]) => 
     // Wait for storage to be available
-    storage$.pipe(switchMap((storage) => combineLatest([of(gift), of(seal), storage.getItem(seal.id)])), catchError((error) => {
+    storage$.pipe(switchMap((storage) => combineLatest([of(gift), of(seal), getItem(storage, seal)])), catchError((error) => {
         log(`Failed to restore encrypted content for ${seal.id}`, error);
         return EMPTY;
     }))))

package/dist/models/legacy-messages.js

@@ -20,11 +20,18 @@ export function LegacyMessagesGroups(self) {
 }
 /** Returns all legacy direct messages in a group */
 export function LegacyMessagesGroup(self, corraspondant) {
-    return (store) => store.timeline({
-        kinds: [kinds.EncryptedDirectMessage],
-        "#p": [self, corraspondant],
-        authors: [self, corraspondant],
-    });
+    return (store) => store.timeline([
+        {
+            kinds: [kinds.EncryptedDirectMessage],
+            "#p": [self],
+            authors: [corraspondant],
+        },
+        {
+            kinds: [kinds.EncryptedDirectMessage],
+            "#p": [corraspondant],
+            authors: [self],
+        },
+    ]);
 }
 /** Returns an array of legacy messages that have replies */
 export function LegacyMessageThreads(self, corraspondant) {
@@ -37,10 +44,18 @@ export function LegacyMessageThreads(self, corraspondant) {
 /** Returns all the legacy direct messages that are replies to a given message */
 export function LegacyMessageReplies(self, message) {
     const corraspondant = getLegacyMessageCorraspondant(message, self);
-    return (store) => store.timeline({
-        kinds: [kinds.EncryptedDirectMessage],
-        "#p": [self, corraspondant],
-        authors: [self, corraspondant],
-        "#e": [message.id],
-    });
+    return (store) => store.timeline([
+        {
+            kinds: [kinds.EncryptedDirectMessage],
+            "#p": [self],
+            authors: [corraspondant],
+            "#e": [message.id],
+        },
+        {
+            kinds: [kinds.EncryptedDirectMessage],
+            "#p": [corraspondant],
+            authors: [self],
+            "#e": [message.id],
+        },
+    ]);
 }

package/dist/models/wrapped-messages.js

@@ -16,6 +16,7 @@ export function WrappedMessagesModel(self) {
     map((rumors) => rumors
         .map((gift) => getGiftWrapRumor(gift))
         .filter((e) => !!e)
+        .filter((e) => e.kind === kinds.PrivateDirectMessage)
         .sort((a, b) => b.created_at - a.created_at)));
 }
 /** A model that returns all conversations that a pubkey is participating in */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "0.0.0-next-20250628162548",
+  "version": "0.0.0-next-20250630164258",
   "description": "",
   "type": "module",
   "main": "dist/index.js",