applesauce-actions 5.1.1 → 6.0.0

package/dist/action-runner.d.ts

@@ -1,5 +1,5 @@
 import { User } from "applesauce-common/casts/user";
-import { EventFactory, EventSigner } from "applesauce-core/event-factory";
+import { EventSigner } from "applesauce-core";
 import { EventModels, IEventStoreActions, IEventStoreRead, IEventStoreStreams, IEventSubscriptions } from "applesauce-core/event-store";
 import { EventTemplate, NostrEvent, UnsignedEvent } from "applesauce-core/helpers/event";
 import { Observable } from "rxjs";
@@ -17,10 +17,8 @@ export type ActionContext = {
     /** The {@link User} cast that is signing the events */
     user: User;
     /** The event signer used to sign events */
-    signer?: EventSigner;
-    /** The event factory used to build and modify events */
-    factory: EventFactory;
-    /** Sign an event using the event factory */
+    signer: EventSigner;
+    /** Sign an event using the signer */
     sign: (draft: EventTemplate | UnsignedEvent) => Promise<NostrEvent>;
     /** The method to publish events to an optional list of relays */
     publish: (event: NostrEvent | NostrEvent[], relays?: string[]) => Promise<void>;
@@ -34,21 +32,13 @@ export type ActionBuilder<Args extends Array<any>> = (...args: Args) => Action;
 /** The main class that runs actions */
 export declare class ActionRunner {
     events: IEventStoreRead & IEventStoreStreams & IEventSubscriptions & IEventStoreActions & EventModels;
-    factory: EventFactory;
+    signer: EventSigner;
     private publishMethod?;
     /** Whether to save all events created by actions to the event store */
     saveToStore: boolean;
-    constructor(events: IEventStoreRead & IEventStoreStreams & IEventSubscriptions & IEventStoreActions & EventModels, factory: EventFactory, publishMethod?: UpstreamPool | undefined);
-    protected getContext(): Promise<{
-        self: string;
-        user: User;
-        events: IEventStoreRead & IEventStoreStreams & IEventSubscriptions & IEventStoreActions & EventModels<import("applesauce-core/event-store").IEventStore | import("applesauce-core/event-store").IAsyncEventStore>;
-        signer: EventSigner;
-        factory: EventFactory;
-        publish: (event: NostrEvent | NostrEvent[], relays?: string[]) => Promise<void>;
-        run: <Args extends Array<any>>(builder: ActionBuilder<Args>, ...args: Args) => Promise<void>;
-        sign: (draft: EventTemplate | UnsignedEvent) => Promise<NostrEvent>;
-    }>;
+    private _context;
+    constructor(events: IEventStoreRead & IEventStoreStreams & IEventSubscriptions & IEventStoreActions & EventModels, signer: EventSigner, publishMethod?: UpstreamPool | undefined);
+    protected getContext(): Promise<ActionContext>;
     /** Internal method for publishing events to relays */
     publish(event: NostrEvent | NostrEvent[], relays?: string[]): Promise<void>;
     /** Run an action and publish events using the publish method */

package/dist/action-runner.js

@@ -3,30 +3,31 @@ import { from, identity, isObservable, lastValueFrom, Observable, switchMap, tap
 /** The main class that runs actions */
 export class ActionRunner {
     events;
-    factory;
+    signer;
     publishMethod;
     /** Whether to save all events created by actions to the event store */
     saveToStore = true;
-    constructor(events, factory, publishMethod) {
+    _context;
+    constructor(events, signer, publishMethod) {
         this.events = events;
-        this.factory = factory;
+        this.signer = signer;
         this.publishMethod = publishMethod;
     }
     async getContext() {
-        if (!this.factory.context.signer)
-            throw new Error("Missing signer");
-        const self = await this.factory.context.signer.getPublicKey();
+        if (this._context)
+            return this._context;
+        const self = await this.signer.getPublicKey();
         const user = castUser(self, this.events);
-        return {
+        this._context = {
             self,
             user,
             events: this.events,
-            signer: this.factory.context.signer,
-            factory: this.factory,
+            signer: this.signer,
             publish: this.publish.bind(this),
             run: this.run.bind(this),
-            sign: this.factory.sign.bind(this.factory),
+            sign: (draft) => this.signer.signEvent(draft),
         };
+        return this._context;
     }
     /** Internal method for publishing events to relays */
     async publish(event, relays) {

package/dist/actions/app-data.js

@@ -1,13 +1,12 @@
-import { AppDataBlueprint } from "applesauce-common/blueprints/app-data";
+import { AppDataFactory } from "applesauce-common/factories";
 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 ({ self, factory, events, user, publish, sign }) => {
-        const event = events.getReplaceable(APP_DATA_KIND, self, identifier);
+    return async ({ signer, user, publish }) => {
+        const event = await user.replaceable(APP_DATA_KIND, identifier).$first(1000, undefined);
         const encryption = !!event && getAppDataEncryption(event);
         const signed = event
-            ? await factory.modify(event, AppData.setContent(data, encryption)).then(sign)
-            : await factory.create(AppDataBlueprint, identifier, data, encryption).then(sign);
+            ? await AppDataFactory.modify(event).data(data, encryption).sign(signer)
+            : await AppDataFactory.create(identifier, data, encryption).sign(signer);
         await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }

package/dist/actions/blocked-relays.js

@@ -1,42 +1,27 @@
-import { firstValueFrom } from "applesauce-core";
+import { BlockedRelaysFactory } from "applesauce-common/factories";
 import { kinds } from "applesauce-core/helpers/event";
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
-import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
-import { of, timeout } from "rxjs";
-// Action to generally modify the blocked relays event
-function ModifyBlockedRelaysEvent(operations) {
-    return async ({ events, factory, user, publish, sign }) => {
-        const [event, outboxes] = await Promise.all([
-            firstValueFrom(events
-                .replaceable(kinds.BlockedRelaysList, user.pubkey)
-                .pipe(timeout({ first: 1000, with: () => of(undefined) }))),
-            user.outboxes$.$first(1000, undefined),
-        ]);
-        // Modify or build new event
-        const signed = event
-            ? await factory.modify(event, ...operations).then(sign)
-            : await factory.build({ kind: kinds.BlockedRelaysList }, ...operations).then(sign);
-        // Publish the event to the user's outboxes
-        await publish(signed, outboxes);
-    };
+async function modifyBlockedRelays({ user }) {
+    const [event, outboxes] = await Promise.all([
+        user.replaceable(kinds.BlockedRelaysList).$first(1000, undefined),
+        user.outboxes$.$first(1000, undefined),
+    ]);
+    return [event ? BlockedRelaysFactory.modify(event) : BlockedRelaysFactory.create(), outboxes];
 }
 /** An action that adds a relay to the 10006 blocked relays event */
 export function AddBlockedRelay(relay, hidden = false) {
-    return async ({ run }) => {
-        const tagOperations = Array.isArray(relay)
-            ? relay.map((r) => addRelayTag(r))
-            : [addRelayTag(relay)];
-        const operation = hidden ? modifyHiddenTags(...tagOperations) : modifyPublicTags(...tagOperations);
-        await run(ModifyBlockedRelaysEvent, [operation]);
+    const relays = Array.isArray(relay) ? relay : [relay];
+    return async (context) => {
+        const [factory, outboxes] = await modifyBlockedRelays(context);
+        const signed = await factory.addRelay(relays, hidden).sign(context.signer);
+        await context.publish(signed, outboxes);
     };
 }
 /** An action that removes a relay from the 10006 blocked relays event */
 export function RemoveBlockedRelay(relay, hidden = false) {
-    return async ({ run }) => {
-        const tagOperations = Array.isArray(relay)
-            ? relay.map((r) => removeRelayTag(r))
-            : [removeRelayTag(relay)];
-        const operation = hidden ? modifyHiddenTags(...tagOperations) : modifyPublicTags(...tagOperations);
-        await run(ModifyBlockedRelaysEvent, [operation]);
+    const relays = Array.isArray(relay) ? relay : [relay];
+    return async (context) => {
+        const [factory, outboxes] = await modifyBlockedRelays(context);
+        const signed = await factory.removeRelay(relays, hidden).sign(context.signer);
+        await context.publish(signed, outboxes);
     };
 }

package/dist/actions/blossom.d.ts

@@ -1,9 +1,9 @@
-import { Action } from "../action-runner.js";
+import type { Action } from "../action-runner.js";
 /** An action that adds a server to the Blossom servers event */
 export declare function AddBlossomServer(server: string | URL | (string | URL)[]): Action;
 /** An action that removes a server from the Blossom servers event */
 export declare function RemoveBlossomServer(server: string | URL | (string | URL)[]): Action;
-/** Makes a specific Blossom server the default server (move it to the top of the list) */
+/** Makes a specific Blossom server the default server (moves it to the top of the list) */
 export declare function SetDefaultBlossomServer(server: string | URL): Action;
 /** Creates a new Blossom servers event */
 export declare function NewBlossomServers(servers?: (string | URL)[]): Action;

package/dist/actions/blossom.js

@@ -1,44 +1,48 @@
+import { BlossomServerListFactory } from "applesauce-common/factories";
 import { BLOSSOM_SERVER_LIST_KIND } from "applesauce-common/helpers/blossom";
-import { addBlossomServer, removeBlossomServer } from "applesauce-common/operations/blossom";
-// Action to modify or create a new Blossom servers event
-function ModifyBlossomServersEvent(operations) {
-    return async ({ factory, user, publish, sign }) => {
-        const [event, outboxes] = await Promise.all([
-            user.replaceable(BLOSSOM_SERVER_LIST_KIND).$first(1000, undefined),
-            user.outboxes$.$first(1000, undefined),
-        ]);
-        // Modify or build new event
-        const signed = event
-            ? await factory.modify(event, ...operations).then(sign)
-            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, ...operations).then(sign);
-        // Publish the event to the user's outboxes
-        await publish(signed, outboxes);
-    };
+async function modifyBlossomServers({ user, }) {
+    const [event, outboxes] = await Promise.all([
+        user.replaceable(BLOSSOM_SERVER_LIST_KIND).$first(1000, undefined),
+        user.outboxes$.$first(1000, undefined),
+    ]);
+    return [event ? BlossomServerListFactory.modify(event) : BlossomServerListFactory.create(), outboxes];
 }
 /** An action that adds a server to the Blossom servers event */
 export function AddBlossomServer(server) {
-    return ModifyBlossomServersEvent(Array.isArray(server) ? server.map((s) => addBlossomServer(s)) : [addBlossomServer(server)]);
+    const servers = Array.isArray(server) ? server : [server];
+    return async (context) => {
+        const [factory, outboxes] = await modifyBlossomServers(context);
+        const signed = await servers.reduce((f, s) => f.addServer(s), factory).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
 /** An action that removes a server from the Blossom servers event */
 export function RemoveBlossomServer(server) {
-    return ModifyBlossomServersEvent(Array.isArray(server) ? server.map((s) => removeBlossomServer(s)) : [removeBlossomServer(server)]);
-}
-// Small event operation to prepend a tag to the events tags
-function prependTag(tag) {
-    return (draft) => ({ ...draft, tags: [tag, ...draft.tags] });
+    const servers = Array.isArray(server) ? server : [server];
+    return async (context) => {
+        const [factory, outboxes] = await modifyBlossomServers(context);
+        const signed = await servers.reduce((f, s) => f.removeServer(s), factory).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
-/** Makes a specific Blossom server the default server (move it to the top of the list) */
+/** Makes a specific Blossom server the default server (moves it to the top of the list) */
 export function SetDefaultBlossomServer(server) {
-    return ModifyBlossomServersEvent([removeBlossomServer(server), prependTag(["server", String(server)])]);
+    return async (context) => {
+        const [factory, outboxes] = await modifyBlossomServers(context);
+        const signed = await factory.setDefaultServer(server).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
 /** Creates a new Blossom servers event */
 export function NewBlossomServers(servers) {
-    return async ({ events, factory, self, user, publish, sign }) => {
+    return async ({ events, signer, self, user, publish }) => {
         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) => addBlossomServer(s)) : [];
-        const signed = await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, ...operations).then(sign);
+        let factory = BlossomServerListFactory.create();
+        if (servers?.length)
+            factory = servers.reduce((f, s) => f.addServer(s), factory);
+        const signed = await factory.sign(signer);
         await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }

package/dist/actions/bookmarks.js

@@ -1,37 +1,18 @@
-import * as List from "applesauce-common/operations/list";
-import { addEventBookmarkTag, removeEventBookmarkTag } from "applesauce-common/operations/tag/bookmarks";
+import { BookmarkListFactory, BookmarkSetFactory } from "applesauce-common/factories";
 import { getReplaceableIdentifier, kinds } from "applesauce-core/helpers/event";
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
-function ModifyBookmarkSetEvent(operations, set, hidden = false) {
-    const identifier = typeof set === "string" ? set : getReplaceableIdentifier(set);
-    return async ({ factory, user, publish, sign }) => {
-        const [event, outboxes] = await Promise.all([
-            user.replaceable(kinds.Bookmarksets, identifier).$first(1000, undefined),
-            user.outboxes$.$first(1000, undefined),
-        ]);
-        const operation = hidden ? modifyHiddenTags(...operations) : modifyPublicTags(...operations);
-        // Modify or build new event
-        const signed = event
-            ? await factory.modify(event, operation).then(sign)
-            : await factory.build({ kind: kinds.Bookmarksets }, operation).then(sign);
-        // Publish the event to the user's outboxes
-        await publish(signed, outboxes);
-    };
+async function modifyBookmarkList({ user }) {
+    const [event, outboxes] = await Promise.all([
+        user.replaceable(kinds.BookmarkList).$first(1000, undefined),
+        user.outboxes$.$first(1000, undefined),
+    ]);
+    return [event ? BookmarkListFactory.modify(event) : BookmarkListFactory.create(), outboxes];
 }
-function ModifyBookmarkListEvent(operations, hidden = false) {
-    return async ({ factory, user, publish, sign }) => {
-        const [event, outboxes] = await Promise.all([
-            user.replaceable(kinds.BookmarkList).$first(1000, undefined),
-            user.outboxes$.$first(1000, undefined),
-        ]);
-        const operation = hidden ? modifyHiddenTags(...operations) : modifyPublicTags(...operations);
-        // Modify or build new event
-        const signed = event
-            ? await factory.modify(event, operation).then(sign)
-            : await factory.build({ kind: kinds.BookmarkList }, operation).then(sign);
-        // Publish the event to the user's outboxes
-        await publish(signed, outboxes);
-    };
+async function modifyBookmarkSet(identifier, { user }) {
+    const [event, outboxes] = await Promise.all([
+        user.replaceable(kinds.Bookmarksets, identifier).$first(1000, undefined),
+        user.outboxes$.$first(1000, undefined),
+    ]);
+    return [event ? BookmarkSetFactory.modify(event) : BookmarkSetFactory.create(), outboxes];
 }
 /**
  * An action that adds a note or article to the bookmark list or a bookmark set
@@ -40,12 +21,20 @@ function ModifyBookmarkListEvent(operations, hidden = false) {
  * @param hidden set to true to add to hidden bookmarks
  */
 export function BookmarkEvent(event, identifier, hidden) {
-    const operation = addEventBookmarkTag(event);
     if (typeof identifier === "string" || identifier?.kind === kinds.Bookmarksets) {
-        return ModifyBookmarkSetEvent([operation], identifier, hidden);
+        const id = typeof identifier === "string" ? identifier : getReplaceableIdentifier(identifier);
+        return async (context) => {
+            const [factory, outboxes] = await modifyBookmarkSet(id, context);
+            const signed = await factory.bookmarkEvent(event, hidden).sign(context.signer);
+            await context.publish(signed, outboxes);
+        };
     }
     else if (identifier === undefined || identifier?.kind === kinds.BookmarkList) {
-        return ModifyBookmarkListEvent([operation], hidden);
+        return async (context) => {
+            const [factory, outboxes] = await modifyBookmarkList(context);
+            const signed = await factory.bookmarkEvent(event, hidden).sign(context.signer);
+            await context.publish(signed, outboxes);
+        };
     }
     else {
         throw new Error(`Event kind ${identifier.kind} is not a bookmark list or bookmark set`);
@@ -58,12 +47,20 @@ export function BookmarkEvent(event, identifier, hidden) {
  * @param hidden set to true to remove from hidden bookmarks
  */
 export function UnbookmarkEvent(event, identifier, hidden) {
-    const operation = removeEventBookmarkTag(event);
     if (typeof identifier === "string" || identifier?.kind === kinds.Bookmarksets) {
-        return ModifyBookmarkSetEvent([operation], identifier, hidden);
+        const id = typeof identifier === "string" ? identifier : getReplaceableIdentifier(identifier);
+        return async (context) => {
+            const [factory, outboxes] = await modifyBookmarkSet(id, context);
+            const signed = await factory.unbookmarkEvent(event, hidden).sign(context.signer);
+            await context.publish(signed, outboxes);
+        };
     }
     else if (identifier === undefined || identifier?.kind === kinds.BookmarkList) {
-        return ModifyBookmarkListEvent([operation], hidden);
+        return async (context) => {
+            const [factory, outboxes] = await modifyBookmarkList(context);
+            const signed = await factory.unbookmarkEvent(event, hidden).sign(context.signer);
+            await context.publish(signed, outboxes);
+        };
     }
     else {
         throw new Error(`Event kind ${identifier.kind} is not a bookmark list or bookmark set`);
@@ -71,22 +68,28 @@ export function UnbookmarkEvent(event, identifier, hidden) {
 }
 /** An action that creates a new bookmark list for a user */
 export function CreateBookmarkList(bookmarks) {
-    return async ({ events, factory, self, user, publish, sign }) => {
-        const existing = events.getReplaceable(kinds.BookmarkList, self);
+    return async ({ user, signer, publish }) => {
+        const existing = await user.replaceable(kinds.BookmarkList).$first(1000, undefined);
         if (existing)
             throw new Error("Bookmark list already exists");
-        const signed = await factory
-            .build({ kind: kinds.BookmarkList }, bookmarks ? modifyPublicTags(...bookmarks.map(addEventBookmarkTag)) : undefined)
-            .then(sign);
+        let factory = BookmarkListFactory.create();
+        if (bookmarks)
+            factory = bookmarks.reduce((f, b) => f.bookmarkEvent(b), factory);
+        const signed = await factory.sign(signer);
         await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }
 /** An action that creates a new bookmark set for a user */
 export function CreateBookmarkSet(title, description, additional) {
-    return async ({ factory, user, publish, sign }) => {
-        const signed = await factory
-            .build({ kind: kinds.BookmarkList }, List.setTitle(title), List.setDescription(description), additional.image ? List.setImage(additional.image) : undefined, additional.public ? modifyPublicTags(...additional.public.map(addEventBookmarkTag)) : undefined, additional.hidden ? modifyHiddenTags(...additional.hidden.map(addEventBookmarkTag)) : undefined)
-            .then(sign);
+    return async ({ signer, user, publish }) => {
+        let factory = BookmarkSetFactory.create().title(title).description(description);
+        if (additional.image)
+            factory = factory.image(additional.image);
+        if (additional.public)
+            factory = additional.public.reduce((f, b) => f.bookmarkEvent(b), factory);
+        if (additional.hidden)
+            factory = additional.hidden.reduce((f, b) => f.bookmarkEvent(b, true), factory);
+        const signed = await factory.sign(signer);
         await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }

package/dist/actions/calendar.d.ts

@@ -5,5 +5,5 @@ import { Action } from "../action-runner.js";
 export declare function AddEventToCalendar(calendar: NostrEvent | AddressPointer, event: NostrEvent | AddressPointer): Action;
 /** Removes a calendar event from a calendar */
 export declare function RemoveEventFromCalendar(calendar: NostrEvent | AddressPointer, event: NostrEvent | AddressPointer): Action;
-/** Creates a new calendar event with title and events */
+/** Creates a new calendar with a title and optional events */
 export declare function CreateCalendar(title: string, events?: (NostrEvent | AddressPointer)[]): Action;

package/dist/actions/calendar.js

@@ -1,39 +1,45 @@
+import { CalendarFactory } from "applesauce-common/factories";
 import { DATE_BASED_CALENDAR_EVENT_KIND, TIME_BASED_CALENDAR_EVENT_KIND, } from "applesauce-common/helpers/calendar-event";
-import * as Calendar from "applesauce-common/operations/calendar";
-import { isEvent, kinds } from "applesauce-core/helpers/event";
+import { isEvent } from "applesauce-core/helpers/event";
 import { firstValueFrom, of, timeout } from "rxjs";
-function ModifyCalendarEvent(calendar, operations) {
-    return async ({ factory, user, publish, events, sign }) => {
-        const [event, outboxes] = await Promise.all([
-            isEvent(calendar)
-                ? Promise.resolve(calendar)
-                : firstValueFrom(events.replaceable(kinds.Calendar, user.pubkey).pipe(timeout({ first: 1000, with: () => of(undefined) }))),
-            user.outboxes$.$first(1000, undefined),
-        ]);
-        if (!event)
-            throw new Error("Calendar event not found");
-        const signed = await factory.modify(event, ...operations).then(sign);
-        await publish(signed, outboxes);
-    };
+async function modifyCalendar(calendar, { events, user }) {
+    const [calendarEvent, outboxes] = await Promise.all([
+        isEvent(calendar)
+            ? Promise.resolve(calendar)
+            : firstValueFrom(events.replaceable(calendar).pipe(timeout({ first: 1000, with: () => of(undefined) }))),
+        user.outboxes$.$first(1000, undefined),
+    ]);
+    if (!calendarEvent)
+        throw new Error("Calendar event not found");
+    return [CalendarFactory.modify(calendarEvent), outboxes];
 }
 /** Adds a calendar event to a calendar */
 export function AddEventToCalendar(calendar, event) {
     if (event.kind !== DATE_BASED_CALENDAR_EVENT_KIND && event.kind !== TIME_BASED_CALENDAR_EVENT_KIND)
         throw new Error("Event is not a calendar event");
-    return ModifyCalendarEvent(calendar, [Calendar.addEvent(event)]);
+    return async (context) => {
+        const [factory, outboxes] = await modifyCalendar(calendar, context);
+        const signed = await factory.addEvent(event).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
 /** Removes a calendar event from a calendar */
 export function RemoveEventFromCalendar(calendar, event) {
     if (event.kind !== DATE_BASED_CALENDAR_EVENT_KIND && event.kind !== TIME_BASED_CALENDAR_EVENT_KIND)
         throw new Error("Event is not a calendar event");
-    return ModifyCalendarEvent(calendar, [Calendar.removeEvent(event)]);
+    return async (context) => {
+        const [factory, outboxes] = await modifyCalendar(calendar, context);
+        const signed = await factory.removeEvent(event).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
-/** Creates a new calendar event with title and events */
+/** Creates a new calendar with a title and optional events */
 export function CreateCalendar(title, events) {
-    return async ({ factory, sign, publish, user }) => {
-        const event = await factory
-            .build({ kind: kinds.Calendar }, Calendar.setTitle(title), ...(events?.map((event) => Calendar.addEvent(event)) ?? []))
-            .then(sign);
-        await publish(event, await user.outboxes$.$first(1000, undefined));
+    return async ({ signer, publish, user }) => {
+        let factory = CalendarFactory.create(title);
+        for (const event of events ?? [])
+            factory = factory.addEvent(event);
+        const signed = await factory.sign(signer);
+        await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }

package/dist/actions/comment.d.ts

@@ -1,4 +1,4 @@
-import { CommentBlueprintOptions } from "applesauce-common/blueprints";
+import { CommentBlueprintOptions } from "applesauce-common/factories";
 import { CommentPointer } from "applesauce-common/helpers/comment";
 import { NostrEvent } from "applesauce-core/helpers/event";
 import { Action } from "../action-runner.js";

package/dist/actions/comment.js

@@ -1,4 +1,4 @@
-import { CommentBlueprint } from "applesauce-common/blueprints";
+import { CommentFactory } from "applesauce-common/factories";
 import { castUser } from "applesauce-common/casts";
 import { isCommentAddressPointer, isCommentEventPointer } from "applesauce-common/helpers/comment";
 import { relaySet } from "applesauce-core/helpers";
@@ -23,7 +23,9 @@ function getParentPubkey(parent) {
  * - The current user's outboxes
  */
 export function CreateComment(parent, content, options) {
-    return async ({ factory, user, publish, events, sign }) => {
+    return async ({ signer, user, publish, events }) => {
+        if (!signer)
+            throw new Error("Missing signer");
         // Get the parent author's pubkey from the pointer/event (without loading the full event)
         const parentAuthorPubkey = getParentPubkey(parent);
         // Get the parent author's inboxes in parallel with resolving the event
@@ -34,7 +36,7 @@ export function CreateComment(parent, content, options) {
             user.outboxes$.$first(1_000, undefined),
         ]);
         // Create and sign the comment
-        const comment = await factory.create(CommentBlueprint, parent, content, options).then(sign);
+        const comment = await CommentFactory.create(parent, content, options).sign(signer);
         // Combine all relay lists (remove duplicates)
         const relays = relaySet(parentAuthorInboxes, userOutboxes);
         // Publish to all relays (inboxes and outboxes)

package/dist/actions/contacts.d.ts

@@ -1,8 +1,8 @@
 import { ProfilePointer } from "applesauce-core/helpers/pointers";
 import { Action } from "../action-runner.js";
 /** An action that adds a pubkey to a users contacts event */
-export declare function FollowUser(user: string | ProfilePointer): Action;
+export declare function FollowUser(pointer: string | ProfilePointer): Action;
 /** An action that removes a pubkey from a users contacts event */
-export declare function UnfollowUser(user: string | ProfilePointer): Action;
-/** An action that creates a new kind 3 contacts lists, throws if a contact list already exists */
+export declare function UnfollowUser(pointer: string | ProfilePointer): Action;
+/** An action that creates a new kind 3 contacts list, throws if a contact list already exists */
 export declare function NewContacts(pubkeys?: (string | ProfilePointer)[]): Action;

package/dist/actions/contacts.js

@@ -1,40 +1,38 @@
-import { kinds } from "applesauce-core/helpers/event";
-import { modifyPublicTags } from "applesauce-core/operations";
-import { addProfilePointerTag, removeProfilePointerTag } from "applesauce-core/operations/tag/common";
-import { firstValueFrom, of, timeout } from "rxjs";
-function ModifyContactsEvent(operations) {
-    return async ({ events, factory, user, publish, sign }) => {
-        const [event, outboxes] = await Promise.all([
-            firstValueFrom(events.replaceable(kinds.Contacts, user.pubkey).pipe(timeout({ first: 1000, with: () => of(undefined) }))),
-            user.outboxes$.$first(1000, undefined),
-        ]);
-        const operation = modifyPublicTags(...operations);
-        // Modify or build new event
-        const signed = event
-            ? await factory.modify(event, operation).then(sign)
-            : await factory.build({ kind: kinds.Contacts }, operation).then(sign);
-        // Publish the event to the user's outboxes
-        await publish(signed, outboxes);
-    };
+import { ContactsFactory } from "applesauce-common/factories";
+import { kinds } from "applesauce-core/helpers";
+async function modifyContacts({ user }) {
+    const [event, outboxes] = await Promise.all([
+        user.replaceable(kinds.Contacts).$first(1000, undefined),
+        user.outboxes$.$first(1000, undefined),
+    ]);
+    return [event ? ContactsFactory.modify(event) : ContactsFactory.create(), outboxes];
 }
 /** An action that adds a pubkey to a users contacts event */
-export function FollowUser(user) {
-    return ModifyContactsEvent([addProfilePointerTag(user)]);
+export function FollowUser(pointer) {
+    return async (context) => {
+        const [factory, outboxes] = await modifyContacts(context);
+        const signed = await factory.addContact(pointer).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
 /** An action that removes a pubkey from a users contacts event */
-export function UnfollowUser(user) {
-    return ModifyContactsEvent([removeProfilePointerTag(user)]);
+export function UnfollowUser(pointer) {
+    return async (context) => {
+        const [factory, outboxes] = await modifyContacts(context);
+        const signed = await factory.removeContact(pointer).sign(context.signer);
+        await context.publish(signed, outboxes);
+    };
 }
-/** An action that creates a new kind 3 contacts lists, throws if a contact list already exists */
+/** An action that creates a new kind 3 contacts list, throws if a contact list already exists */
 export function NewContacts(pubkeys) {
-    return async ({ events, factory, self, user, publish, sign }) => {
-        const contacts = events.getReplaceable(kinds.Contacts, self);
-        if (contacts)
+    return async ({ user, signer, publish }) => {
+        const existing = await user.replaceable(kinds.Contacts).$first(1000, undefined);
+        if (existing)
             throw new Error("Contact list already exists");
-        const signed = await factory
-            .build({ kind: kinds.Contacts }, pubkeys ? modifyPublicTags(...pubkeys.map((p) => addProfilePointerTag(p))) : undefined)
-            .then(sign);
-        // Publish the event to the user's outboxes
+        let factory = ContactsFactory.create();
+        if (pubkeys?.length)
+            factory = pubkeys.reduce((f, p) => f.addContact(p), factory);
+        const signed = await factory.sign(signer);
         await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }