applesauce-actions 0.0.0-next-20251209200210 → 0.0.0-next-20251220152312

package/dist/actions/contacts.js

@@ -1,40 +1,40 @@
 import { kinds } from "applesauce-core/helpers/event";
-import { modifyHiddenTags, modifyPublicTags } from "applesauce-core/operations";
+import { 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 = addProfilePointerTag(pointer);
-        let draft;
-        // No contact list, create one
-        if (!contacts)
-            draft = await factory.build({ kind: kinds.Contacts }, hidden ? modifyHiddenTags(operation) : modifyPublicTags(operation));
-        else
-            draft = await factory.modifyTags(contacts, hidden ? { hidden: operation } : operation);
-        yield await factory.sign(draft);
+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);
     };
 }
+/** An action that adds a pubkey to a users contacts event */
+export function FollowUser(user) {
+    return ModifyContactsEvent([addProfilePointerTag(user)]);
+}
 /** An action that removes a pubkey from a users contacts event */
-export function UnfollowUser(user, hidden = false) {
-    return async function* ({ events, factory, self }) {
-        const contacts = events.getReplaceable(kinds.Contacts, self);
-        // Unable to find a contacts event, so we can't unfollow
-        if (!contacts)
-            return;
-        const operation = removeProfilePointerTag(user);
-        const draft = await factory.modifyTags(contacts, hidden ? { hidden: operation } : operation);
-        yield await factory.sign(draft);
-    };
+export function UnfollowUser(user) {
+    return ModifyContactsEvent([removeProfilePointerTag(user)]);
 }
 /** An action that creates a new kind 3 contacts lists, throws if a contact list already exists */
 export function NewContacts(pubkeys) {
-    return async function* ({ events, factory, self }) {
+    return async ({ events, factory, self, user, publish, sign }) => {
         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) => addProfilePointerTag(p))) : undefined);
-        yield await factory.sign(draft);
+        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
+        await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }

package/dist/actions/direct-message-relays.d.ts

@@ -0,0 +1,7 @@
+import { Action } from "../action-hub.js";
+/** An action that adds a relay to the 10050 DM relays event */
+export declare function AddDirectMessageRelay(relay: string | string[]): Action;
+/** An action that removes a relay from the 10050 DM relays event */
+export declare function RemoveDirectMessageRelay(relay: string | string[]): Action;
+/** Creates a new DM relays event */
+export declare function NewDirectMessageRelays(relays?: string[]): Action;

package/dist/actions/direct-message-relays.js

@@ -0,0 +1,47 @@
+import { firstValueFrom } from "applesauce-core";
+import { kinds } from "applesauce-core/helpers/event";
+import { addRelayTag, removeRelayTag } from "applesauce-core/operations/tag/relay";
+import { modifyPublicTags } from "applesauce-core/operations/tags";
+import { of, timeout } from "rxjs";
+function ModifyDirectMessageRelaysEvent(operations) {
+    return async ({ events, factory, self, user, publish, sign }) => {
+        const [event, outboxes] = await Promise.all([
+            firstValueFrom(events
+                .replaceable(kinds.DirectMessageRelaysList, self)
+                .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.DirectMessageRelaysList }, operation).then(sign);
+        // Publish the event to the user's outboxes
+        await publish(signed, outboxes);
+    };
+}
+/** An action that adds a relay to the 10050 DM relays event */
+export function AddDirectMessageRelay(relay) {
+    return ModifyDirectMessageRelaysEvent([
+        ...(Array.isArray(relay) ? relay.map((r) => addRelayTag(r)) : [addRelayTag(relay)]),
+    ]);
+}
+/** An action that removes a relay from the 10050 DM relays event */
+export function RemoveDirectMessageRelay(relay) {
+    return ModifyDirectMessageRelaysEvent([
+        ...(Array.isArray(relay) ? relay.map((r) => removeRelayTag(r)) : [removeRelayTag(relay)]),
+    ]);
+}
+/** Creates a new DM relays event */
+export function NewDirectMessageRelays(relays) {
+    return async ({ events, factory, self, user, publish, sign }) => {
+        const dmRelays = events.getReplaceable(kinds.DirectMessageRelaysList, self);
+        if (dmRelays)
+            throw new Error("DM relays event already exists");
+        const operations = relays?.map((r) => addRelayTag(r)) ?? [];
+        const signed = await factory
+            .build({ kind: kinds.DirectMessageRelaysList }, modifyPublicTags(...operations))
+            .then(sign);
+        await publish(signed, await user.outboxes$.$first(1000, undefined));
+    };
+}

package/dist/actions/favorite-relays.js

@@ -1,52 +1,50 @@
-import { FAVORITE_RELAYS_KIND } from "applesauce-common/helpers/lists";
+import { FAVORITE_RELAYS_KIND } from "applesauce-common/helpers/relay-list";
 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)
-        throw new Error("Can't find favorite relays event");
-    return event;
+function ModifyFavoriteRelaysEvent(operations, hidden = false) {
+    return async ({ factory, user, publish, sign }) => {
+        const [event, outboxes] = await Promise.all([
+            user.replaceable(FAVORITE_RELAYS_KIND).$first(1000, undefined),
+            user.outboxes$.$first(1000, undefined),
+        ]);
+        // create the event operation
+        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: FAVORITE_RELAYS_KIND }, operation).then(sign);
+        // Publish the event to the user's outboxes
+        await publish(signed, outboxes);
+    };
 }
 /** An action that adds a relay to the 10012 favorite relays event */
 export function AddFavoriteRelay(relay, hidden = false) {
-    return async function* ({ events, factory, self }) {
-        const favorites = getFavoriteRelaysEvent(events, self);
-        const operation = Array.isArray(relay) ? relay.map((r) => addRelayTag(r)) : addRelayTag(relay);
-        const draft = await factory.modifyTags(favorites, hidden ? { hidden: operation } : operation);
-        yield await factory.sign(draft);
-    };
+    if (typeof relay === "string")
+        relay = [relay];
+    return ModifyFavoriteRelaysEvent([...relay.map((r) => addRelayTag(r))], hidden);
 }
 /** An action that removes a relay from the 10012 favorite relays event */
 export function RemoveFavoriteRelay(relay, hidden = false) {
-    return async function* ({ events, factory, self }) {
-        const favorites = getFavoriteRelaysEvent(events, self);
-        const operation = Array.isArray(relay) ? relay.map((r) => removeRelayTag(r)) : removeRelayTag(relay);
-        const draft = await factory.modifyTags(favorites, hidden ? { hidden: operation } : operation);
-        yield await factory.sign(draft);
-    };
+    if (typeof relay === "string")
+        relay = [relay];
+    return ModifyFavoriteRelaysEvent([...relay.map((r) => removeRelayTag(r))], hidden);
 }
 /** An action that adds a relay set to the 10012 favorite relays event */
 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) => addAddressPointerTag(a)) : addAddressPointerTag(addr);
-        const draft = await factory.modifyTags(favorites, hidden ? { hidden: operation } : operation);
-        yield await factory.sign(draft);
-    };
+    if (!Array.isArray(addr))
+        addr = [addr];
+    return ModifyFavoriteRelaysEvent([...addr.map((a) => addAddressPointerTag(a))], hidden);
 }
 /** An action that removes a relay set from the 10012 favorite relays event */
 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) => removeAddressPointerTag(a)) : removeAddressPointerTag(addr);
-        const draft = await factory.modifyTags(favorites, hidden ? { hidden: operation } : operation);
-        yield await factory.sign(draft);
-    };
+    if (!Array.isArray(addr))
+        addr = [addr];
+    return ModifyFavoriteRelaysEvent([...addr.map((a) => removeAddressPointerTag(a))], hidden);
 }
 /** Creates a new favorite relays event */
 export function NewFavoriteRelays(relays, sets) {
-    return async function* ({ events, factory, self }) {
+    return async ({ events, factory, self, user, publish, sign }) => {
         const favorites = events.getReplaceable(FAVORITE_RELAYS_KIND, self);
         if (favorites)
             throw new Error("Favorite relays event already exists");
@@ -70,7 +68,10 @@ export function NewFavoriteRelays(relays, sets) {
             if (sets?.hidden)
                 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);
+        const signed = await factory
+            .build({ kind: FAVORITE_RELAYS_KIND }, publicOperations.length ? modifyPublicTags(...publicOperations) : undefined, hiddenOperations.length ? modifyHiddenTags(...hiddenOperations) : undefined)
+            .then(sign);
+        // Publish the event to the user's outboxes
+        await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }

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

@@ -16,7 +16,6 @@ export declare function CreateFollowSet(title: string, options?: {
  * @param pubkey the pubkey to add to the set
  * @param identifier the "d" tag of the follow set
  * @param hidden set to true to add to hidden follows
- * @throws if the follow set does not exist
  */
 export declare function AddUserToFollowSet(pubkey: (string | ProfilePointer)[] | string | ProfilePointer, identifier: NostrEvent | string, hidden?: boolean): Action;
 /**
@@ -24,7 +23,6 @@ export declare function AddUserToFollowSet(pubkey: (string | ProfilePointer)[] |
  * @param pubkey the pubkey to remove from the set
  * @param identifier the "d" tag of the follow set
  * @param hidden set to true to remove from hidden follows
- * @throws if the follow set does not exist
  */
 export declare function RemoveUserFromFollowSet(pubkey: (string | ProfilePointer)[] | string | ProfilePointer, identifier: NostrEvent | string, hidden?: boolean): Action;
 /**

package/dist/actions/follow-sets.js

@@ -1,27 +1,37 @@
 import * as List from "applesauce-common/operations/list";
 import { kinds } from "applesauce-core/helpers/event";
+import { getReplaceableIdentifier } 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)
-        throw new Error("Can't find follow set");
-    if (set.kind !== kinds.Followsets)
-        throw new Error("Event is not a follow set");
-    return set;
+function ModifyFollowSetEvent(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.Followsets, 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.Followsets }, operation).then(sign);
+        // Publish the event to the user's outboxes
+        await publish(signed, outboxes);
+    };
 }
 /**
  * An action that creates a new follow set
  * @throws if a follow set already exists
  */
 export function CreateFollowSet(title, options) {
-    return async function* ({ factory }) {
+    return async ({ factory, user, publish }) => {
         const draft = await factory.build({ kind: kinds.Followsets }, 
         // 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) => addProfilePointerTag(p))) : undefined, options?.hidden ? modifyHiddenTags(...options.hidden.map((p) => addProfilePointerTag(p))) : undefined);
-        yield await factory.sign(draft);
+        const signed = await factory.sign(draft);
+        await publish(signed, await user.outboxes$.$first(1000, undefined));
     };
 }
 /**
@@ -29,34 +39,18 @@ export function CreateFollowSet(title, options) {
  * @param pubkey the pubkey to add to the set
  * @param identifier the "d" tag of the follow set
  * @param hidden set to true to add to hidden follows
- * @throws if the follow set does not exist
  */
 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) => addProfilePointerTag(p))
-            : addProfilePointerTag(pubkey);
-        const draft = await factory.modifyTags(follows, hidden ? { hidden: operations } : operations);
-        yield await factory.sign(draft);
-    };
+    return ModifyFollowSetEvent(Array.isArray(pubkey) ? pubkey.map((p) => addProfilePointerTag(p)) : [addProfilePointerTag(pubkey)], identifier, hidden);
 }
 /**
  * An action that removes a pubkey from a follow set
  * @param pubkey the pubkey to remove from the set
  * @param identifier the "d" tag of the follow set
  * @param hidden set to true to remove from hidden follows
- * @throws if the follow set does not exist
  */
 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) => removeProfilePointerTag(p))
-            : removeProfilePointerTag(pubkey);
-        const draft = await factory.modifyTags(follows, hidden ? { hidden: operations } : operations);
-        yield await factory.sign(draft);
-    };
+    return ModifyFollowSetEvent(Array.isArray(pubkey) ? pubkey.map((p) => removeProfilePointerTag(p)) : [removeProfilePointerTag(pubkey)], identifier, hidden);
 }
 /**
  * An action that updates the title, description, or image of a follow set
@@ -65,9 +59,16 @@ export function RemoveUserFromFollowSet(pubkey, identifier, hidden = false) {
  * @throws if the follow set does not exist
  */
 export function UpdateFollowSetInformation(identifier, info) {
-    return async function* ({ events, factory, self }) {
-        const follows = getFollowSetEvent(events, self, identifier);
-        const draft = await factory.modify(follows, info?.title ? List.setTitle(info.title) : undefined, info?.description ? List.setDescription(info.description) : undefined, info?.image ? List.setImage(info.image) : undefined);
-        yield await factory.sign(draft);
+    return async ({ factory, sign, user, publish }) => {
+        const [event, outboxes] = await Promise.all([
+            user.replaceable(kinds.Followsets, identifier).$first(1000, undefined),
+            user.outboxes$.$first(1000, undefined),
+        ]);
+        if (!event)
+            throw new Error("Follow set not found");
+        const signed = await factory
+            .modify(event, info?.title ? List.setTitle(info.title) : undefined, info?.description ? List.setDescription(info.description) : undefined, info?.image ? List.setImage(info.image) : undefined)
+            .then(sign);
+        await publish(signed, outboxes);
     };
 }

package/dist/actions/index.d.ts

@@ -4,7 +4,7 @@ export * from "./blossom.js";
 export * from "./bookmarks.js";
 export * from "./calendar.js";
 export * from "./contacts.js";
-export * from "./dm-relays.js";
+export * from "./direct-message-relays.js";
 export * from "./favorite-relays.js";
 export * from "./follow-sets.js";
 export * from "./legacy-messages.js";

package/dist/actions/index.js

@@ -4,7 +4,7 @@ export * from "./blossom.js";
 export * from "./bookmarks.js";
 export * from "./calendar.js";
 export * from "./contacts.js";
-export * from "./dm-relays.js";
+export * from "./direct-message-relays.js";
 export * from "./favorite-relays.js";
 export * from "./follow-sets.js";
 export * from "./legacy-messages.js";

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

@@ -1,5 +1,5 @@
-import { NostrEvent } from "applesauce-core/helpers/event";
 import { LegacyMessageBlueprintOptions } from "applesauce-common/blueprints";
+import { NostrEvent } from "applesauce-core/helpers/event";
 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,20 +1,35 @@
-import { kinds } from "applesauce-core/helpers/event";
 import { LegacyMessageBlueprint, LegacyMessageReplyBlueprint, } from "applesauce-common/blueprints";
+import { castUser } from "applesauce-common/casts";
+import { kinds } from "applesauce-core/helpers/event";
 /** Sends a legacy NIP-04 message to a recipient */
 export function SendLegacyMessage(recipient, message, opts) {
-    return async function* ({ factory }) {
-        const draft = await factory.create(LegacyMessageBlueprint, recipient, message, opts);
-        // Return the signed message
-        yield await factory.sign(draft);
+    return async ({ factory, sign, publish, events }) => {
+        const signed = await factory.create(LegacyMessageBlueprint, recipient, message, opts).then(sign);
+        // Get the recipient's inbox relays
+        const receiver = castUser(recipient, events);
+        const [inboxes, directMessageRelays] = await Promise.all([
+            receiver.inboxes$.$first(1_000, undefined),
+            receiver.directMessageRelays$.$first(1_000, undefined),
+        ]);
+        // Use the dm relays or inboxes as the inbox relays for the recipient
+        const relays = directMessageRelays ?? inboxes ?? undefined;
+        await publish(signed, relays);
     };
 }
 /** Send a reply to a legacy message */
 export function ReplyToLegacyMessage(parent, message, opts) {
-    return async function* ({ factory }) {
+    return async ({ factory, sign, publish, events, }) => {
         if (parent.kind !== kinds.EncryptedDirectMessage)
             throw new Error("Legacy messages can only reply to other legacy messages");
-        const draft = await factory.create(LegacyMessageReplyBlueprint, parent, message, opts);
-        // Return the signed message
-        yield await factory.sign(draft);
+        const signed = await factory.create(LegacyMessageReplyBlueprint, parent, message, opts).then(sign);
+        // Get the recipient's inbox relays (the sender of the parent message)
+        const receiver = castUser(parent.pubkey, events);
+        const [inboxes, directMessageRelays] = await Promise.all([
+            receiver.inboxes$.$first(1_000, undefined),
+            receiver.directMessageRelays$.$first(1_000, undefined),
+        ]);
+        // Use the dm relays or inboxes as the inbox relays for the recipient
+        const relays = directMessageRelays ?? inboxes ?? undefined;
+        await publish(signed, relays);
     };
 }

package/dist/actions/lists.js

@@ -10,9 +10,11 @@ function getList(events, address) {
 }
 /** An action that sets or removes a NIP-15 list information */
 export function SetListMetadata(list, info) {
-    return async function* ({ events, factory }) {
+    return async ({ events, factory, sign, publish }) => {
         list = getList(events, list);
-        const draft = await factory.modify(list, List.setTitle(info.title ?? null), List.setDescription(info.description ?? null), List.setImage(info.image ?? null));
-        yield await factory.sign(draft);
+        const signed = await factory
+            .modify(list, List.setTitle(info.title ?? null), List.setDescription(info.description ?? null), List.setImage(info.image ?? null))
+            .then(sign);
+        await publish(signed);
     };
 }

package/dist/actions/mailboxes.js

@@ -1,65 +1,67 @@
+import { getOutboxes, relaySet } from "applesauce-core/helpers";
 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);
+    return async ({ factory, user, publish, sign }) => {
+        const mailboxes = await user.replaceable(kinds.RelayList).$first(1000, undefined);
         if (mailboxes)
             throw new Error("Mailbox event already exists");
-        const draft = await factory.build({ kind: kinds.RelayList }, ...inboxes.map(addInboxRelay), ...outboxes.map(addOutboxRelay));
-        const signed = await factory.sign(draft);
-        yield signed;
+        const signed = await factory
+            .build({ kind: kinds.RelayList }, ...inboxes.map(addInboxRelay), ...outboxes.map(addOutboxRelay))
+            .then(sign);
+        await publish(signed, relaySet(getOutboxes(signed)));
     };
 }
 /** An action to add an inbox relay to the kind 10002 relay list */
 export function AddInboxRelay(relay) {
-    return async function* ({ events, factory, self }) {
+    return async ({ factory, user, publish, sign }) => {
         if (typeof relay === "string")
             relay = [relay];
-        const mailboxes = events.getReplaceable(kinds.RelayList, self);
-        const draft = mailboxes
-            ? await factory.modify(mailboxes, ...relay.map(addInboxRelay))
-            : await factory.build({ kind: kinds.RelayList }, ...relay.map(addInboxRelay));
-        const signed = await factory.sign(draft);
-        yield signed;
+        const mailboxes = await user.replaceable(kinds.RelayList).$first(1000, undefined);
+        const signed = mailboxes
+            ? await factory.modify(mailboxes, ...relay.map(addInboxRelay)).then(sign)
+            : await factory.build({ kind: kinds.RelayList }, ...relay.map(addInboxRelay)).then(sign);
+        // Publish the event to the old and new outboxes
+        await publish(signed, relaySet(getOutboxes(signed), mailboxes && getOutboxes(mailboxes)));
     };
 }
 /** An action to remove an inbox relay from the kind 10002 relay list */
 export function RemoveInboxRelay(relay) {
-    return async function* ({ events, factory, self }) {
+    return async ({ factory, user, publish, sign }) => {
         if (typeof relay === "string")
             relay = [relay];
-        const mailboxes = events.getReplaceable(kinds.RelayList, self);
+        const mailboxes = await user.replaceable(kinds.RelayList).$first(1000, undefined);
         if (!mailboxes)
             return;
-        const draft = await factory.modify(mailboxes, ...relay.map(removeInboxRelay));
-        const signed = await factory.sign(draft);
-        yield signed;
+        const signed = await factory.modify(mailboxes, ...relay.map(removeInboxRelay)).then(sign);
+        // Publish to outboxes
+        await publish(signed, getOutboxes(signed));
     };
 }
 /** An action to add an outbox relay to the kind 10002 relay list */
 export function AddOutboxRelay(relay) {
-    return async function* ({ events, factory, self }) {
+    return async ({ factory, user, publish, sign }) => {
         if (typeof relay === "string")
             relay = [relay];
-        const mailboxes = events.getReplaceable(kinds.RelayList, self);
-        const draft = mailboxes
-            ? await factory.modify(mailboxes, ...relay.map(addOutboxRelay))
-            : await factory.build({ kind: kinds.RelayList }, ...relay.map(addOutboxRelay));
-        const signed = await factory.sign(draft);
-        yield signed;
+        const mailboxes = await user.replaceable(kinds.RelayList).$first(1000, undefined);
+        const signed = mailboxes
+            ? await factory.modify(mailboxes, ...relay.map(addOutboxRelay)).then(sign)
+            : await factory.build({ kind: kinds.RelayList }, ...relay.map(addOutboxRelay)).then(sign);
+        // Publish to outboxes
+        await publish(signed, getOutboxes(signed));
     };
 }
 /** An action to remove an outbox relay from the kind 10002 relay list */
 export function RemoveOutboxRelay(relay) {
-    return async function* ({ events, factory, self }) {
+    return async ({ factory, user, publish, sign }) => {
         if (typeof relay === "string")
             relay = [relay];
-        const mailboxes = events.getReplaceable(kinds.RelayList, self);
+        const mailboxes = await user.replaceable(kinds.RelayList).$first(1000, undefined);
         if (!mailboxes)
             return;
-        const draft = await factory.modify(mailboxes, ...relay.map(removeOutboxRelay));
-        const signed = await factory.sign(draft);
-        yield signed;
+        const signed = await factory.modify(mailboxes, ...relay.map(removeOutboxRelay)).then(sign);
+        // Publish to outboxes
+        await publish(signed, getOutboxes(signed));
     };
 }