applesauce-core 0.0.0-next-20250423151245 → 0.0.0-next-20250424151127

package/dist/event-store/database.js

@@ -1,6 +1,6 @@
 import { binarySearch, insertEventIntoDescendingList } from "nostr-tools/utils";
 import { Subject } from "rxjs";
-import { getEventUID, getIndexableTags, getReplaceableUID, isReplaceable } from "../helpers/event.js";
+import { getEventUID, getIndexableTags, createReplaceableAddress, isReplaceable } from "../helpers/event.js";
 import { INDEXABLE_TAGS } from "./common.js";
 import { logger } from "../logger.js";
 import { LRU } from "../helpers/lru.js";
@@ -73,12 +73,12 @@ export class Database {
     }
     /** Checks if the database contains a replaceable event without touching it */
     hasReplaceable(kind, pubkey, d) {
-        const events = this.replaceable.get(getReplaceableUID(kind, pubkey, d));
+        const events = this.replaceable.get(createReplaceableAddress(kind, pubkey, d));
         return !!events && events.length > 0;
     }
     /** Gets an array of replaceable events */
     getReplaceable(kind, pubkey, d) {
-        return this.replaceable.get(getReplaceableUID(kind, pubkey, d));
+        return this.replaceable.get(createReplaceableAddress(kind, pubkey, d));
     }
     /** Inserts an event into the database and notifies all subscriptions */
     addEvent(event) {

package/dist/event-store/event-store.js

@@ -1,9 +1,9 @@
 import { kinds } from "nostr-tools";
 import { insertEventIntoDescendingList } from "nostr-tools/utils";
-import { isParameterizedReplaceableKind } from "nostr-tools/kinds";
+import { isAddressableKind } from "nostr-tools/kinds";
 import { defer, distinctUntilChanged, EMPTY, endWith, filter, finalize, from, map, merge, mergeMap, mergeWith, of, repeat, scan, take, takeUntil, tap, } from "rxjs";
 import { Database } from "./database.js";
-import { FromCacheSymbol, getEventUID, getReplaceableIdentifier, getReplaceableUID, getTagValue, isReplaceable, } from "../helpers/event.js";
+import { FromCacheSymbol, getEventUID, getReplaceableIdentifier, createReplaceableAddress, getTagValue, isReplaceable, } from "../helpers/event.js";
 import { matchFilters } from "../helpers/filter.js";
 import { addSeenRelay, getSeenRelays } from "../helpers/relays.js";
 import { getDeleteCoordinates, getDeleteIds } from "../helpers/delete.js";
@@ -54,7 +54,7 @@ export class EventStore {
         else {
             if (this.deletedIds.has(event.id))
                 return true;
-            if (isParameterizedReplaceableKind(event.kind)) {
+            if (isAddressableKind(event.kind)) {
                 const deleted = this.deletedCoords.get(getEventUID(event));
                 if (deleted)
                     return deleted > event.created_at;
@@ -295,7 +295,7 @@ export class EventStore {
     }
     /** Creates an observable that subscribes to the latest version of an array of replaceable events*/
     replaceableSet(pointers) {
-        const uids = new Set(pointers.map((p) => getReplaceableUID(p.kind, p.pubkey, p.identifier)));
+        const uids = new Set(pointers.map((p) => createReplaceableAddress(p.kind, p.pubkey, p.identifier)));
         return merge(
         // start with existing events
         defer(() => from(pointers.map((p) => this.getReplaceable(p.kind, p.pubkey, p.identifier)))), 

package/dist/helpers/__tests__/bookmarks.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/helpers/__tests__/bookmarks.test.js

@@ -0,0 +1,88 @@
+import { describe, it, expect } from "vitest";
+import { kinds } from "nostr-tools";
+import { mergeBookmarks } from "../bookmarks.js";
+describe("mergeBookmarks", () => {
+    it("should merge bookmarks and handle duplicates", () => {
+        // Create test data with some duplicates
+        const eventPointer1 = {
+            id: "event1",
+            relays: ["wss://relay1.com/", "wss://relay2.com/"],
+            author: "author1",
+        };
+        const eventPointer2 = {
+            id: "event1", // Same ID as eventPointer1
+            relays: ["wss://relay2.com/", "wss://relay3.com/"],
+            author: "author1",
+        };
+        const eventPointer3 = {
+            id: "event2",
+            relays: ["wss://relay1.com/"],
+            author: "author2",
+        };
+        const addressPointer1 = {
+            kind: kinds.LongFormArticle,
+            pubkey: "pubkey1",
+            identifier: "article1",
+            relays: ["wss://relay1.com/", "wss://relay2.com/"],
+        };
+        const addressPointer2 = {
+            kind: kinds.LongFormArticle,
+            pubkey: "pubkey1",
+            identifier: "article1", // Same as addressPointer1
+            relays: ["wss://relay3.com/"],
+        };
+        const bookmark1 = {
+            notes: [eventPointer1],
+            articles: [addressPointer1],
+            hashtags: ["tag1", "tag2"],
+            urls: ["https://example1.com/"],
+        };
+        const bookmark2 = {
+            notes: [eventPointer2, eventPointer3],
+            articles: [addressPointer2],
+            hashtags: ["tag2", "tag3"],
+            urls: ["https://example1.com/", "https://example2.com/"],
+        };
+        const result = mergeBookmarks(bookmark1, bookmark2);
+        // Check that duplicates are properly merged
+        expect(result.notes).toHaveLength(2); // event1 should be merged, plus event2
+        expect(result.articles).toHaveLength(1); // article1 should be merged
+        expect(result.hashtags).toHaveLength(3); // unique tags
+        expect(result.urls).toHaveLength(2); // unique urls
+        // Check that relays are merged for duplicate event
+        const mergedEvent = result.notes.find((note) => note.id === "event1");
+        expect(mergedEvent?.relays).toHaveLength(3);
+        expect(mergedEvent?.relays).toContain("wss://relay1.com/");
+        expect(mergedEvent?.relays).toContain("wss://relay2.com/");
+        expect(mergedEvent?.relays).toContain("wss://relay3.com/");
+        // Check that relays are merged for duplicate article
+        const mergedArticle = result.articles[0];
+        expect(mergedArticle.relays).toHaveLength(3);
+        expect(mergedArticle.relays).toContain("wss://relay1.com/");
+        expect(mergedArticle.relays).toContain("wss://relay2.com/");
+        expect(mergedArticle.relays).toContain("wss://relay3.com/");
+        // Check that hashtags are unique
+        expect(result.hashtags).toContain("tag1");
+        expect(result.hashtags).toContain("tag2");
+        expect(result.hashtags).toContain("tag3");
+        // Check that urls are unique
+        expect(result.urls).toContain("https://example1.com/");
+        expect(result.urls).toContain("https://example2.com/");
+    });
+    it("should handle undefined bookmarks", () => {
+        const bookmark = {
+            notes: [{ id: "event1", relays: ["wss://relay1.com/"] }],
+            articles: [],
+            hashtags: ["tag1"],
+            urls: ["https://example.com/"],
+        };
+        const result = mergeBookmarks(bookmark, undefined);
+        expect(result).toEqual(bookmark);
+        expect(mergeBookmarks(undefined, undefined)).toEqual({
+            notes: [],
+            articles: [],
+            hashtags: [],
+            urls: [],
+        });
+    });
+});

package/dist/helpers/__tests__/contacts.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/helpers/__tests__/contacts.test.js

@@ -0,0 +1,34 @@
+import { describe, it, expect } from "vitest";
+import { mergeContacts } from "../contacts.js";
+describe("mergeContacts", () => {
+    it("should merge contacts and remove duplicates", () => {
+        // Create some test profile pointers
+        const pointer1 = { pubkey: "pubkey1", relays: ["relay1"] };
+        const pointer2 = { pubkey: "pubkey2" }; // No relays
+        const pointer3 = { pubkey: "pubkey3", relays: ["relay3"] };
+        const pointer4 = { pubkey: "pubkey1" }; // Duplicate pubkey without relays
+        // Test merging arrays of pointers
+        const result1 = mergeContacts([pointer1, pointer2], [pointer3, pointer4]);
+        // Should have 3 unique pubkeys
+        expect(result1.length).toBe(3);
+        // Check that the duplicate was handled correctly (last one should win)
+        const pubkey1Entry = result1.find((p) => p.pubkey === "pubkey1");
+        expect(pubkey1Entry).toBeDefined();
+        expect(pubkey1Entry?.relays).toBeUndefined();
+        // Test with undefined values
+        const result2 = mergeContacts([pointer1], undefined, [pointer2, undefined]);
+        expect(result2.length).toBe(2);
+        // Test with single pointers
+        const result3 = mergeContacts(pointer1, pointer2, pointer1);
+        expect(result3.length).toBe(2);
+        // Test with empty arrays
+        const result4 = mergeContacts([], [pointer1], []);
+        expect(result4.length).toBe(1);
+        // Test with pointers that have and don't have relays
+        const pointer5 = { pubkey: "pubkey5", relays: ["relay5"] };
+        const pointer6 = { pubkey: "pubkey5" }; // Same pubkey without relays
+        const result5 = mergeContacts([pointer5], [pointer6]);
+        expect(result5.length).toBe(1);
+        expect(result5[0].relays).toBeUndefined();
+    });
+});

package/dist/helpers/__tests__/events.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/helpers/__tests__/events.test.js

@@ -0,0 +1,32 @@
+import { kinds } from "nostr-tools";
+import { describe, expect, it } from "vitest";
+import { FakeUser } from "../../__tests__/fixtures.js";
+import { getReplaceableAddress } from "../event.js";
+const user = new FakeUser();
+describe("getReplaceableAddress", () => {
+    it("should throw an error for non-replaceable events", () => {
+        const normalEvent = user.note("Hello world");
+        expect(() => {
+            getReplaceableAddress(normalEvent);
+        }).toThrow("Event is not replaceable or addressable");
+    });
+    it("should return the correct address for replaceable events", () => {
+        const replaceableEvent = user.event({
+            kind: kinds.Metadata,
+            content: JSON.stringify({ name: "Test User" }),
+            tags: [],
+        });
+        const expectedAddress = `${kinds.Metadata}:${user.pubkey}:`;
+        expect(getReplaceableAddress(replaceableEvent)).toBe(expectedAddress);
+    });
+    it("should include the identifier for addressable events", () => {
+        const identifier = "test-profile";
+        const addressableEvent = user.event({
+            kind: 30000, // Parameterized replaceable event
+            content: "Test content",
+            tags: [["d", identifier]],
+        });
+        const expectedAddress = `30000:${user.pubkey}:${identifier}`;
+        expect(getReplaceableAddress(addressableEvent)).toBe(expectedAddress);
+    });
+});

package/dist/helpers/__tests__/mutes.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/helpers/__tests__/mutes.test.js

@@ -0,0 +1,55 @@
+import { describe, expect, it } from "vitest";
+import { matchMutes } from "../mutes.js";
+import { FakeUser } from "../../__tests__/fixtures.js";
+const mutedUser = new FakeUser();
+const nonMutedUser = new FakeUser();
+const thread = nonMutedUser.note("Hello world");
+// Create a mutes object with a pubkey to mute
+const mutes = {
+    pubkeys: new Set([mutedUser.pubkey]),
+    threads: new Set([thread.id]),
+    hashtags: new Set(["nostr"]),
+    words: new Set(["GM"]),
+};
+describe("matchMutes", () => {
+    it("should match events with muted pubkeys", () => {
+        const mutedEvent = mutedUser.note("Hello world");
+        const nonMutedEvent = nonMutedUser.note("Hello world");
+        // The event with the muted pubkey should match
+        expect(matchMutes(mutes, mutedEvent)).toBe(true);
+        // The event with a different pubkey should not match
+        expect(matchMutes(mutes, nonMutedEvent)).toBe(false);
+    });
+    it("should match events with muted hashtags", () => {
+        // Create events with and without the muted hashtag
+        const eventWithMutedHashtag = nonMutedUser.note("Hello world");
+        eventWithMutedHashtag.tags.push(["t", "nostr"]);
+        const eventWithDifferentHashtag = nonMutedUser.note("Hello world");
+        eventWithDifferentHashtag.tags.push(["t", "bitcoin"]);
+        const eventWithNoHashtag = nonMutedUser.note("Hello world");
+        // The event with the muted hashtag should match
+        expect(matchMutes(mutes, eventWithMutedHashtag)).toBe(true);
+        // The events without the muted hashtag should not match
+        expect(matchMutes(mutes, eventWithDifferentHashtag)).toBe(false);
+        expect(matchMutes(mutes, eventWithNoHashtag)).toBe(false);
+    });
+    it("should match events within threads", () => {
+        // Create a reply to the thread
+        const reply = nonMutedUser.note("Hello world");
+        reply.tags.push(["e", thread.id, "", "root"]);
+        // The reply should match the mute
+        expect(matchMutes(mutes, reply)).toBe(true);
+        // The thread should not match the mute
+        expect(matchMutes(mutes, thread)).toBe(false);
+    });
+    it("should match events with muted words", () => {
+        // The event with the muted word should match
+        expect(matchMutes(mutes, nonMutedUser.note("GM"))).toBe(true);
+        // Should not match other words that contain the muted word
+        expect(matchMutes(mutes, nonMutedUser.note("GMing"))).toBe(false);
+        // Should be case-insensitive
+        expect(matchMutes(mutes, nonMutedUser.note("gm"))).toBe(true);
+        // Should match if the muted word
+        expect(matchMutes(mutes, nonMutedUser.note("Hello GM world"))).toBe(true);
+    });
+});

package/dist/helpers/bookmarks.d.ts

@@ -8,8 +8,13 @@ export type Bookmarks = {
     hashtags: string[];
     urls: string[];
 };
+/** Parses an array of tags into a {@link Bookmarks} object */
 export declare function parseBookmarkTags(tags: string[][]): Bookmarks;
-/** Returns the public bookmarks of the event */
+/** Merges any number of {@link Bookmarks} objects */
+export declare function mergeBookmarks(...bookmarks: (Bookmarks | undefined)[]): Bookmarks;
+/** Returns all the bookmarks of the event */
 export declare function getBookmarks(bookmark: NostrEvent): Bookmarks;
+/** Returns the public bookmarks of the event */
+export declare function getPublicBookmarks(bookmark: NostrEvent): Bookmarks;
 /** Returns the bookmarks of the event if its unlocked */
 export declare function getHiddenBookmarks(bookmark: NostrEvent): Bookmarks | undefined;

package/dist/helpers/bookmarks.js

@@ -1,9 +1,11 @@
 import { kinds } from "nostr-tools";
-import { getAddressPointerFromATag, getEventPointerFromETag } from "./pointers.js";
 import { getOrComputeCachedValue } from "./cache.js";
-import { getHiddenTags } from "./index.js";
+import { getHiddenTags, isHiddenTagsLocked } from "./index.js";
+import { mergeAddressPointers, mergeEventPointers } from "./nip-19.js";
+import { getAddressPointerFromATag, getCoordinateFromAddressPointer, getEventPointerFromETag } from "./pointers.js";
 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 articles = tags
@@ -14,14 +16,57 @@ export function parseBookmarkTags(tags) {
     const urls = tags.filter((t) => t[0] === "r" && t[1]).map((t) => t[1]);
     return { notes, articles, hashtags, urls };
 }
-/** Returns the public bookmarks of the event */
+/** Merges any number of {@link Bookmarks} objects */
+export function mergeBookmarks(...bookmarks) {
+    const notes = new Map();
+    const articles = new Map();
+    const hashtags = new Set();
+    const urls = new Set();
+    for (const bookmark of bookmarks) {
+        if (!bookmark)
+            continue;
+        for (const note of bookmark.notes) {
+            const existing = notes.get(note.id);
+            if (existing)
+                notes.set(note.id, mergeEventPointers(existing, note));
+            else
+                notes.set(note.id, note);
+        }
+        for (const article of bookmark.articles) {
+            const coord = getCoordinateFromAddressPointer(article);
+            const existing = articles.get(coord);
+            if (existing)
+                articles.set(coord, mergeAddressPointers(existing, article));
+            else
+                articles.set(coord, article);
+        }
+        for (const hashtag of bookmark.hashtags)
+            hashtags.add(hashtag);
+        for (const url of bookmark.urls)
+            urls.add(url);
+    }
+    return {
+        notes: Array.from(notes.values()),
+        articles: Array.from(articles.values()),
+        hashtags: Array.from(hashtags),
+        urls: Array.from(urls),
+    };
+}
+/** Returns all the bookmarks of the event */
 export function getBookmarks(bookmark) {
+    const hidden = getHiddenBookmarks(bookmark);
+    if (hidden)
+        return mergeBookmarks(hidden, getPublicBookmarks(bookmark));
+    else
+        return getPublicBookmarks(bookmark);
+}
+/** Returns the public bookmarks of the event */
+export function getPublicBookmarks(bookmark) {
     return getOrComputeCachedValue(bookmark, BookmarkPublicSymbol, () => parseBookmarkTags(bookmark.tags));
 }
 /** Returns the bookmarks of the event if its unlocked */
 export function getHiddenBookmarks(bookmark) {
-    return getOrComputeCachedValue(bookmark, BookmarkHiddenSymbol, () => {
-        const tags = getHiddenTags(bookmark);
-        return tags && parseBookmarkTags(tags);
-    });
+    if (isHiddenTagsLocked(bookmark))
+        return undefined;
+    return getOrComputeCachedValue(bookmark, BookmarkHiddenSymbol, () => parseBookmarkTags(getHiddenTags(bookmark)));
 }

package/dist/helpers/contacts.d.ts

@@ -1,3 +1,14 @@
 import { NostrEvent } from "nostr-tools";
+import { ProfilePointer } from "nostr-tools/nip19";
 export declare const ContactsRelaysSymbol: unique symbol;
+export declare const PublicContactsSymbol: unique symbol;
+export declare const HiddenContactsSymbol: unique symbol;
 export declare function getRelaysFromContactsEvent(event: NostrEvent): Map<string, "all" | "inbox" | "outbox"> | null;
+/** Merges any number of contact lists into a single list */
+export declare function mergeContacts(...pointers: (ProfilePointer | undefined | (ProfilePointer | undefined)[])[]): ProfilePointer[];
+/** Returns all public and hidden contacts from a contacts list event */
+export declare function getContacts(event: NostrEvent): ProfilePointer[];
+/** Returns only the public contacts from a contacts list event */
+export declare function getPublicContacts(event: NostrEvent): ProfilePointer[];
+/** Returns only the hidden contacts from a contacts list event */
+export declare function getHiddenContacts(event: NostrEvent): ProfilePointer[] | undefined;

package/dist/helpers/contacts.js

@@ -1,6 +1,11 @@
 import { getOrComputeCachedValue } from "./cache.js";
 import { isSafeRelayURL } from "./relays.js";
+import { isPTag, processTags } from "./tags.js";
+import { getProfilePointerFromPTag } from "./pointers.js";
+import { getHiddenTags, isHiddenTagsLocked } from "./hidden-tags.js";
 export const ContactsRelaysSymbol = Symbol.for("contacts-relays");
+export const PublicContactsSymbol = Symbol.for("public-contacts");
+export const HiddenContactsSymbol = Symbol.for("hidden-contacts");
 export function getRelaysFromContactsEvent(event) {
     return getOrComputeCachedValue(event, ContactsRelaysSymbol, () => {
         try {
@@ -23,3 +28,32 @@ export function getRelaysFromContactsEvent(event) {
         }
     });
 }
+/** Merges any number of contact lists into a single list */
+export function mergeContacts(...pointers) {
+    const merged = new Map();
+    for (const arr of pointers) {
+        if (Array.isArray(arr)) {
+            for (const pointer of arr)
+                if (pointer)
+                    merged.set(pointer.pubkey, pointer);
+        }
+        else if (arr) {
+            merged.set(arr.pubkey, arr);
+        }
+    }
+    return Array.from(merged.values());
+}
+/** Returns all public and hidden contacts from a contacts list event */
+export function getContacts(event) {
+    return mergeContacts(getPublicContacts(event), getHiddenContacts(event));
+}
+/** Returns only the public contacts from a contacts list event */
+export function getPublicContacts(event) {
+    return getOrComputeCachedValue(event, PublicContactsSymbol, () => processTags(event.tags, (t) => (isPTag(t) ? t : undefined), getProfilePointerFromPTag));
+}
+/** Returns only the hidden contacts from a contacts list event */
+export function getHiddenContacts(event) {
+    if (isHiddenTagsLocked(event))
+        return undefined;
+    return getOrComputeCachedValue(event, HiddenContactsSymbol, () => processTags(getHiddenTags(event), (t) => (isPTag(t) ? t : undefined), getProfilePointerFromPTag));
+}

package/dist/helpers/event.d.ts

@@ -24,11 +24,16 @@ export declare function isReplaceable(kind: number): boolean;
 /**
  * Returns the events Unique ID
  * For normal or ephemeral events this is ( event.id )
- * For replaceable events this is ( event.kind + ":" + event.pubkey )
- * For parametrized replaceable events this is ( event.kind + ":" + event.pubkey + ":" + event.tags.d.1 )
+ * For replaceable events this is ( event.kind + ":" + event.pubkey + ":" )
+ * For parametrized replaceable events this is ( event.kind + ":" + event.pubkey + ":" + event.tags.d )
  */
 export declare function getEventUID(event: NostrEvent): string;
-export declare function getReplaceableUID(kind: number, pubkey: string, d?: string): string;
+/** Returns the replaceable event address for an addressable event */
+export declare function getReplaceableAddress(event: NostrEvent): string;
+/** Creates a replaceable event address from a kind, pubkey, and identifier */
+export declare function createReplaceableAddress(kind: number, pubkey: string, identifier?: string): string;
+/** @deprecated use createReplaceableAddress instead */
+export declare const getReplaceableUID: typeof createReplaceableAddress;
 /** Returns a Set of tag names and values that are indexable */
 export declare function getIndexableTags(event: NostrEvent): Set<string>;
 /**

package/dist/helpers/event.js

@@ -1,8 +1,8 @@
-import { kinds, verifiedSymbol } from "nostr-tools";
+import { verifiedSymbol } from "nostr-tools";
 import { INDEXABLE_TAGS } from "../event-store/common.js";
 import { getHiddenTags } from "./hidden-tags.js";
 import { getOrComputeCachedValue } from "./cache.js";
-import { isParameterizedReplaceableKind } from "nostr-tools/kinds";
+import { isAddressableKind, isReplaceableKind } from "nostr-tools/kinds";
 import { EventStoreSymbol } from "../event-store/event-store.js";
 export const EventUIDSymbol = Symbol.for("event-uid");
 export const EventIndexableTagsSymbol = Symbol.for("indexable-tags");
@@ -29,30 +29,38 @@ export function isEvent(event) {
  * or parameterized replaceable ( 30000 <= n < 40000 )
  */
 export function isReplaceable(kind) {
-    return kinds.isReplaceableKind(kind) || kinds.isParameterizedReplaceableKind(kind);
+    return isReplaceableKind(kind) || isAddressableKind(kind);
 }
 /**
  * Returns the events Unique ID
  * For normal or ephemeral events this is ( event.id )
- * For replaceable events this is ( event.kind + ":" + event.pubkey )
- * For parametrized replaceable events this is ( event.kind + ":" + event.pubkey + ":" + event.tags.d.1 )
+ * For replaceable events this is ( event.kind + ":" + event.pubkey + ":" )
+ * For parametrized replaceable events this is ( event.kind + ":" + event.pubkey + ":" + event.tags.d )
  */
 export function getEventUID(event) {
     let uid = event[EventUIDSymbol];
     if (!uid) {
-        if (isReplaceable(event.kind)) {
-            let d = event.tags.find((t) => t[0] === "d")?.[1];
-            uid = getReplaceableUID(event.kind, event.pubkey, d);
-        }
+        if (isReplaceable(event.kind))
+            uid = getReplaceableAddress(event);
         else
             uid = event.id;
         event[EventUIDSymbol] = uid;
     }
     return uid;
 }
-export function getReplaceableUID(kind, pubkey, d) {
-    return d ? kind + ":" + pubkey + ":" + d : kind + ":" + pubkey;
+/** Returns the replaceable event address for an addressable event */
+export function getReplaceableAddress(event) {
+    if (!isReplaceable(event.kind))
+        throw new Error("Event is not replaceable or addressable");
+    const identifier = isAddressableKind(event.kind) ? getReplaceableIdentifier(event) : undefined;
+    return createReplaceableAddress(event.kind, event.pubkey, identifier);
+}
+/** Creates a replaceable event address from a kind, pubkey, and identifier */
+export function createReplaceableAddress(kind, pubkey, identifier) {
+    return kind + ":" + pubkey + ":" + (identifier ?? "");
 }
+/** @deprecated use createReplaceableAddress instead */
+export const getReplaceableUID = createReplaceableAddress;
 /** Returns a Set of tag names and values that are indexable */
 export function getIndexableTags(event) {
     let indexable = event[EventIndexableTagsSymbol];
@@ -100,8 +108,8 @@ export function getParentEventStore(event) {
  * @throws
  */
 export function getReplaceableIdentifier(event) {
-    if (!isParameterizedReplaceableKind(event.kind))
-        throw new Error("Event is not replaceable");
+    if (!isAddressableKind(event.kind))
+        throw new Error("Event is not addressable");
     return getOrComputeCachedValue(event, ReplaceableIdentifierSymbol, () => {
         const d = getTagValue(event, "d");
         if (d === undefined)

package/dist/helpers/lists.js

@@ -1,4 +1,4 @@
-import { isParameterizedReplaceableKind, isReplaceableKind } from "nostr-tools/kinds";
+import { isAddressableKind, isReplaceableKind } from "nostr-tools/kinds";
 import { getHiddenTags } from "./hidden-tags.js";
 import { getAddressPointerFromATag, getCoordinateFromAddressPointer, getEventPointerFromETag, getProfilePointerFromPTag, } from "./pointers.js";
 import { isATag, isETag, isPTag, processTags } from "./tags.js";
@@ -49,7 +49,7 @@ export function getProfilePointersFromList(list) {
 /** Returns if an event is a valid list or set */
 export function isValidList(event) {
     try {
-        if (isParameterizedReplaceableKind(event.kind)) {
+        if (isAddressableKind(event.kind)) {
             // event is a set
             // ensure the set has an identifier
             getReplaceableIdentifier(event);

package/dist/helpers/mutes.d.ts

@@ -7,9 +7,17 @@ export type Mutes = {
     hashtags: Set<string>;
     words: Set<string>;
 };
+/** Merges any number of mute sets */
+export declare function mergeMutes(...mutes: Mutes[]): Mutes;
 /** Parses mute tags */
 export declare function parseMutedTags(tags: string[][]): Mutes;
 /** Returns muted things */
 export declare function getMutedThings(mute: NostrEvent): Mutes;
+/** Returns only the public muted things from a mute event */
+export declare function getPublicMutedThings(mute: NostrEvent): Mutes;
 /** Returns the hidden muted content if the event is unlocked */
 export declare function getHiddenMutedThings(mute: NostrEvent): Mutes | undefined;
+/** Creates a RegExp for matching muted words */
+export declare function createMutedWordsRegExp(mutedWords: string[]): RegExp;
+/** Returns true if the event matches the mutes */
+export declare function matchMutes(mutes: Mutes, event: NostrEvent): boolean;

package/dist/helpers/mutes.js

@@ -1,8 +1,25 @@
+import { kinds } from "nostr-tools";
 import { isETag, isPTag, isTTag } from "./tags.js";
 import { getOrComputeCachedValue } from "./cache.js";
-import { getHiddenTags } from "./hidden-tags.js";
+import { getHiddenTags, isHiddenTagsLocked } from "./hidden-tags.js";
+import { getIndexableTags, getNip10References } from "./index.js";
 export const MutePublicSymbol = Symbol.for("mute-public");
 export const MuteHiddenSymbol = Symbol.for("mute-hidden");
+/** Merges any number of mute sets */
+export function mergeMutes(...mutes) {
+    const mute = { pubkeys: new Set(), threads: new Set(), hashtags: new Set(), words: new Set() };
+    for (const m of mutes) {
+        for (const pubkey of m.pubkeys)
+            mute.pubkeys.add(pubkey);
+        for (const thread of m.threads)
+            mute.threads.add(thread);
+        for (const hashtag of m.hashtags)
+            mute.hashtags.add(hashtag);
+        for (const word of m.words)
+            mute.words.add(word);
+    }
+    return mute;
+}
 /** Parses mute tags */
 export function parseMutedTags(tags) {
     const pubkeys = new Set(tags.filter(isPTag).map((t) => t[1]));
@@ -13,12 +30,56 @@ export function parseMutedTags(tags) {
 }
 /** Returns muted things */
 export function getMutedThings(mute) {
+    const hidden = getHiddenMutedThings(mute);
+    const mutes = getPublicMutedThings(mute);
+    if (hidden)
+        return mergeMutes(hidden, mutes);
+    return mutes;
+}
+/** Returns only the public muted things from a mute event */
+export function getPublicMutedThings(mute) {
     return getOrComputeCachedValue(mute, MutePublicSymbol, () => parseMutedTags(mute.tags));
 }
 /** Returns the hidden muted content if the event is unlocked */
 export function getHiddenMutedThings(mute) {
-    return getOrComputeCachedValue(mute, MuteHiddenSymbol, () => {
-        const tags = getHiddenTags(mute);
-        return tags && parseMutedTags(tags);
-    });
+    if (isHiddenTagsLocked(mute))
+        return undefined;
+    return getOrComputeCachedValue(mute, MuteHiddenSymbol, () => parseMutedTags(getHiddenTags(mute)));
+}
+/** Creates a RegExp for matching muted words */
+export function createMutedWordsRegExp(mutedWords) {
+    // Escape special characters and join with |
+    const escapedWords = mutedWords.map((word) => word.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+    // Create the RegExp with word boundaries and case insensitive flag
+    return new RegExp(`\\b(${escapedWords.join("|")})\\b`, "gi");
+}
+/** Returns true if the event matches the mutes */
+export function matchMutes(mutes, event) {
+    // Filter on muted pubkeys
+    if (mutes.pubkeys) {
+        if (mutes.pubkeys.has(event.pubkey))
+            return true;
+    }
+    // Filter on muted hashtags`
+    if (mutes.hashtags) {
+        const tags = getIndexableTags(event);
+        for (let tag of mutes.hashtags) {
+            if (tags.has("t:" + tag))
+                return true;
+        }
+    }
+    // Filter on muted threads
+    if (mutes.threads && event.kind === kinds.ShortTextNote) {
+        const refs = getNip10References(event);
+        if (refs.root?.e && mutes.threads.has(refs.root.e.id))
+            return true;
+    }
+    // Filter on muted words
+    if (mutes.words) {
+        const regExp = createMutedWordsRegExp(Array.from(mutes.words));
+        if (regExp.test(event.content))
+            return true;
+    }
+    // Event does not match any mutes
+    return false;
 }