applesauce-common 0.0.0-next-20251205152544 → 0.0.0-next-20251209200210

package/dist/helpers/bookmark.js

@@ -1,16 +1,20 @@
 import { getOrComputeCachedValue, notifyEventUpdate } from "applesauce-core/helpers";
 import { kinds } from "applesauce-core/helpers/event";
 import { getHiddenTags, isHiddenTagsUnlocked, unlockHiddenTags } from "applesauce-core/helpers/hidden-tags";
-import { getAddressPointerFromATag, getCoordinateFromAddressPointer, getEventPointerFromETag, mergeAddressPointers, mergeEventPointers, } from "applesauce-core/helpers/pointers";
+import { getAddressPointerFromATag, getReplaceableAddressFromPointer, getEventPointerFromETag, mergeAddressPointers, mergeEventPointers, } from "applesauce-core/helpers/pointers";
 export const BookmarkPublicSymbol = Symbol.for("bookmark-public");
 export const BookmarkHiddenSymbol = Symbol.for("bookmark-hidden");
 /** Parses an array of tags into a {@link Bookmarks} object */
 export function parseBookmarkTags(tags) {
-    const notes = tags.filter((t) => t[0] === "e" && t[1]).map(getEventPointerFromETag);
+    const notes = tags
+        .filter((t) => t[0] === "e" && t[1])
+        .map(getEventPointerFromETag)
+        .filter((pointer) => pointer !== null);
     const articles = tags
         .filter((t) => t[0] === "a" && t[1])
         .map(getAddressPointerFromATag)
-        .filter((addr) => addr.kind === kinds.LongFormArticle);
+        .filter((pointer) => pointer !== null)
+        .filter((pointer) => pointer.kind === kinds.LongFormArticle);
     const hashtags = tags.filter((t) => t[0] === "t" && t[1]).map((t) => t[1]);
     const urls = tags.filter((t) => t[0] === "r" && t[1]).map((t) => t[1]);
     return { notes, articles, hashtags, urls };
@@ -32,7 +36,7 @@ export function mergeBookmarks(...bookmarks) {
                 notes.set(note.id, note);
         }
         for (const article of bookmark.articles) {
-            const coord = getCoordinateFromAddressPointer(article);
+            const coord = getReplaceableAddressFromPointer(article);
             const existing = articles.get(coord);
             if (existing)
                 articles.set(coord, mergeAddressPointers(existing, article));

package/dist/helpers/calendar-event.js

@@ -86,11 +86,18 @@ export function getCalendarEventParticipants(event) {
     if (event.kind !== DATE_BASED_CALENDAR_EVENT_KIND && event.kind !== TIME_BASED_CALENDAR_EVENT_KIND)
         throw new Error("Event is not a date-based or time-based calendar event");
     return getOrComputeCachedValue(event, CalendarEventParticipantsSymbol, () => {
-        return event.tags.filter(isPTag).map((tag) => ({
-            ...getProfilePointerFromPTag(tag),
-            // Third index of tag is optional "role"
-            role: tag[3] || undefined,
-        }));
+        return event.tags
+            .filter(isPTag)
+            .map((tag) => {
+            const pointer = getProfilePointerFromPTag(tag);
+            if (!pointer)
+                return undefined;
+            return {
+                ...pointer,
+                role: tag[3] || undefined,
+            };
+        })
+            .filter((p) => p !== undefined);
     });
 }
 /** Gets all hashtags from a calendar event */

package/dist/helpers/calendar-rsvp.js

@@ -20,19 +20,19 @@ export function getRSVPAddressPointer(event) {
     const tag = event.tags.find(isATag);
     if (!tag)
         return undefined;
-    return getAddressPointerFromATag(tag);
+    return getAddressPointerFromATag(tag) ?? undefined;
 }
 /** Gets the referenced calendar event pointer that the RSVP is responding to */
 export function getRSVPEventPointer(event) {
     const tag = event.tags.find(isETag);
     if (!tag)
         return undefined;
-    return getEventPointerFromETag(tag);
+    return getEventPointerFromETag(tag) ?? undefined;
 }
 /** Gets the profile pointer that the RSVP is responding to */
 export function getRSVPProfilePointer(event) {
     const tag = event.tags.find(isPTag);
     if (!tag)
         return undefined;
-    return getProfilePointerFromPTag(tag);
+    return getProfilePointerFromPTag(tag) ?? undefined;
 }

package/dist/helpers/calendar.js

@@ -7,5 +7,8 @@ export function getCalendarTitle(event) {
 }
 /** Gets the address pointers to all the events on the calendar */
 export function getCalendarAddressPointers(event) {
-    return event.tags.filter(isATag).map(getAddressPointerFromATag);
+    return event.tags
+        .filter(isATag)
+        .map(getAddressPointerFromATag)
+        .filter((p) => p !== null);
 }

package/dist/helpers/comment.js

@@ -38,6 +38,8 @@ export function getCommentAddressPointer(tags, root = false) {
         if (!kind)
             return null;
         const addressPointer = getAddressPointerFromATag(aTag);
+        if (!addressPointer)
+            return null;
         const pointer = {
             type: "address",
             id: eTag?.[1],

package/dist/helpers/highlight.js

@@ -20,7 +20,7 @@ export function getHighlightText(event) {
 export function getHighlightSourceEventPointer(event) {
     return getOrComputeCachedValue(event, HighlightSourceEventPointerSymbol, () => {
         const eTag = event.tags.find(isETag);
-        return eTag ? getEventPointerFromETag(eTag) : undefined;
+        return eTag ? (getEventPointerFromETag(eTag) ?? undefined) : undefined;
     });
 }
 /**
@@ -30,7 +30,7 @@ export function getHighlightSourceEventPointer(event) {
 export function getHighlightSourceAddressPointer(event) {
     return getOrComputeCachedValue(event, HighlightSourceAddressPointerSymbol, () => {
         const aTag = event.tags.find(isATag);
-        return aTag ? getAddressPointerFromATag(aTag) : undefined;
+        return aTag ? (getAddressPointerFromATag(aTag) ?? undefined) : undefined;
     });
 }
 /** Get the source URL that was highlighted (from 'r' tag) */
@@ -47,6 +47,8 @@ export function getHighlightAttributions(event) {
         const pTags = event.tags.filter(isPTag);
         for (const pTag of pTags) {
             const pointer = getProfilePointerFromPTag(pTag);
+            if (!pointer)
+                continue;
             const role = pTag[3] || "other"; // Role is the 4th element (index 3)
             const entry = { ...pointer, role };
             // Categorize by role

package/dist/helpers/lists.js

@@ -1,6 +1,6 @@
 import { getReplaceableIdentifier, isAddressableKind, isReplaceable, isReplaceableKind, } from "applesauce-core/helpers/event";
 import { getHiddenTags } from "applesauce-core/helpers/hidden-tags";
-import { getAddressPointerForEvent, getAddressPointerFromATag, getCoordinateFromAddressPointer, getEventPointerFromETag, getProfilePointerFromPTag, } from "applesauce-core/helpers/pointers";
+import { getAddressPointerForEvent, getAddressPointerFromATag, getReplaceableAddressFromPointer, getEventPointerFromETag, getProfilePointerFromPTag, } from "applesauce-core/helpers/pointers";
 import { mergeRelaySets } from "applesauce-core/helpers/relays";
 import { isATag, isETag, isPTag, processTags } from "applesauce-core/helpers/tags";
 export const FAVORITE_RELAYS_KIND = 10012;
@@ -36,9 +36,9 @@ export function isEventPointerInList(list, pointer, type) {
  * @param type - Which types of tags to check
  */
 export function isAddressPointerInList(list, pointer, type) {
-    const cord = typeof pointer === "string" ? pointer : getCoordinateFromAddressPointer(pointer);
+    const address = typeof pointer === "string" ? pointer : getReplaceableAddressFromPointer(pointer);
     const tags = getListTags(list, type);
-    return tags.some((t) => t[0] === "a" && t[1] === cord);
+    return tags.some((t) => t[0] === "a" && t[1] === address);
 }
 /**
  * Checks if an profile pointer is anywhere in a list or set
@@ -54,9 +54,12 @@ export function isProfilePointerInList(list, pointer, type) {
 }
 /** Returns if an event is in a list */
 export function isEventInList(list, event) {
-    return isReplaceable(event.kind)
-        ? isAddressPointerInList(list, getAddressPointerForEvent(event))
-        : isEventPointerInList(list, event);
+    if (isReplaceable(event.kind)) {
+        const pointer = getAddressPointerForEvent(event);
+        if (pointer && isAddressPointerInList(list, pointer))
+            return true;
+    }
+    return isEventPointerInList(list, event.id);
 }
 /**
  * Returns all the EventPointer in a list or set
@@ -64,7 +67,7 @@ export function isEventInList(list, event) {
  * @param type - Which types of tags to read
  */
 export function getEventPointersFromList(list, type) {
-    return processTags(getListTags(list, type), (tag) => (isETag(tag) ? tag : undefined), getEventPointerFromETag);
+    return processTags(getListTags(list, type), (tag) => (isETag(tag) ? tag : undefined), (t) => getEventPointerFromETag(t) ?? undefined);
 }
 /**
  * Returns all the AddressPointer in a list or set
@@ -72,7 +75,7 @@ export function getEventPointersFromList(list, type) {
  * @param type - Which types of tags to read
  */
 export function getAddressPointersFromList(list, type) {
-    return processTags(getListTags(list, type), (t) => (isATag(t) ? t : undefined), getAddressPointerFromATag);
+    return processTags(getListTags(list, type), (t) => (isATag(t) ? t : undefined), (t) => getAddressPointerFromATag(t) ?? undefined);
 }
 /**
  * Returns all the ProfilePointer in a list or set
@@ -80,7 +83,7 @@ export function getAddressPointersFromList(list, type) {
  * @param type - Which types of tags to read
  */
 export function getProfilePointersFromList(list, type) {
-    return processTags(getListTags(list, type), (t) => (isPTag(t) ? t : undefined), getProfilePointerFromPTag);
+    return processTags(getListTags(list, type), (t) => (isPTag(t) ? t : undefined), (t) => getProfilePointerFromPTag(t) ?? undefined);
 }
 /**
  * Returns a deduplicated array of all 'relay' tags in a list or set

package/dist/helpers/reaction.js

@@ -25,10 +25,12 @@ export function getReactionEventPointer(event) {
             const p = event.tags.find(isPTag);
             if (p) {
                 const author = getProfilePointerFromPTag(p);
-                pointer.author = author.pubkey;
-                // Copy relay hints from "p" tag
-                if (author.relays)
-                    pointer.relays = mergeRelaySets(author.relays, pointer.relays);
+                if (author) {
+                    pointer.author = author.pubkey;
+                    // Copy relay hints from "p" tag
+                    if (author.relays)
+                        pointer.relays = mergeRelaySets(author.relays, pointer.relays);
+                }
             }
         }
         return pointer;
@@ -47,9 +49,11 @@ export function getReactionAddressPointer(event) {
         const p = event.tags.find(isPTag);
         if (p) {
             const author = getProfilePointerFromPTag(p);
-            // Copy relay hints from "p" tag
-            if (author.relays)
-                pointer.relays = mergeRelaySets(author.relays, pointer.relays);
+            if (author && author.pubkey === pointer.pubkey) {
+                // Copy relay hints from "p" tag
+                if (author.relays)
+                    pointer.relays = mergeRelaySets(author.relays, pointer.relays);
+            }
         }
         return pointer;
     });

package/dist/helpers/share.js

@@ -15,9 +15,9 @@ export function getSharedEventPointer(event) {
         const kStr = getTagValue(event, "k");
         const k = kStr ? parseInt(kStr) : undefined;
         const pointer = getEventPointerFromETag(e);
-        if (k !== undefined)
+        if (pointer && k !== undefined)
             pointer.kind = k;
-        return pointer;
+        return pointer ?? undefined;
     });
 }
 /** Returns the address pointer of a kind 6 or 16 share event */
@@ -26,7 +26,7 @@ export function getSharedAddressPointer(event) {
         const a = event.tags.find(isATag);
         if (!a)
             return undefined;
-        return getAddressPointerFromATag(a);
+        return getAddressPointerFromATag(a) ?? undefined;
     });
 }
 /** Returns the stringified event in the content of a kind 6 or 16 share event */

package/dist/helpers/stream-chat.js

@@ -5,5 +5,5 @@ export function getStreamChatMessageStream(message) {
     const tag = message.tags.find(isATag);
     if (!tag)
         return undefined;
-    return getAddressPointerFromATag(tag);
+    return getAddressPointerFromATag(tag) ?? undefined;
 }

package/dist/helpers/stream.js

@@ -1,7 +1,7 @@
 import { getTagValue } from "applesauce-core/helpers/event";
 import { addRelayHintsToPointer, getEventPointerFromETag, getProfilePointerFromPTag, } from "applesauce-core/helpers/pointers";
 import { mergeRelaySets } from "applesauce-core/helpers/relays";
-import { isPTag } from "applesauce-core/helpers/tags";
+import { isPTag, processTags } from "applesauce-core/helpers/tags";
 import { unixNow } from "applesauce-core/helpers/time";
 export function getStreamTitle(stream) {
     return getTagValue(stream, "title");
@@ -25,20 +25,26 @@ export function getStreamHost(stream) {
     let host = undefined;
     for (const tag of stream.tags) {
         if (isPTag(tag) && (!host || (tag[3] && tag[3].toLowerCase() === "host"))) {
-            host = getProfilePointerFromPTag(tag);
+            host = getProfilePointerFromPTag(tag) ?? undefined;
         }
     }
     return host || { pubkey: stream.pubkey };
 }
 /** Returns the participants of a stream */
 export function getStreamParticipants(stream) {
-    return stream.tags
-        .filter((t) => isPTag(t) && t[3])
-        .map((t) => ({ ...getProfilePointerFromPTag(t), role: t[3].toLowerCase() }));
+    return processTags(stream.tags, (t) => (isPTag(t) && t[3] ? t : undefined), (t) => {
+        const pointer = getProfilePointerFromPTag(t);
+        if (!pointer)
+            return undefined;
+        return { ...pointer, role: t[3].toLowerCase() };
+    });
 }
 export function getStreamGoalPointer(stream) {
     const goalTag = stream.tags.find((t) => t[0] === "goal");
-    return goalTag && addRelayHintsToPointer(getEventPointerFromETag(goalTag), getStreamRelays(stream));
+    const pointer = goalTag ? getEventPointerFromETag(goalTag) : undefined;
+    if (!pointer)
+        return undefined;
+    return addRelayHintsToPointer(pointer, getStreamRelays(stream));
 }
 /** Gets all the streaming urls for a stream */
 export function getStreamStreamingURLs(stream) {

package/dist/helpers/user-status.js

@@ -3,14 +3,23 @@ import { getAddressPointerFromATag, getEventPointerFromETag, getProfilePointerFr
 export const UserStatusPointerSymbol = Symbol.for("user-status-pointer");
 function getStatusPointer(status) {
     const pTag = status.tags.find((t) => t[0] === "p" && t[1]);
-    if (pTag)
-        return { type: "nprofile", data: getProfilePointerFromPTag(pTag) };
+    if (pTag) {
+        const pointer = getProfilePointerFromPTag(pTag);
+        if (pointer)
+            return { type: "nprofile", data: pointer };
+    }
     const eTag = status.tags.find((t) => t[0] === "e" && t[1]);
-    if (eTag)
-        return { type: "nevent", data: getEventPointerFromETag(eTag) };
+    if (eTag) {
+        const pointer = getEventPointerFromETag(eTag);
+        if (pointer)
+            return { type: "nevent", data: pointer };
+    }
     const aTag = status.tags.find((t) => t[0] === "a" && t[1]);
-    if (aTag)
-        return { type: "naddr", data: getAddressPointerFromATag(aTag) };
+    if (aTag) {
+        const pointer = getAddressPointerFromATag(aTag);
+        if (pointer)
+            return { type: "naddr", data: pointer };
+    }
     const rTag = status.tags.find((t) => t[0] === "r" && t[1]);
     if (rTag)
         return { type: "url", data: rTag[1] };

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export * as Helpers from "./helpers/index.js";
 export * as Models from "./models/index.js";
 export * as Operations from "./operations/index.js";
 export * as Blueprints from "./blueprints/index.js";
+export * as Observable from "./observable/index.js";
 import "./register.js";

package/dist/index.js

@@ -2,5 +2,6 @@ export * as Helpers from "./helpers/index.js";
 export * as Models from "./models/index.js";
 export * as Operations from "./operations/index.js";
 export * as Blueprints from "./blueprints/index.js";
+export * as Observable from "./observable/index.js";
 // Register the common models and blueprints with the event store and event factory
 import "./register.js";

package/dist/models/calendar.js

@@ -1,6 +1,6 @@
 import { getReplaceableAddress } from "applesauce-core/helpers/event";
 import { defined } from "applesauce-core/observable";
-import { combineLatest } from "rxjs";
+import { combineLatest, EMPTY } from "rxjs";
 import { CALENDAR_EVENT_RSVP_KIND } from "../helpers/calendar-rsvp.js";
 import { getCalendarAddressPointers } from "../helpers/calendar.js";
 /** A model that gets all the events for a calendar */
@@ -10,6 +10,9 @@ export function CalendarEventsModel(calendar) {
 /** A model that gets all the RSVPs for a calendar event */
 export function CalendarEventRSVPsModel(event) {
     return (events) => {
-        return events.timeline({ kinds: [CALENDAR_EVENT_RSVP_KIND], "#a": [getReplaceableAddress(event)] });
+        const address = getReplaceableAddress(event);
+        if (!address)
+            return EMPTY;
+        return events.timeline({ kinds: [CALENDAR_EVENT_RSVP_KIND], "#a": [address] });
     };
 }

package/dist/models/comments.js

@@ -1,15 +1,9 @@
-import { getReplaceableAddress, isAddressableKind } from "applesauce-core/helpers/event";
-import { COMMENT_KIND } from "../helpers/comment.js";
-// Import EventModels as a value (class) to modify its prototype
 import { EventModels } from "applesauce-core/event-store";
+import { buildCommonEventRelationFilters } from "applesauce-core/helpers/model";
+import { COMMENT_KIND } from "../helpers/comment.js";
 /** A model that returns all NIP-22 comment replies for the event */
 export function CommentsModel(parent) {
-    return (events) => {
-        const filters = [{ kinds: [COMMENT_KIND], "#e": [parent.id] }];
-        if (isAddressableKind(parent.kind))
-            filters.push({ kinds: [COMMENT_KIND], "#a": [getReplaceableAddress(parent)] });
-        return events.timeline(filters);
-    };
+    return (events) => events.timeline(buildCommonEventRelationFilters({ kinds: [COMMENT_KIND] }, parent));
 }
 // Register this model with EventModels
 EventModels.prototype.comments = function (event) {

package/dist/models/index.d.ts

@@ -12,4 +12,6 @@ export * from "./user-status.js";
 export * from "./wrapped-messages.js";
 export * from "./zaps.js";
 export * from "./gift-wrap.js";
+export * from "./relays.js";
+export * from "./stream.js";
 import "../register.js";

package/dist/models/index.js

@@ -12,5 +12,7 @@ export * from "./user-status.js";
 export * from "./wrapped-messages.js";
 export * from "./zaps.js";
 export * from "./gift-wrap.js";
+export * from "./relays.js";
+export * from "./stream.js";
 // Register the common models with the event store
 import "../register.js";

package/dist/models/pins.js

@@ -6,5 +6,5 @@ import { map } from "rxjs/operators";
 export function UserPinnedModel(pubkey) {
     return (events) => events
         .replaceable(kinds.Pinlist, pubkey)
-        .pipe(map((event) => event && processTags(event.tags.filter(isETag), getEventPointerFromETag)));
+        .pipe(map((event) => event && processTags(event.tags.filter(isETag), (t) => getEventPointerFromETag(t) ?? undefined)));
 }

package/dist/models/reactions.d.ts

@@ -1,5 +1,5 @@
-import { NostrEvent } from "applesauce-core/helpers/event";
 import { Model } from "applesauce-core/event-store";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { type Observable } from "rxjs";
 /** A model that returns all reactions to an event (supports replaceable events) */
 export declare function ReactionsModel(event: NostrEvent): Model<NostrEvent[]>;

package/dist/models/reactions.js

@@ -1,19 +1,9 @@
-import { getEventUID, isReplaceable, kinds } from "applesauce-core/helpers/event";
-// Import EventModels as a value (class) to modify its prototype
 import { EventModels } from "applesauce-core/event-store";
+import { kinds } from "applesauce-core/helpers/event";
+import { buildCommonEventRelationFilters } from "applesauce-core/helpers/model";
 /** A model that returns all reactions to an event (supports replaceable events) */
 export function ReactionsModel(event) {
-    return (events) => events.timeline(isReplaceable(event.kind)
-        ? [
-            { kinds: [kinds.Reaction], "#e": [event.id] },
-            { kinds: [kinds.Reaction], "#a": [getEventUID(event)] },
-        ]
-        : [
-            {
-                kinds: [kinds.Reaction],
-                "#e": [event.id],
-            },
-        ]);
+    return (events) => events.timeline(buildCommonEventRelationFilters({ kinds: [kinds.Reaction] }, event));
 }
 // Register this model with EventModels
 EventModels.prototype.reactions = function (event) {

package/dist/models/relays.d.ts

@@ -0,0 +1,27 @@
+import { Model } from "applesauce-core/event-store";
+import { AddressPointer } from "applesauce-core/helpers/pointers";
+import { ReadListTags } from "../helpers/lists.js";
+/**
+ * A model that returns all favorite relays for a pubkey
+ * @param pubkey - The pubkey to get the favorite relays for
+ * @param type - Which types of tags to read
+ */
+export declare function FavoriteRelaysModel(pubkey: string, type?: ReadListTags): Model<string[] | undefined>;
+/**
+ * A model that returns all favorite relay sets for a pubkey
+ * @param pubkey - The pubkey to get the favorite relay sets for
+ * @param type - Which types of tags to read
+ */
+export declare function FavoriteRelaySetsModel(pubkey: string, type?: ReadListTags): Model<AddressPointer[] | undefined>;
+/**
+ * A model that returns all search relays for a pubkey
+ * @param pubkey - The pubkey to get the search relays for
+ * @param type - Which types of tags to read
+ */
+export declare function SearchRelaysModel(pubkey: string, type?: ReadListTags): Model<string[] | undefined>;
+/**
+ * A model that returns all blocked relays for a pubkey
+ * @param pubkey - The pubkey to get the blocked relays for
+ * @param type - Which types of tags to read
+ */
+export declare function BlockedRelaysModel(pubkey: string, type?: ReadListTags): Model<string[] | undefined>;

package/dist/models/relays.js

@@ -0,0 +1,36 @@
+import { kinds } from "applesauce-core/helpers/event";
+import { watchEventUpdates } from "applesauce-core/observable";
+import { identity, map } from "rxjs";
+import { FAVORITE_RELAYS_KIND, getAddressPointersFromList, getRelaysFromList } from "../helpers/lists.js";
+/**
+ * A model that returns all favorite relays for a pubkey
+ * @param pubkey - The pubkey to get the favorite relays for
+ * @param type - Which types of tags to read
+ */
+export function FavoriteRelaysModel(pubkey, type) {
+    return (events) => events.replaceable(FAVORITE_RELAYS_KIND, pubkey).pipe(type !== "public" ? watchEventUpdates(events) : map(identity), map((e) => e && getRelaysFromList(e, type)));
+}
+/**
+ * A model that returns all favorite relay sets for a pubkey
+ * @param pubkey - The pubkey to get the favorite relay sets for
+ * @param type - Which types of tags to read
+ */
+export function FavoriteRelaySetsModel(pubkey, type) {
+    return (events) => events.replaceable(FAVORITE_RELAYS_KIND, pubkey).pipe(type !== "public" ? watchEventUpdates(events) : map(identity), map((e) => e && getAddressPointersFromList(e, type)));
+}
+/**
+ * A model that returns all search relays for a pubkey
+ * @param pubkey - The pubkey to get the search relays for
+ * @param type - Which types of tags to read
+ */
+export function SearchRelaysModel(pubkey, type) {
+    return (events) => events.replaceable(kinds.SearchRelaysList, pubkey).pipe(type !== "public" ? watchEventUpdates(events) : map(identity), map((e) => e && getRelaysFromList(e, type)));
+}
+/**
+ * A model that returns all blocked relays for a pubkey
+ * @param pubkey - The pubkey to get the blocked relays for
+ * @param type - Which types of tags to read
+ */
+export function BlockedRelaysModel(pubkey, type) {
+    return (events) => events.replaceable(kinds.BlockedRelaysList, pubkey).pipe(type !== "public" ? watchEventUpdates(events) : map(identity), map((e) => e && getRelaysFromList(e, type)));
+}

package/dist/models/stream.d.ts

@@ -0,0 +1,4 @@
+import { Model } from "applesauce-core/event-store";
+import { AddressPointer, NostrEvent } from "applesauce-core/helpers";
+/** A model that returns all chat messages for a stream */
+export declare function StreamChatMessagesModel(stream: AddressPointer | NostrEvent): Model<NostrEvent[]>;

package/dist/models/stream.js

@@ -0,0 +1,6 @@
+import { kinds } from "applesauce-core/helpers/event";
+import { buildCommonEventRelationFilters } from "applesauce-core/helpers/model";
+/** A model that returns all chat messages for a stream */
+export function StreamChatMessagesModel(stream) {
+    return (events) => events.timeline(buildCommonEventRelationFilters({ kinds: [kinds.LiveChatMessage] }, stream));
+}

package/dist/models/thread.js

@@ -1,6 +1,6 @@
 import { createReplaceableAddress, getEventUID, isEvent, kinds } from "applesauce-core/helpers/event";
 import { getTagValue } from "applesauce-core/helpers/event";
-import { getCoordinateFromAddressPointer, isAddressPointer, isEventPointer, } from "applesauce-core/helpers/pointers";
+import { getReplaceableAddressFromPointer, isAddressPointer, isEventPointer, } from "applesauce-core/helpers/pointers";
 import { isAddressableKind } from "applesauce-core/helpers/event";
 import { map } from "rxjs/operators";
 import { COMMENT_KIND } from "../helpers/comment.js";
@@ -19,7 +19,7 @@ export function ThreadModel(root, opts) {
     const rootFilter = {};
     const replyFilter = { kinds };
     if (isAddressPointer(root)) {
-        rootUID = getCoordinateFromAddressPointer(root);
+        rootUID = getReplaceableAddressFromPointer(root);
         rootFilter.kinds = [root.kind];
         rootFilter.authors = [root.pubkey];
         rootFilter["#d"] = [root.identifier];
@@ -45,7 +45,7 @@ export function ThreadModel(root, opts) {
             }
             // add item to parent
             if (refs.reply?.e || refs.reply?.a) {
-                let uid = refs.reply.e ? refs.reply.e.id : getCoordinateFromAddressPointer(refs.reply.a);
+                let uid = refs.reply.e ? refs.reply.e.id : getReplaceableAddressFromPointer(refs.reply.a);
                 item.parent = items.get(uid);
                 if (item.parent) {
                     item.parent.replies.add(item);

package/dist/models/zaps.d.ts

@@ -1,8 +1,9 @@
 import { Model } from "applesauce-core/event-store";
-import { KnownEvent, kinds } from "applesauce-core/helpers/event";
+import { NostrEvent } from "applesauce-core/helpers";
+import { kinds, KnownEvent } from "applesauce-core/helpers/event";
 import { AddressPointer, EventPointer } from "applesauce-core/helpers/pointers";
 /** A model that gets all zap events for an event */
-export declare function EventZapsModel(id: string | EventPointer | AddressPointer): Model<KnownEvent<kinds.Zap>[]>;
+export declare function EventZapsModel(pointer: string | EventPointer | AddressPointer | NostrEvent): Model<KnownEvent<kinds.Zap>[]>;
 /** A model that returns all zaps sent by a user */
 export declare function SentZapsModel(pubkey: string): Model<KnownEvent<kinds.Zap>[]>;
 /** A model that returns all zaps received by a user */

package/dist/models/zaps.js

@@ -1,20 +1,12 @@
 import { kinds } from "applesauce-core/helpers/event";
-import { getCoordinateFromAddressPointer, isAddressPointer, } from "applesauce-core/helpers/pointers";
+import { buildCommonEventRelationFilters } from "applesauce-core/helpers/model";
 import { map } from "rxjs";
 import { isValidZap } from "../helpers/zap.js";
 /** A model that gets all zap events for an event */
-export function EventZapsModel(id) {
-    return (events) => {
-        if (isAddressPointer(id)) {
-            return events
-                .timeline([{ kinds: [kinds.Zap], "#a": [getCoordinateFromAddressPointer(id)] }])
-                .pipe(map((events) => events.filter(isValidZap)));
-        }
-        else {
-            id = typeof id === "string" ? id : id.id;
-            return events.timeline([{ kinds: [kinds.Zap], "#e": [id] }]).pipe(map((events) => events.filter(isValidZap)));
-        }
-    };
+export function EventZapsModel(pointer) {
+    return (events) => events
+        .timeline(buildCommonEventRelationFilters({ kinds: [kinds.Zap] }, pointer))
+        .pipe(map((events) => events.filter(isValidZap)));
 }
 /** A model that returns all zaps sent by a user */
 export function SentZapsModel(pubkey) {

package/dist/observable/filter-timeline-by-mutes.d.ts

@@ -0,0 +1,6 @@
+import { IAsyncEventStore, IEventModelMixin, IEventStore } from "applesauce-core";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { ProfilePointer } from "applesauce-core/helpers/pointers";
+import { MonoTypeOperatorFunction } from "rxjs";
+/** Filters a timeline of events by a users mutes */
+export declare function filterTimelineByMutes<T extends NostrEvent>(eventStore: IEventModelMixin<IEventStore | IAsyncEventStore>, user: string | ProfilePointer): MonoTypeOperatorFunction<T[]>;

package/dist/observable/filter-timeline-by-mutes.js

@@ -0,0 +1,7 @@
+import { combineLatest, map } from "rxjs";
+import { matchMutes } from "../helpers/mute.js";
+import { MuteModel } from "../models/mutes.js";
+/** Filters a timeline of events by a users mutes */
+export function filterTimelineByMutes(eventStore, user) {
+    return (source) => combineLatest([source, eventStore.model(MuteModel, user)]).pipe(map(([source, mutes]) => (mutes ? source.filter((event) => matchMutes(mutes, event)) : source)));
+}

package/dist/observable/index.d.ts

@@ -0,0 +1 @@
+export * from "./filter-timeline-by-mutes.js";

package/dist/observable/index.js

@@ -0,0 +1 @@
+export * from "./filter-timeline-by-mutes.js";

package/dist/operations/calendar-rsvp.js

@@ -16,6 +16,8 @@ export function setCalendarEvent(pointer, relay) {
     if (pointer.kind !== DATE_BASED_CALENDAR_EVENT_KIND && pointer.kind !== TIME_BASED_CALENDAR_EVENT_KIND)
         throw new Error("RSVP pointer must be to a calendar event");
     let addressPointer = isAddressPointer(pointer) ? pointer : getAddressPointerForEvent(pointer);
+    if (addressPointer === null)
+        throw new Error("Calendar event is not addressable");
     let eventPointer = isAddressPointer(pointer)
         ? undefined
         : { id: pointer.id, kind: pointer.kind, author: pointer.pubkey };

package/dist/operations/calendar.js

@@ -1,4 +1,3 @@
-import { getAddressPointerForEvent, isAddressPointer } from "applesauce-core/helpers/pointers";
 import { addAddressPointerTag, removeAddressPointerTag } from "applesauce-core/operations/tag/common";
 import { includeSingletonTag, modifyPublicTags } from "applesauce-core/operations/tags";
 /** Sets the title of a calendar */
@@ -7,9 +6,9 @@ export function setTitle(title) {
 }
 /** Adds a calendar event tags to a calendar event */
 export function addEvent(event) {
-    return modifyPublicTags(addAddressPointerTag(isAddressPointer(event) ? event : getAddressPointerForEvent(event)));
+    return modifyPublicTags(addAddressPointerTag(event));
 }
 /** Removes a calendar event tags from a calendar event */
 export function removeEvent(event) {
-    return modifyPublicTags(removeAddressPointerTag(isAddressPointer(event) ? event : getAddressPointerForEvent(event)));
+    return modifyPublicTags(removeAddressPointerTag(event));
 }

package/dist/operations/client.js

@@ -1,5 +1,5 @@
 import { kinds } from "applesauce-core/helpers/event";
-import { getCoordinateFromAddressPointer } from "applesauce-core/helpers/pointers";
+import { getReplaceableAddressFromPointer } from "applesauce-core/helpers/pointers";
 import { fillAndTrimTag } from "applesauce-core/helpers/tags";
 import { includeSingletonTag } from "applesauce-core/operations/tags";
 // A list of event kinds to never attach the "client" tag to
@@ -11,7 +11,7 @@ export function setClient(name, pointer, replace = true) {
             return draft;
         else {
             const coordinate = pointer
-                ? getCoordinateFromAddressPointer({
+                ? getReplaceableAddressFromPointer({
                     pubkey: pointer.pubkey,
                     identifier: pointer.identifier,
                     kind: kinds.Handlerinformation,

package/dist/operations/highlight.js

@@ -10,18 +10,34 @@ export function setHighlightContent(content) {
 /** Sets the source event that was highlighted using an 'e' tag */
 export function setSource(source) {
     if (isEvent(source)) {
-        if (isReplaceable(source.kind))
-            return modifyPublicTags(addEventPointerTag(source, true), addAddressPointerTag(getAddressPointerForEvent(source), true));
-        else
+        if (isReplaceable(source.kind)) {
+            const address = getAddressPointerForEvent(source);
+            if (address) {
+                // Include both the event pointer and address pointer
+                return modifyPublicTags(addEventPointerTag(source, true), addAddressPointerTag(address, true));
+            }
+            else {
+                // Just include the event pointer
+                return modifyPublicTags(addEventPointerTag(source, true));
+            }
+        }
+        else {
+            // Include the event pointer for normal events
             return modifyPublicTags(addEventPointerTag(source, true));
+        }
     }
     else if (isAddressPointer(source)) {
+        // Include "a" tag for address pointers
         return modifyPublicTags(addAddressPointerTag(source, true));
     }
-    else if (isEventPointer(source))
+    else if (isEventPointer(source)) {
+        // Include "e" tag for event pointers
         return modifyPublicTags(addEventPointerTag(source, true));
-    else if (typeof source === "string")
+    }
+    else if (typeof source === "string") {
+        // Include "r" tags for URLs
         return includeSingletonTag(["r", source]);
+    }
     else
         throw new Error("Invalid source");
 }

package/dist/operations/live-stream.js

@@ -3,9 +3,15 @@ import { getAddressPointerForEvent } from "applesauce-core/helpers/pointers";
 /** Includes the "a" tag for live streams */
 export function includeLiveStreamTag(stream) {
     return async (draft, ctx) => {
-        let tags = Array.from(draft.tags);
-        const hint = await ctx.getEventRelayHint?.(stream.id);
-        tags = ensureMarkedAddressPointerTag(tags, getAddressPointerForEvent(stream, hint ? [hint] : undefined), "root");
-        return { ...draft, tags };
+        const pointer = getAddressPointerForEvent(stream);
+        if (!pointer)
+            throw new Error("Stream is not addressable");
+        // add relay hint if there isn't one
+        if (pointer.relays?.[0] === undefined && ctx.getEventRelayHint) {
+            const hint = await ctx.getEventRelayHint(stream.id);
+            if (hint)
+                pointer.relays = [hint];
+        }
+        return { ...draft, tags: ensureMarkedAddressPointerTag(draft.tags, pointer, "root") };
     };
 }

package/dist/operations/share.js

@@ -12,7 +12,9 @@ export function setShareTags(event) {
         tags = ensureEventPointerTag(tags, getEventPointerForEvent(event, hint ? [hint] : undefined));
         // add "a" tag
         if (isAddressableKind(event.kind)) {
-            tags = ensureAddressPointerTag(tags, getAddressPointerForEvent(event, hint ? [hint] : undefined));
+            const pointer = getAddressPointerForEvent(event, hint ? [hint] : undefined);
+            if (pointer)
+                tags = ensureAddressPointerTag(tags, pointer);
         }
         // add "p" tag for notify
         const pubkeyHint = await ctx.getPubkeyRelayHint?.(event.pubkey);

package/dist/operations/stream-chat.d.ts

@@ -1,7 +1,8 @@
+import { EventOperation } from "applesauce-core";
 import { NostrEvent } from "applesauce-core/helpers/event";
 import { AddressPointer } from "applesauce-core/helpers/pointers";
 import { TextContentOptions } from "applesauce-core/operations/content";
 /** Sets the message content for a stream chat event */
-export declare function setMessage(content: string, options?: TextContentOptions): import("applesauce-core").EventOperation;
+export declare function setMessage(content: string, options?: TextContentOptions): EventOperation;
 /** Sets the stream for a stream chat event */
-export declare function setStream(stream: AddressPointer | NostrEvent): import("applesauce-core").EventOperation<import("nostr-tools").Event | import("nostr-tools/core").UnsignedEvent | import("nostr-tools/core").EventTemplate, import("nostr-tools").Event | import("nostr-tools/core").UnsignedEvent | import("nostr-tools/core").EventTemplate>;
+export declare function setStream(stream: AddressPointer | NostrEvent): EventOperation;

package/dist/operations/stream-chat.js

@@ -21,7 +21,12 @@ export function setMessage(content, options) {
 }
 /** Sets the stream for a stream chat event */
 export function setStream(stream) {
+    let pointer;
     if (!isAddressPointer(stream))
-        stream = getAddressPointerForEvent(stream);
-    return modifyPublicTags((tags) => ensureAddressPointerTag(tags, stream));
+        pointer = getAddressPointerForEvent(stream);
+    else
+        pointer = stream;
+    if (pointer === null)
+        throw new Error("Stream is not an addressable event");
+    return modifyPublicTags((tags) => ensureAddressPointerTag(tags, pointer));
 }

package/dist/operations/tag/bookmarks.js

@@ -1,4 +1,4 @@
-import { isReplaceable } from "applesauce-core/helpers";
+import { tagPipe } from "applesauce-core/helpers";
 import { kinds } from "applesauce-core/helpers/event";
 import { getAddressPointerForEvent } from "applesauce-core/helpers/pointers";
 import { addAddressPointerTag, addEventPointerTag, removeAddressPointerTag, removeEventPointerTag, } from "applesauce-core/operations/tag/common";
@@ -6,15 +6,17 @@ import { addAddressPointerTag, addEventPointerTag, removeAddressPointerTag, remo
 export function addEventBookmarkTag(event) {
     if (event.kind !== kinds.ShortTextNote && event.kind !== kinds.LongFormArticle)
         throw new Error(`Event kind (${event.kind}) cant not be added to bookmarks`);
-    return isReplaceable(event.kind)
-        ? addAddressPointerTag(getAddressPointerForEvent(event))
-        : addEventPointerTag(event.id);
+    const address = getAddressPointerForEvent(event);
+    return address ? addAddressPointerTag(address) : addEventPointerTag(event.id);
 }
 /** Removes an "e" or "a" tag from a bookmark list or set */
 export function removeEventBookmarkTag(event) {
     if (event.kind !== kinds.ShortTextNote && event.kind !== kinds.LongFormArticle)
         throw new Error(`Event kind (${event.kind}) cant not be added to bookmarks`);
-    return isReplaceable(event.kind)
-        ? removeAddressPointerTag(getAddressPointerForEvent(event))
-        : removeEventPointerTag(event.id);
+    const address = getAddressPointerForEvent(event);
+    return tagPipe(
+    // Remove address pointer if it exists
+    address ? removeAddressPointerTag(address) : undefined, 
+    // Always remove event pointer
+    removeEventPointerTag(event.id));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-common",
-  "version": "0.0.0-next-20251205152544",
+  "version": "0.0.0-next-20251209200210",
   "description": "Common NIP-specific helpers and models for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -59,23 +59,38 @@
       "import": "./dist/blueprints/*.js",
       "require": "./dist/blueprints/*.js",
       "types": "./dist/blueprints/*.d.ts"
+    },
+    "./observable": {
+      "import": "./dist/observable/index.js",
+      "require": "./dist/observable/index.js",
+      "types": "./dist/observable/index.d.ts"
+    },
+    "./observable/*": {
+      "import": "./dist/observable/*.js",
+      "require": "./dist/observable/*.js",
+      "types": "./dist/observable/*.d.ts"
     }
   },
   "dependencies": {
     "@scure/base": "^1.2.4",
-    "applesauce-core": "0.0.0-next-20251205152544",
+    "applesauce-core": "0.0.0-next-20251209200210",
     "hash-sum": "^2.0.0",
     "light-bolt11-decoder": "^3.2.0",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
+    "@nostrability/schemata": "github:nostrability/schemata",
     "@types/debug": "^4.1.12",
     "@types/hash-sum": "^1.0.2",
+    "@types/node": "^22.19.1",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
     "nostr-tools": "^2.18",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "vitest": "^4.0.15"
+    "vitest": "^4.0.15",
+    "yaml": "^2.8.2"
   },
   "funding": {
     "type": "lightning",