applesauce-actions 2.0.0 → 2.3.0

package/dist/actions/blossom.js

@@ -1,41 +1,41 @@
 import { BLOSSOM_SERVER_LIST_KIND } from "applesauce-core/helpers/blossom";
-import { modifyPublicTags } from "applesauce-factory/operations/event";
+import { modifyPublicTags, modifyTags } from "applesauce-factory/operations/event";
 import { addBlossomServerTag, removeBlossomServerTag } from "applesauce-factory/operations/tag/blossom";
-function getBlossomServersEvent(events, self) {
-    const event = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
-    if (!event)
-        throw new Error("Can't find Blossom servers event");
-    return event;
-}
 /** An action that adds a server to the Blossom servers event */
 export function AddBlossomServer(server) {
     return async function* ({ events, factory, self }) {
-        const servers = getBlossomServersEvent(events, self);
+        const servers = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
         const operation = Array.isArray(server) ? server.map((s) => addBlossomServerTag(s)) : addBlossomServerTag(server);
-        const draft = await factory.modifyTags(servers, operation);
+        // Modify or build new event
+        const draft = servers
+            ? await factory.modifyTags(servers, operation)
+            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyTags(operation));
         yield await factory.sign(draft);
     };
 }
 /** An action that removes a server from the Blossom servers event */
 export function RemoveBlossomServer(server) {
     return async function* ({ events, factory, self }) {
-        const servers = getBlossomServersEvent(events, self);
+        const servers = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
         const operation = Array.isArray(server)
             ? server.map((s) => removeBlossomServerTag(s))
             : removeBlossomServerTag(server);
-        const draft = await factory.modifyTags(servers, operation);
+        // Modify or build new event
+        const draft = servers
+            ? await factory.modifyTags(servers, operation)
+            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyTags(operation));
         yield await factory.sign(draft);
     };
 }
 /** Makes a specific Blossom server the default server (move it to the top of the list) */
 export function SetDefaultBlossomServer(server) {
     return async function* ({ events, factory, self }) {
-        const servers = getBlossomServersEvent(events, self);
+        const servers = events.getReplaceable(BLOSSOM_SERVER_LIST_KIND, self);
         const prependTag = (tag) => (tags) => [tag, ...tags];
-        const draft = await factory.modifyTags(servers, [
-            removeBlossomServerTag(server),
-            prependTag(["server", String(server)]),
-        ]);
+        const operations = [removeBlossomServerTag(server), prependTag(["server", String(server)])];
+        const draft = servers
+            ? await factory.modifyTags(servers, operations)
+            : await factory.build({ kind: BLOSSOM_SERVER_LIST_KIND }, modifyTags(...operations));
         yield await factory.sign(draft);
     };
 }

package/dist/actions/bookmarks.d.ts

@@ -3,17 +3,17 @@ import { Action } from "../action-hub.js";
 /**
  * An action that adds a note or article to the bookmark list or a bookmark set
  * @param event the event to bookmark
- * @param identifier the "d" tag of the bookmark set
+ * @param identifier the "d" tag of the bookmark set or `undefined` for the default bookmark list
  * @param hidden set to true to add to hidden bookmarks
  */
-export declare function BookmarkEvent(event: NostrEvent, identifier?: string, hidden?: boolean): Action;
+export declare function BookmarkEvent(event: NostrEvent, identifier?: string | NostrEvent, hidden?: boolean): Action;
 /**
  * An action that removes a note or article from the bookmark list or bookmark set
  * @param event the event to remove from bookmarks
- * @param identifier the "d" tag of the bookmark set
+ * @param identifier the "d" tag of the bookmark set or `undefined` for the default bookmark list
  * @param hidden set to true to remove from hidden bookmarks
  */
-export declare function UnbookmarkEvent(event: NostrEvent, identifier: string, hidden?: boolean): Action;
+export declare function UnbookmarkEvent(event: NostrEvent, identifier?: string | NostrEvent, hidden?: boolean): Action;
 /** An action that creates a new bookmark list for a user */
 export declare function CreateBookmarkList(bookmarks?: NostrEvent[]): Action;
 /** An action that creates a new bookmark set for a user */

package/dist/actions/bookmarks.js

@@ -1,45 +1,72 @@
 import { modifyHiddenTags, modifyPublicTags, setListDescription, setListImage, setListTitle, } from "applesauce-factory/operations/event";
 import { addEventBookmarkTag, removeEventBookmarkTag } from "applesauce-factory/operations/tag";
 import { kinds } from "nostr-tools";
-function getBookmarkEvent(events, self, identifier) {
-    return events.getReplaceable(identifier ? kinds.Bookmarksets : kinds.BookmarkList, self, identifier);
-}
 /**
  * An action that adds a note or article to the bookmark list or a bookmark set
  * @param event the event to bookmark
- * @param identifier the "d" tag of the bookmark set
+ * @param identifier the "d" tag of the bookmark set or `undefined` for the default bookmark list
  * @param hidden set to true to add to hidden bookmarks
  */
 export function BookmarkEvent(event, identifier, hidden = false) {
     return async function* ({ events, factory, self }) {
-        const bookmarks = getBookmarkEvent(events, self, identifier);
-        if (!bookmarks)
-            throw new Error("Cant find bookmarks");
+        let draft;
         const operation = addEventBookmarkTag(event);
-        const draft = await factory.modifyTags(bookmarks, hidden ? { hidden: operation } : operation);
+        if (typeof identifier === "string" || identifier?.kind === kinds.Bookmarksets) {
+            const list = typeof identifier === "string" ? events.getReplaceable(kinds.Bookmarksets, self, identifier) : identifier;
+            if (list && list.kind !== kinds.Bookmarksets)
+                throw new Error("Event is not a bookmark set");
+            // Modify or build new event bookmark set
+            draft = list
+                ? await factory.modifyTags(list, hidden ? { hidden: operation } : operation)
+                : await factory.build({ kind: kinds.Bookmarksets }, hidden ? modifyHiddenTags(operation) : modifyPublicTags(operation));
+        }
+        else if (identifier === undefined || identifier?.kind === kinds.BookmarkList) {
+            const list = identifier ? identifier : events.getReplaceable(kinds.BookmarkList, self);
+            if (list && list.kind !== kinds.BookmarkList)
+                throw new Error("Event is not a bookmark list");
+            // Modify or build new event bookmark list
+            draft = list
+                ? await factory.modifyTags(list, hidden ? { hidden: operation } : operation)
+                : await factory.build({ kind: kinds.BookmarkList }, hidden ? modifyHiddenTags(operation) : modifyPublicTags(operation));
+        }
+        else {
+            throw new Error(`Event kind ${identifier.kind} is not a bookmark list or bookmark set`);
+        }
         yield await factory.sign(draft);
     };
 }
 /**
  * An action that removes a note or article from the bookmark list or bookmark set
  * @param event the event to remove from bookmarks
- * @param identifier the "d" tag of the bookmark set
+ * @param identifier the "d" tag of the bookmark set or `undefined` for the default bookmark list
  * @param hidden set to true to remove from hidden bookmarks
  */
 export function UnbookmarkEvent(event, identifier, hidden = false) {
     return async function* ({ events, factory, self }) {
-        const bookmarks = getBookmarkEvent(events, self, identifier);
-        if (!bookmarks)
-            throw new Error("Cant find bookmarks");
+        let list;
         const operation = removeEventBookmarkTag(event);
-        const draft = await factory.modifyTags(bookmarks, hidden ? { hidden: operation } : operation);
+        if (typeof identifier === "string" || identifier?.kind === kinds.Bookmarksets) {
+            list = typeof identifier === "string" ? events.getReplaceable(kinds.Bookmarksets, self, identifier) : identifier;
+        }
+        else if (identifier === undefined || identifier?.kind === kinds.BookmarkList) {
+            list = identifier ? identifier : events.getReplaceable(kinds.BookmarkList, self);
+            if (!list)
+                return;
+        }
+        else {
+            throw new Error(`Event kind ${identifier.kind} is not a bookmark list or bookmark set`);
+        }
+        // If no list is found, return
+        if (!list)
+            return;
+        const draft = await factory.modifyTags(list, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
 }
 /** An action that creates a new bookmark list for a user */
 export function CreateBookmarkList(bookmarks) {
     return async function* ({ events, factory, self }) {
-        const existing = getBookmarkEvent(events, self);
+        const existing = events.getReplaceable(kinds.BookmarkList, self);
         if (existing)
             throw new Error("Bookmark list already exists");
         const draft = await factory.build({ kind: kinds.BookmarkList }, bookmarks ? modifyPublicTags(...bookmarks.map(addEventBookmarkTag)) : undefined);
@@ -48,10 +75,7 @@ export function CreateBookmarkList(bookmarks) {
 }
 /** An action that creates a new bookmark set for a user */
 export function CreateBookmarkSet(title, description, additional) {
-    return async function* ({ events, factory, self }) {
-        const existing = getBookmarkEvent(events, self);
-        if (existing)
-            throw new Error("Bookmark list already exists");
+    return async function* ({ factory }) {
         const draft = await factory.build({ kind: kinds.BookmarkList }, setListTitle(title), setListDescription(description), additional.image ? setListImage(additional.image) : undefined, additional.public ? modifyPublicTags(...additional.public.map(addEventBookmarkTag)) : undefined, additional.hidden ? modifyHiddenTags(...additional.hidden.map(addEventBookmarkTag)) : undefined);
         yield await factory.sign(draft);
     };

package/dist/actions/contacts.d.ts

@@ -1,7 +1,8 @@
+import { ProfilePointer } from "nostr-tools/nip19";
 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;
 /** An action that removes a pubkey from a users contacts event */
-export declare function UnfollowUser(pubkey: string, hidden?: boolean): Action;
+export declare function UnfollowUser(user: string | ProfilePointer, hidden?: boolean): Action;
 /** An action that creates a new kind 3 contacts lists, throws if a contact list already exists */
-export declare function NewContacts(pubkeys?: string[]): Action;
+export declare function NewContacts(pubkeys?: (string | ProfilePointer)[]): Action;

package/dist/actions/contacts.js

@@ -1,24 +1,29 @@
-import { kinds } from "nostr-tools";
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-factory/operations/event";
 import { addPubkeyTag, removePubkeyTag } from "applesauce-factory/operations/tag";
+import { kinds } from "nostr-tools";
 /** An action that adds a pubkey to a users contacts event */
 export function FollowUser(pubkey, relay, hidden = false) {
     return async function* ({ events, factory, self }) {
-        const contacts = events.getReplaceable(kinds.Contacts, self);
-        if (!contacts)
-            throw new Error("Missing contacts event");
+        let contacts = events.getReplaceable(kinds.Contacts, self);
         const pointer = { pubkey, relays: relay ? [relay] : undefined };
         const operation = addPubkeyTag(pointer);
-        const draft = await factory.modifyTags(contacts, hidden ? { hidden: operation } : operation);
+        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);
     };
 }
 /** An action that removes a pubkey from a users contacts event */
-export function UnfollowUser(pubkey, hidden = false) {
+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)
-            throw new Error("Missing contacts event");
-        const operation = removePubkeyTag(pubkey);
+            return;
+        const operation = removePubkeyTag(user);
         const draft = await factory.modifyTags(contacts, hidden ? { hidden: operation } : operation);
         yield await factory.sign(draft);
     };
@@ -29,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, tags: pubkeys?.map((p) => ["p", p]) });
+        const draft = await factory.build({ kind: kinds.Contacts }, pubkeys ? modifyPublicTags(...pubkeys.map((p) => addPubkeyTag(p))) : undefined);
         yield await factory.sign(draft);
     };
 }

package/dist/actions/mailboxes.js

@@ -18,9 +18,9 @@ export function AddInboxRelay(relay) {
         if (typeof relay === "string")
             relay = [relay];
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
-        if (!mailboxes)
-            throw new Error("Missing mailboxes event");
-        const draft = await factory.modifyTags(mailboxes, ...relay.map(addInboxRelay));
+        const draft = mailboxes
+            ? await factory.modifyTags(mailboxes, ...relay.map(addInboxRelay))
+            : await factory.build({ kind: kinds.RelayList }, modifyPublicTags(...relay.map(addInboxRelay)));
         const signed = await factory.sign(draft);
         yield signed;
     };
@@ -32,7 +32,7 @@ export function RemoveInboxRelay(relay) {
             relay = [relay];
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         if (!mailboxes)
-            throw new Error("Missing mailboxes event");
+            return;
         const draft = await factory.modifyTags(mailboxes, ...relay.map(removeInboxRelay));
         const signed = await factory.sign(draft);
         yield signed;
@@ -44,9 +44,9 @@ export function AddOutboxRelay(relay) {
         if (typeof relay === "string")
             relay = [relay];
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
-        if (!mailboxes)
-            throw new Error("Missing mailboxes event");
-        const draft = await factory.modifyTags(mailboxes, ...relay.map(addOutboxRelay));
+        const draft = mailboxes
+            ? await factory.modifyTags(mailboxes, ...relay.map(addOutboxRelay))
+            : await factory.build({ kind: kinds.RelayList }, modifyPublicTags(...relay.map(addOutboxRelay)));
         const signed = await factory.sign(draft);
         yield signed;
     };
@@ -58,7 +58,7 @@ export function RemoveOutboxRelay(relay) {
             relay = [relay];
         const mailboxes = events.getReplaceable(kinds.RelayList, self);
         if (!mailboxes)
-            throw new Error("Missing mailboxes event");
+            return;
         const draft = await factory.modifyTags(mailboxes, ...relay.map(removeOutboxRelay));
         const signed = await factory.sign(draft);
         yield signed;

package/dist/actions/wrapped-messages.js

@@ -8,10 +8,11 @@ import { GiftWrapBlueprint, WrappedMessageBlueprint, WrappedMessageReplyBlueprin
  * @returns Signed gift wrapped messages to send
  */
 export function SendWrappedMessage(participants, message, opts) {
-    return async function* ({ factory }) {
+    return async function* ({ factory, self }) {
         const rumor = await factory.create(WrappedMessageBlueprint, participants, message, opts);
-        // Get the pubkeys to send this message to (will include the sender)
-        const pubkeys = getConversationParticipants(rumor);
+        // Get the pubkeys to send this message to and ensure the sender is included
+        const pubkeys = new Set(getConversationParticipants(rumor));
+        pubkeys.add(self);
         for (const pubkey of pubkeys) {
             yield await factory.create(GiftWrapBlueprint, pubkey, rumor, opts);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-actions",
-  "version": "2.0.0",
+  "version": "2.3.0",
   "description": "A package for performing common nostr actions",
   "type": "module",
   "main": "dist/index.js",
@@ -32,8 +32,8 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "^2.0.0",
-    "applesauce-factory": "^2.0.0",
+    "applesauce-core": "^2.3.0",
+    "applesauce-factory": "^2.3.0",
     "nostr-tools": "^2.13",
     "rxjs": "^7.8.1"
   },