applesauce-actions 0.0.0-next-20250923113611 → 0.0.0-next-20251203172109

package/dist/action-hub.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
-import { NostrEvent } from "nostr-tools";
-import { EventFactory } from "applesauce-factory";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { EventFactory } from "applesauce-core";
 import { IEventStoreActions, IEventStoreRead } from "applesauce-core";
 /** A callback used to tell the upstream app to publish an event */
 export type PublishMethod = (event: NostrEvent) => void | Promise<void>;

package/dist/actions/app-data.js

@@ -1,6 +1,6 @@
-import { APP_DATA_KIND, getAppDataEncryption } from "applesauce-core/helpers/app-data";
-import { AppDataBlueprint } from "applesauce-factory/blueprints/app-data";
-import { AppData } from "applesauce-factory/operations";
+import { AppDataBlueprint } from "applesauce-common/blueprints/app-data";
+import { APP_DATA_KIND, getAppDataEncryption } from "applesauce-common/helpers/app-data";
+import * as AppData from "applesauce-common/operations/app-data";
 export function UpdateAppData(identifier, data) {
     return async function* ({ self, factory, events }) {
         const event = events.getReplaceable(APP_DATA_KIND, self, identifier);

package/dist/actions/blocked-relays.js

@@ -1,6 +1,6 @@
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-factory/operations";
-import { addRelayTag, removeRelayTag } from "applesauce-factory/operations/tag/relay";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
 function getBlockedRelaysEvent(events, self) {
     const event = events.getReplaceable(kinds.BlockedRelaysList, self);
     if (!event)

package/dist/actions/blossom.js

@@ -1,15 +1,14 @@
-import { BLOSSOM_SERVER_LIST_KIND } from "applesauce-core/helpers/blossom";
-import { modifyPublicTags, modifyTags } from "applesauce-factory/operations";
-import { addBlossomServerTag, removeBlossomServerTag } from "applesauce-factory/operations/tag/blossom";
+import { BLOSSOM_SERVER_LIST_KIND } from "applesauce-common/helpers/blossom";
+import { addBlossomServer, removeBlossomServer } from "applesauce-common/operations/blossom";
 /** An action that adds a server to the Blossom servers event */
 export function AddBlossomServer(server) {
     return async function* ({ events, factory, self }) {
         const servers = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
-        const operation = Array.isArray(server) ? server.map((s) => addBlossomServerTag(s)) : addBlossomServerTag(server);
+        const operations = Array.isArray(server) ? server.map((s) => addBlossomServer(s)) : [addBlossomServer(server)];
         // Modify or build new event
         const draft = servers
-            ? await factory.modifyTags(servers, operation)
-            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyTags(operation));
+            ? await factory.modify(servers, ...operations)
+            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, ...operations);
         yield await factory.sign(draft);
     };
 }
@@ -17,13 +16,13 @@ export function AddBlossomServer(server) {
 export function RemoveBlossomServer(server) {
     return async function* ({ events, factory, self }) {
         const servers = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
-        const operation = Array.isArray(server)
-            ? server.map((s) => removeBlossomServerTag(s))
-            : removeBlossomServerTag(server);
+        const operations = Array.isArray(server)
+            ? server.map((s) => removeBlossomServer(s))
+            : [removeBlossomServer(server)];
         // Modify or build new event
         const draft = servers
-            ? await factory.modifyTags(servers, operation)
-            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyTags(operation));
+            ? await factory.modify(servers, ...operations)
+            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, ...operations);
         yield await factory.sign(draft);
     };
 }
@@ -31,11 +30,11 @@ export function RemoveBlossomServer(server) {
 export function SetDefaultBlossomServer(server) {
     return async function* ({ events, factory, self }) {
         const servers = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
-        const prependTag = (tag) => (tags) => [tag, ...tags];
-        const operations = [removeBlossomServerTag(server), prependTag(["server", String(server)])];
+        const prependTag = (tag) => (draft) => ({ ...draft, tags: [tag, ...draft.tags] });
+        const operations = [removeBlossomServer(server), prependTag(["server", String(server)])];
         const draft = servers
-            ? await factory.modifyTags(servers, operations)
-            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyTags(...operations));
+            ? await factory.modify(servers, ...operations)
+            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, ...operations);
         yield await factory.sign(draft);
     };
 }
@@ -45,8 +44,8 @@ export function NewBlossomServers(servers) {
         const existing = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
         if (existing)
             throw new Error("Blossom servers event already exists");
-        const operations = servers ? servers.map((s) => addBlossomServerTag(s)) : [];
-        const draft = await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyPublicTags(...operations));
+        const operations = servers ? servers.map((s) => addBlossomServer(s)) : [];
+        const draft = await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, ...operations);
         yield await factory.sign(draft);
     };
 }

package/dist/actions/bookmarks.d.ts

@@ -1,4 +1,4 @@
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { Action } from "../action-hub.js";
 /**
  * An action that adds a note or article to the bookmark list or a bookmark set

package/dist/actions/bookmarks.js

@@ -1,6 +1,7 @@
-import { modifyHiddenTags, modifyPublicTags, List } from "applesauce-factory/operations";
-import { addEventBookmarkTag, removeEventBookmarkTag } from "applesauce-factory/operations/tag";
-import { kinds } from "nostr-tools";
+import * as List from "applesauce-common/operations/list";
+import { addEventBookmarkTag, removeEventBookmarkTag } from "applesauce-common/operations/tag/bookmarks";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
 /**
  * An action that adds a note or article to the bookmark list or a bookmark set
  * @param event the event to bookmark

package/dist/actions/calendar.d.ts

@@ -1,4 +1,4 @@
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { Action } from "../action-hub.js";
 /** Adds a calendar event to a calendar */
 export declare function AddEventToCalendar(calendar: NostrEvent, event: NostrEvent): Action;

package/dist/actions/calendar.js

@@ -1,6 +1,6 @@
-import { DATE_BASED_CALENDAR_EVENT_KIND, TIME_BASED_CALENDAR_EVENT_KIND } from "applesauce-core/helpers/calendar-event";
-import { Calendar } from "applesauce-factory/operations";
-import { kinds } from "nostr-tools";
+import { DATE_BASED_CALENDAR_EVENT_KIND, TIME_BASED_CALENDAR_EVENT_KIND, } from "applesauce-common/helpers/calendar-event";
+import { kinds } from "applesauce-core/helpers/event";
+import * as Calendar from "applesauce-common/operations/calendar";
 /** Adds a calendar event to a calendar */
 export function AddEventToCalendar(calendar, event) {
     if (calendar.kind !== kinds.Calendar)

package/dist/actions/contacts.d.ts

@@ -1,4 +1,4 @@
-import { ProfilePointer } from "nostr-tools/nip19";
+import { ProfilePointer } from "applesauce-core/helpers/pointers";
 import { Action } from "../action-hub.js";
 /** An action that adds a pubkey to a users contacts event */
 export declare function FollowUser(pubkey: string, relay?: string, hidden?: boolean): Action;

package/dist/actions/contacts.js

@@ -1,12 +1,12 @@
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-factory/operations";
-import { addPubkeyTag, removePubkeyTag } from "applesauce-factory/operations/tag";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { addProfilePointerTag, removeProfilePointerTag } from "applesauce-core/operations/tag/common";
 /** An action that adds a pubkey to a users contacts event */
 export function FollowUser(pubkey, relay, hidden = false) {
     return async function* ({ events, factory, self }) {
         let contacts = events.getReplaceable(kinds.Contacts, self);
         const pointer = { pubkey, relays: relay ? [relay] : undefined };
-        const operation = addPubkeyTag(pointer);
+        const operation = addProfilePointerTag(pointer);
         let draft;
         // No contact list, create one
         if (!contacts)
@@ -23,7 +23,7 @@ export function UnfollowUser(user, hidden = false) {
         // Unable to find a contacts event, so we can't unfollow
         if (!contacts)
             return;
-        const operation = removePubkeyTag(user);
+        const operation = removeProfilePointerTag(user);
         const draft = await factory.modifyTags(contacts, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
@@ -34,7 +34,7 @@ export function NewContacts(pubkeys) {
         const contacts = events.getReplaceable(kinds.Contacts, self);
         if (contacts)
             throw new Error("Contact list already exists");
-        const draft = await factory.build({ kind: kinds.Contacts }, pubkeys ? modifyPublicTags(...pubkeys.map((p) => addPubkeyTag(p))) : undefined);
+        const draft = await factory.build({ kind: kinds.Contacts }, pubkeys ? modifyPublicTags(...pubkeys.map((p) => addProfilePointerTag(p))) : undefined);
         yield await factory.sign(draft);
     };
 }

package/dist/actions/dm-relays.js

@@ -1,6 +1,6 @@
-import { modifyPublicTags } from "applesauce-factory/operations";
-import { addRelayTag, removeRelayTag } from "applesauce-factory/operations/tag/relay";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyPublicTags } from "applesauce-core/operations/tags";
+import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
 function getDMRelaysEvent(events, self) {
     const event = events.getReplaceable(kinds.DirectMessageRelaysList, self);
     if (!event)

package/dist/actions/favorite-relays.d.ts

@@ -1,4 +1,4 @@
-import { AddressPointer } from "nostr-tools/nip19";
+import { AddressPointer } from "applesauce-core/helpers/pointers";
 import { Action } from "../action-hub.js";
 /** An action that adds a relay to the 10012 favorite relays event */
 export declare function AddFavoriteRelay(relay: string | string[], hidden?: boolean): Action;

package/dist/actions/favorite-relays.js

@@ -1,6 +1,7 @@
 import { FAVORITE_RELAYS_KIND } from "applesauce-core/helpers/lists";
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-factory/operations";
-import { addAddressTag, addRelayTag, removeAddressTag, removeRelayTag } from "applesauce-factory/operations/tag";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { addAddressPointerTag, removeAddressPointerTag } from "applesauce-core/operations/tag/common";
+import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
 function getFavoriteRelaysEvent(events, self) {
     const event = events.getReplaceable(FAVORITE_RELAYS_KIND, self);
     if (!event)
@@ -29,7 +30,7 @@ export function RemoveFavoriteRelay(relay, hidden = false) {
 export function AddFavoriteRelaySet(addr, hidden = false) {
     return async function* ({ events, factory, self }) {
         const favorites = getFavoriteRelaysEvent(events, self);
-        const operation = Array.isArray(addr) ? addr.map((a) => addAddressTag(a)) : addAddressTag(addr);
+        const operation = Array.isArray(addr) ? addr.map((a) => addAddressPointerTag(a)) : addAddressPointerTag(addr);
         const draft = await factory.modifyTags(favorites, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
@@ -38,7 +39,7 @@ export function AddFavoriteRelaySet(addr, hidden = false) {
 export function RemoveFavoriteRelaySet(addr, hidden = false) {
     return async function* ({ events, factory, self }) {
         const favorites = getFavoriteRelaysEvent(events, self);
-        const operation = Array.isArray(addr) ? addr.map((a) => removeAddressTag(a)) : removeAddressTag(addr);
+        const operation = Array.isArray(addr) ? addr.map((a) => removeAddressPointerTag(a)) : removeAddressPointerTag(addr);
         const draft = await factory.modifyTags(favorites, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
@@ -61,13 +62,13 @@ export function NewFavoriteRelays(relays, sets) {
                 hiddenOperations.push(...(relays?.hidden ?? []).map((r) => addRelayTag(r)));
         }
         if (Array.isArray(sets)) {
-            publicOperations.push(...sets.map((s) => addAddressTag(s)));
+            publicOperations.push(...sets.map((s) => addAddressPointerTag(s)));
         }
         else {
             if (sets?.public)
-                publicOperations.push(...(sets?.public ?? []).map((s) => addAddressTag(s)));
+                publicOperations.push(...(sets?.public ?? []).map((s) => addAddressPointerTag(s)));
             if (sets?.hidden)
-                hiddenOperations.push(...(sets?.hidden ?? []).map((s) => addAddressTag(s)));
+                hiddenOperations.push(...(sets?.hidden ?? []).map((s) => addAddressPointerTag(s)));
         }
         const draft = await factory.build({ kind: FAVORITE_RELAYS_KIND }, publicOperations.length ? modifyPublicTags(...publicOperations) : undefined, hiddenOperations.length ? modifyHiddenTags(...hiddenOperations) : undefined);
         yield await factory.sign(draft);

package/dist/actions/follow-sets.d.ts

@@ -1,5 +1,5 @@
-import { NostrEvent } from "nostr-tools";
-import { ProfilePointer } from "nostr-tools/nip19";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { ProfilePointer } from "applesauce-core/helpers/pointers";
 import { Action } from "../action-hub.js";
 /**
  * An action that creates a new follow set

package/dist/actions/follow-sets.js

@@ -1,6 +1,7 @@
-import { modifyHiddenTags, modifyPublicTags, List } from "applesauce-factory/operations";
-import { addPubkeyTag, removePubkeyTag } from "applesauce-factory/operations/tag";
-import { kinds } from "nostr-tools";
+import * as List from "applesauce-common/operations/list";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { addProfilePointerTag, removeProfilePointerTag } from "applesauce-core/operations/tag/common";
 function getFollowSetEvent(events, self, identifier) {
     const set = typeof identifier === "string" ? events.getReplaceable(kinds.Followsets, self, identifier) : identifier;
     if (!set)
@@ -19,7 +20,7 @@ export function CreateFollowSet(title, options) {
         // set list information
         List.setTitle(title), options?.description ? List.setDescription(options.description) : undefined, options?.image ? List.setImage(options.image) : undefined, 
         // add pubkey tags
-        options?.public ? modifyPublicTags(...options.public.map((p) => addPubkeyTag(p))) : undefined, options?.hidden ? modifyHiddenTags(...options.hidden.map((p) => addPubkeyTag(p))) : undefined);
+        options?.public ? modifyPublicTags(...options.public.map((p) => addProfilePointerTag(p))) : undefined, options?.hidden ? modifyHiddenTags(...options.hidden.map((p) => addProfilePointerTag(p))) : undefined);
         yield await factory.sign(draft);
     };
 }
@@ -33,7 +34,9 @@ export function CreateFollowSet(title, options) {
 export function AddUserToFollowSet(pubkey, identifier, hidden = false) {
     return async function* ({ events, factory, self }) {
         const follows = getFollowSetEvent(events, self, identifier);
-        const operations = Array.isArray(pubkey) ? pubkey.map((p) => addPubkeyTag(p)) : addPubkeyTag(pubkey);
+        const operations = Array.isArray(pubkey)
+            ? pubkey.map((p) => addProfilePointerTag(p))
+            : addProfilePointerTag(pubkey);
         const draft = await factory.modifyTags(follows, hidden ? { hidden: operations } : operations);
         yield await factory.sign(draft);
     };
@@ -48,7 +51,9 @@ export function AddUserToFollowSet(pubkey, identifier, hidden = false) {
 export function RemoveUserFromFollowSet(pubkey, identifier, hidden = false) {
     return async function* ({ events, factory, self }) {
         const follows = getFollowSetEvent(events, self, identifier);
-        const operations = Array.isArray(pubkey) ? pubkey.map((p) => removePubkeyTag(p)) : removePubkeyTag(pubkey);
+        const operations = Array.isArray(pubkey)
+            ? pubkey.map((p) => removeProfilePointerTag(p))
+            : removeProfilePointerTag(pubkey);
         const draft = await factory.modifyTags(follows, hidden ? { hidden: operations } : operations);
         yield await factory.sign(draft);
     };

package/dist/actions/legacy-messages.d.ts

@@ -1,5 +1,5 @@
-import { LegacyMessageBlueprintOptions } from "applesauce-factory/blueprints";
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { LegacyMessageBlueprintOptions } from "applesauce-common/blueprints";
 import { Action } from "../action-hub.js";
 /** Sends a legacy NIP-04 message to a recipient */
 export declare function SendLegacyMessage(recipient: string, message: string, opts?: LegacyMessageBlueprintOptions): Action;

package/dist/actions/legacy-messages.js

@@ -1,5 +1,5 @@
-import { LegacyMessageBlueprint, LegacyMessageReplyBlueprint, } from "applesauce-factory/blueprints";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
+import { LegacyMessageBlueprint, LegacyMessageReplyBlueprint, } from "applesauce-common/blueprints";
 /** Sends a legacy NIP-04 message to a recipient */
 export function SendLegacyMessage(recipient, message, opts) {
     return async function* ({ factory }) {

package/dist/actions/lists.d.ts

@@ -1,5 +1,5 @@
-import { NostrEvent } from "nostr-tools";
-import { AddressPointer } from "nostr-tools/nip19";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { AddressPointer } from "applesauce-core/helpers/pointers";
 import { Action } from "../action-hub.js";
 /** An action that sets or removes a NIP-15 list information */
 export declare function SetListMetadata(list: NostrEvent | AddressPointer, info: {

package/dist/actions/lists.js

@@ -1,5 +1,5 @@
-import { isAddressPointer } from "applesauce-core/helpers";
-import { List } from "applesauce-factory/operations";
+import * as List from "applesauce-common/operations/list";
+import { isAddressPointer } from "applesauce-core/helpers/pointers";
 function getList(events, address) {
     const list = isAddressPointer(address)
         ? events.getReplaceable(address.kind, address.pubkey, address.identifier)

package/dist/actions/mailboxes.js

@@ -1,13 +1,12 @@
-import { kinds } from "nostr-tools";
-import { addInboxRelay, addOutboxRelay, removeInboxRelay, removeOutboxRelay } from "applesauce-factory/operations/tag";
-import { modifyPublicTags } from "applesauce-factory/operations";
+import { kinds } from "applesauce-core/helpers/event";
+import { addInboxRelay, addOutboxRelay, removeInboxRelay, removeOutboxRelay, } from "applesauce-core/operations/mailboxes";
 /** An action to create a new kind 10002 relay list event */
 export function CreateMailboxes(inboxes, outboxes) {
     return async function* ({ events, factory, self }) {
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         if (mailboxes)
             throw new Error("Mailbox event already exists");
-        const draft = await factory.build({ kind: kinds.RelayList }, modifyPublicTags(...inboxes.map(addInboxRelay), ...outboxes.map(addOutboxRelay)));
+        const draft = await factory.build({ kind: kinds.RelayList }, ...inboxes.map(addInboxRelay), ...outboxes.map(addOutboxRelay));
         const signed = await factory.sign(draft);
         yield signed;
     };
@@ -19,8 +18,8 @@ export function AddInboxRelay(relay) {
             relay = [relay];
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         const draft = mailboxes
-            ? await factory.modifyTags(mailboxes, ...relay.map(addInboxRelay))
-            : await factory.build({ kind: kinds.RelayList }, modifyPublicTags(...relay.map(addInboxRelay)));
+            ? await factory.modify(mailboxes, ...relay.map(addInboxRelay))
+            : await factory.build({ kind: kinds.RelayList }, ...relay.map(addInboxRelay));
         const signed = await factory.sign(draft);
         yield signed;
     };
@@ -33,7 +32,7 @@ export function RemoveInboxRelay(relay) {
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         if (!mailboxes)
             return;
-        const draft = await factory.modifyTags(mailboxes, ...relay.map(removeInboxRelay));
+        const draft = await factory.modify(mailboxes, ...relay.map(removeInboxRelay));
         const signed = await factory.sign(draft);
         yield signed;
     };
@@ -45,8 +44,8 @@ export function AddOutboxRelay(relay) {
             relay = [relay];
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         const draft = mailboxes
-            ? await factory.modifyTags(mailboxes, ...relay.map(addOutboxRelay))
-            : await factory.build({ kind: kinds.RelayList }, modifyPublicTags(...relay.map(addOutboxRelay)));
+            ? await factory.modify(mailboxes, ...relay.map(addOutboxRelay))
+            : await factory.build({ kind: kinds.RelayList }, ...relay.map(addOutboxRelay));
         const signed = await factory.sign(draft);
         yield signed;
     };
@@ -59,7 +58,7 @@ export function RemoveOutboxRelay(relay) {
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         if (!mailboxes)
             return;
-        const draft = await factory.modifyTags(mailboxes, ...relay.map(removeOutboxRelay));
+        const draft = await factory.modify(mailboxes, ...relay.map(removeOutboxRelay));
         const signed = await factory.sign(draft);
         yield signed;
     };

package/dist/actions/mute.d.ts

@@ -1,5 +1,5 @@
-import { NostrEvent } from "nostr-tools";
-import { EventPointer } from "nostr-tools/nip19";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { EventPointer } from "applesauce-core/helpers/pointers";
 import { Action } from "../action-hub.js";
 /** An action that adds a pubkey to the mute list */
 export declare function MuteUser(pubkey: string, hidden?: boolean): Action;

package/dist/actions/mute.js

@@ -1,5 +1,5 @@
-import { addEventTag, addNameValueTag, addPubkeyTag, removeEventTag, removeNameValueTag, removePubkeyTag, } from "applesauce-factory/operations/tag";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
+import { addEventPointerTag, addNameValueTag, addProfilePointerTag, removeEventPointerTag, removeNameValueTag, removeProfilePointerTag, } from "applesauce-core/operations/tag/common";
 function ensureMuteList(events, self) {
     const mute = events.getReplaceable(kinds.Mutelist, self);
     if (!mute)
@@ -10,7 +10,7 @@ function ensureMuteList(events, self) {
 export function MuteUser(pubkey, hidden = false) {
     return async function* ({ events, factory, self }) {
         const mute = ensureMuteList(events, self);
-        const operation = addPubkeyTag(pubkey);
+        const operation = addProfilePointerTag(pubkey);
         const draft = await factory.modifyTags(mute, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
@@ -19,7 +19,7 @@ export function MuteUser(pubkey, hidden = false) {
 export function UnmuteUser(pubkey, hidden = false) {
     return async function* ({ events, factory, self }) {
         const mute = ensureMuteList(events, self);
-        const draft = await factory.modifyTags(mute, hidden ? { hidden: removePubkeyTag(pubkey) } : removePubkeyTag(pubkey));
+        const draft = await factory.modifyTags(mute, hidden ? { hidden: removeProfilePointerTag(pubkey) } : removeProfilePointerTag(pubkey));
         yield await factory.sign(draft);
     };
 }
@@ -27,7 +27,7 @@ export function UnmuteUser(pubkey, hidden = false) {
 export function MuteThread(thread, hidden = false) {
     return async function* ({ events, factory, self }) {
         const mute = ensureMuteList(events, self);
-        const operation = addEventTag(thread);
+        const operation = addEventPointerTag(thread);
         const draft = await factory.modifyTags(mute, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
@@ -36,7 +36,7 @@ export function MuteThread(thread, hidden = false) {
 export function UnmuteThread(thread, hidden = false) {
     return async function* ({ events, factory, self }) {
         const mute = ensureMuteList(events, self);
-        const operation = removeEventTag(thread);
+        const operation = removeEventPointerTag(thread);
         const draft = await factory.modifyTags(mute, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };

package/dist/actions/pins.d.ts

@@ -1,4 +1,4 @@
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { Action } from "../action-hub.js";
 export declare const ALLOWED_PIN_KINDS: number[];
 /** An action that pins a note to the users pin list */

package/dist/actions/pins.js

@@ -1,7 +1,6 @@
-import { getReplaceableAddress, isReplaceable } from "applesauce-core/helpers";
-import { modifyPublicTags } from "applesauce-factory/operations";
-import { addAddressTag, addEventTag, removeAddressTag, removeEventTag } from "applesauce-factory/operations/tag";
-import { kinds } from "nostr-tools";
+import { getReplaceableAddress, isReplaceable, kinds } from "applesauce-core/helpers/event";
+import { addAddressPointerTag, addEventPointerTag, removeAddressPointerTag, removeEventPointerTag, } from "applesauce-core/operations/tag/common";
+import { modifyPublicTags } from "applesauce-core/operations/tags";
 export const ALLOWED_PIN_KINDS = [kinds.ShortTextNote, kinds.LongFormArticle];
 /** An action that pins a note to the users pin list */
 export function PinNote(note) {
@@ -9,7 +8,9 @@ export function PinNote(note) {
         throw new Error(`Event kind ${note.kind} can not be pinned`);
     return async function* ({ events, factory, self }) {
         const pins = events.getReplaceable(kinds.Pinlist, self);
-        const operation = isReplaceable(note.kind) ? addAddressTag(getReplaceableAddress(note)) : addEventTag(note.id);
+        const operation = isReplaceable(note.kind)
+            ? addAddressPointerTag(getReplaceableAddress(note))
+            : addEventPointerTag(note.id);
         const draft = pins
             ? await factory.modifyTags(pins, operation)
             : await factory.build({ kind: kinds.Pinlist }, modifyPublicTags(operation));
@@ -23,8 +24,8 @@ export function UnpinNote(note) {
         if (!pins)
             return;
         const operation = isReplaceable(note.kind)
-            ? removeAddressTag(getReplaceableAddress(note))
-            : removeEventTag(note.id);
+            ? removeAddressPointerTag(getReplaceableAddress(note))
+            : removeEventPointerTag(note.id);
         const draft = await factory.modifyTags(pins, operation);
         yield await factory.sign(draft);
     };
@@ -35,7 +36,7 @@ export function CreatePinList(pins = []) {
         const existing = events.getReplaceable(kinds.Pinlist, self);
         if (existing)
             throw new Error("Pin list already exists");
-        const draft = await factory.build({ kind: kinds.Pinlist }, modifyPublicTags(...pins.map((event) => addEventTag(event.id))));
+        const draft = await factory.build({ kind: kinds.Pinlist }, modifyPublicTags(...pins.map((event) => addEventPointerTag(event.id))));
         yield await factory.sign(draft);
     };
 }

package/dist/actions/profile.d.ts

@@ -1,4 +1,4 @@
-import { ProfileContent } from "applesauce-core/helpers";
+import { ProfileContent } from "applesauce-core/helpers/profile";
 import { Action } from "../action-hub.js";
 /** An action that creates a new kind 0 profile event for a user */
 export declare function CreateProfile(content: ProfileContent): Action;

package/dist/actions/profile.js

@@ -1,5 +1,5 @@
-import { kinds } from "nostr-tools";
-import { Profile } from "applesauce-factory/operations";
+import { kinds } from "applesauce-core/helpers/event";
+import * as Profile from "applesauce-core/operations/profile";
 /** An action that creates a new kind 0 profile event for a user */
 export function CreateProfile(content) {
     return async function* ({ events, factory, self }) {

package/dist/actions/relay-sets.d.ts

@@ -1,4 +1,4 @@
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { Action } from "../action-hub.js";
 /** An action that adds a relay to a relay set*/
 export declare function AddRelayToRelaySet(relay: string | string[], identifier: NostrEvent | string, hidden?: boolean): Action;

package/dist/actions/relay-sets.js

@@ -1,6 +1,7 @@
-import { modifyHiddenTags, modifyPublicTags, List } from "applesauce-factory/operations";
-import { addRelayTag, removeRelayTag } from "applesauce-factory/operations/tag";
-import { kinds } from "nostr-tools";
+import * as List from "applesauce-common/operations/list";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
 function getRelaySetEvent(events, self, identifier) {
     const set = typeof identifier === "string" ? events.getReplaceable(kinds.Relaysets, self, identifier) : identifier;
     if (!set)

package/dist/actions/search-relays.js

@@ -1,6 +1,6 @@
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-factory/operations";
-import { addRelayTag, removeRelayTag } from "applesauce-factory/operations/tag/relay";
-import { kinds } from "nostr-tools";
+import { kinds } from "applesauce-core/helpers/event";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
 function getSearchRelaysEvent(events, self) {
     const event = events.getReplaceable(kinds.SearchRelaysList, self);
     if (!event)

package/dist/actions/wrapped-messages.d.ts

@@ -1,6 +1,6 @@
-import { Rumor } from "applesauce-core/helpers";
-import { WrappedMessageBlueprintOptions } from "applesauce-factory/blueprints";
-import { GiftWrapOptions } from "applesauce-factory/operations/gift-wrap";
+import { Rumor } from "applesauce-common/helpers/gift-wrap";
+import { WrappedMessageBlueprintOptions } from "applesauce-common/blueprints";
+import { GiftWrapOptions } from "applesauce-common/operations/gift-wrap";
 import { Action } from "../action-hub.js";
 /**
  * Sends a NIP-17 wrapped message to a conversation

package/dist/actions/wrapped-messages.js

@@ -1,5 +1,5 @@
-import { getConversationParticipants } from "applesauce-core/helpers";
-import { GiftWrapBlueprint, WrappedMessageBlueprint, WrappedMessageReplyBlueprint, } from "applesauce-factory/blueprints";
+import { getConversationParticipants } from "applesauce-common/helpers/messages";
+import { GiftWrapBlueprint, WrappedMessageBlueprint, WrappedMessageReplyBlueprint, } from "applesauce-common/blueprints";
 /**
  * Sends a NIP-17 wrapped message to a conversation
  * @param participants - A conversation identifier, user pubkey, or a list of participant pubkeys

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-actions",
-  "version": "0.0.0-next-20250923113611",
+  "version": "0.0.0-next-20251203172109",
   "description": "A package for performing common nostr actions",
   "type": "module",
   "main": "dist/index.js",
@@ -32,19 +32,18 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "0.0.0-next-20250923113611",
-    "applesauce-factory": "0.0.0-next-20250923113611",
-    "nostr-tools": "~2.17",
+    "applesauce-common": "0.0.0-next-20251203172109",
+    "applesauce-core": "0.0.0-next-20251203172109",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
     "@types/debug": "^4.1.12",
-    "applesauce-signers": "0.0.0-next-20250923113611",
+    "applesauce-signers": "0.0.0-next-20251203172109",
     "nanoid": "^5.1.5",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.15"
   },
   "funding": {
     "type": "lightning",