@welshman/app 0.11.3 → 0.12.1

package/dist/app/src/plugins/wraps.d.ts

@@ -1,9 +1,9 @@
 import { TaskQueue } from "@welshman/lib";
 import type { TrustedEvent, EventTemplate } from "@welshman/util";
-import { MergedThunk } from "./thunk.js";
-import type { ThunkOptions } from "./thunk.js";
+import { PublicationGroup } from "./publisher.js";
+import type { PublishRequest } from "./publisher.js";
 import type { IApp } from "../app.js";
-export type SendWrappedOptions = Omit<ThunkOptions, "event" | "relays" | "recipient" | "app" | "user"> & {
+export type SendWrappedOptions = Omit<PublishRequest, "event" | "relays" | "recipient"> & {
     event: EventTemplate;
     recipients: string[];
 };
@@ -29,6 +29,6 @@ export declare class Wraps {
     constructor(app: IApp);
     retry: (wrap: TrustedEvent, delay: number) => void;
     enqueue: (wrap: TrustedEvent) => void;
-    publish: ({ event, recipients, ...options }: SendWrappedOptions) => Promise<MergedThunk>;
+    publish: ({ event, recipients, ...options }: SendWrappedOptions) => Promise<PublicationGroup>;
 }
 //# sourceMappingURL=wraps.d.ts.map

package/dist/app/src/plugins/wraps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wraps.d.ts","sourceRoot":"","sources":["../../../../src/plugins/wraps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAY,MAAM,eAAe,CAAA;AAElD,OAAO,KAAK,EAAC,YAAY,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAC,WAAW,EAAS,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,YAAY,CAAA;AAG5C,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,YAAY,EACZ,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,KAAK,GAAG,MAAM,CAClD,GAAG;IACF,KAAK,EAAE,aAAa,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAGpC,eAAO,MAAM,cAAc,QAAS,CAAA;AAGpC,eAAO,MAAM,kBAAkB,OAAQ,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,qBAAa,KAAK;IAKJ,QAAQ,CAAC,GAAG,EAAE,IAAI;IAJ9B,cAAc,sBAA4B;IAC1C,WAAW,sBAA2C;IACtD,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAET,GAAG,EAAE,IAAI;IA+C9B,KAAK,GAAI,MAAM,YAAY,EAAE,OAAO,MAAM,UAOzC;IAED,OAAO,GAAI,MAAM,YAAY,UAM5B;IAID,OAAO,GAAU,mCAAiC,kBAAkB,0BAenE;CACF"}
+{"version":3,"file":"wraps.d.ts","sourceRoot":"","sources":["../../../../src/plugins/wraps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAY,MAAM,eAAe,CAAA;AAElD,OAAO,KAAK,EAAC,YAAY,EAAe,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAC,gBAAgB,EAAY,MAAM,gBAAgB,CAAA;AAC1D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAGlD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC,GAAG;IACxF,KAAK,EAAE,aAAa,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,IAAI,CAAA;AAGpC,eAAO,MAAM,cAAc,QAAS,CAAA;AAGpC,eAAO,MAAM,kBAAkB,OAAQ,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,qBAAa,KAAK;IAKJ,QAAQ,CAAC,GAAG,EAAE,IAAI;IAJ9B,cAAc,sBAA4B;IAC1C,WAAW,sBAA2C;IACtD,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAET,GAAG,EAAE,IAAI;IA+C9B,KAAK,GAAI,MAAM,YAAY,EAAE,OAAO,MAAM,UAOzC;IAED,OAAO,GAAI,MAAM,YAAY,UAM5B;IAID,OAAO,GAAU,mCAAiC,kBAAkB,+BAiBnE;CACF"}

package/dist/app/src/plugins/wraps.js

@@ -1,7 +1,7 @@
 import { TaskQueue, uniq, now } from "@welshman/lib";
 import { hexTags, tagValues, prep } from "@welshman/util";
 import { Nip59 } from "@welshman/signer";
-import { MergedThunk, Thunks } from "./thunk.js";
+import { PublicationGroup, Publisher } from "./publisher.js";
 import { User } from "../user.js";
 import { MessagingRelayLists } from "./messagingRelayLists.js";
 export const MAX_UNWRAP_ATTEMPTS = 3;
@@ -89,9 +89,11 @@ export class Wraps {
         const user = User.require(this.app);
         // Stabilize the event id across the different wraps
         const stableEvent = prep(event, user.pubkey, now());
-        return new MergedThunk(await Promise.all(uniq(recipients).map(async (recipient) => {
+        return new PublicationGroup(await Promise.all(uniq(recipients).map(async (recipient) => {
             const relays = (await this.app.use(MessagingRelayLists).load(recipient))?.urls() ?? [];
-            return this.app.use(Thunks).publish({ event: stableEvent, relays, recipient, ...options });
+            return this.app
+                .use(Publisher)
+                .publish({ event: stableEvent, relays, recipient, ...options });
         })));
     };
 }

package/dist/app/src/plugins/wraps.js.map

@@ -1 +1 @@
-{"version":3,"file":"wraps.js","sourceRoot":"","sources":["../../../../src/plugins/wraps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,IAAI,EAAE,GAAG,EAAC,MAAM,eAAe,CAAA;AAClD,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAEvD,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,YAAY,CAAA;AAE9C,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAA;AAW5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAA;AAEpC,wFAAwF;AACxF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAA;AAEpC,mFAAmF;AACnF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,MAAM,OAAO,KAAK;IAKK;IAJrB,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC1C,WAAW,GAAG,IAAI,GAAG,EAAiC,CAAA;IACtD,KAAK,CAAyB;IAE9B,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAe;YACvC,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,KAAK,EAAE,IAAkB,EAAE,EAAE;gBACxC,IAAI,CAAC,GAAG,CAAC,IAAI;oBAAE,OAAM;gBACrB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;oBAAE,OAAM;gBAEzE,IAAI,KAAgD,CAAA;gBAEpD,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBAC/C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;wBAC/C,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;oBACrF,CAAC,CAAC,CAAA;oBACF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAmB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;oBAE9E,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;wBACvB,IAAI,EAAE,IAAmB;wBACzB,KAAK;wBACL,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;qBAC3B,CAAC,CAAA;gBACJ,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;oBAE5D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;oBAE1C,IAAI,QAAQ,GAAG,mBAAmB,EAAE,CAAC;wBACnC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,kBAAkB,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAA;oBAC5D,CAAC;gBACH,CAAC;wBAAS,CAAC;oBACT,YAAY,CAAC,KAAK,CAAC,CAAA;gBACrB,CAAC;YACH,CAAC;SACF,CAAC,CAAA;QAEF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YAElB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrC,YAAY,CAAC,KAAK,CAAC,CAAA;YACrB,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QAC1B,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,GAAG,CAAC,IAAkB,EAAE,KAAa,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC,EAAE,KAAK,CAAC,CAAA;QAET,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC,CAAA;IAED,OAAO,GAAG,CAAC,IAAkB,EAAE,EAAE;QAC/B,0EAA0E;QAC1E,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,OAAM;QAC5C,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,OAAM;QAElD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC,CAAA;IAED,8EAA8E;IAC9E,uCAAuC;IACvC,OAAO,GAAG,KAAK,EAAE,EAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,EAAqB,EAAE,EAAE;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEnC,oDAAoD;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAEnD,OAAO,IAAI,WAAW,CACpB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,SAAS,EAAC,EAAE;YACrC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;YAEtF,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,EAAC,CAAC,CAAA;QAC1F,CAAC,CAAC,CACH,CACF,CAAA;IACH,CAAC,CAAA;CACF"}
+{"version":3,"file":"wraps.js","sourceRoot":"","sources":["../../../../src/plugins/wraps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,IAAI,EAAE,GAAG,EAAC,MAAM,eAAe,CAAA;AAClD,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAEvD,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAC,gBAAgB,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAA;AAQ5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAA;AAEpC,wFAAwF;AACxF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAA;AAEpC,mFAAmF;AACnF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,MAAM,OAAO,KAAK;IAKK;IAJrB,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC1C,WAAW,GAAG,IAAI,GAAG,EAAiC,CAAA;IACtD,KAAK,CAAyB;IAE9B,YAAqB,GAAS;QAAT,QAAG,GAAH,GAAG,CAAM;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAe;YACvC,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,KAAK,EAAE,IAAkB,EAAE,EAAE;gBACxC,IAAI,CAAC,GAAG,CAAC,IAAI;oBAAE,OAAM;gBACrB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;oBAAE,OAAM;gBAEzE,IAAI,KAAgD,CAAA;gBAEpD,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBAC/C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;wBAC/C,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;oBACrF,CAAC,CAAC,CAAA;oBACF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAmB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;oBAE9E,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;wBACvB,IAAI,EAAE,IAAmB;wBACzB,KAAK;wBACL,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;qBAC3B,CAAC,CAAA;gBACJ,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;oBAE5D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;oBAE1C,IAAI,QAAQ,GAAG,mBAAmB,EAAE,CAAC;wBACnC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,kBAAkB,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAA;oBAC5D,CAAC;gBACH,CAAC;wBAAS,CAAC;oBACT,YAAY,CAAC,KAAK,CAAC,CAAA;gBACrB,CAAC;YACH,CAAC;SACF,CAAC,CAAA;QAEF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YAElB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrC,YAAY,CAAC,KAAK,CAAC,CAAA;YACrB,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QAC1B,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,GAAG,CAAC,IAAkB,EAAE,KAAa,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC,EAAE,KAAK,CAAC,CAAA;QAET,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC,CAAA;IAED,OAAO,GAAG,CAAC,IAAkB,EAAE,EAAE;QAC/B,0EAA0E;QAC1E,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,OAAM;QAC5C,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,OAAM;QAElD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC,CAAA;IAED,8EAA8E;IAC9E,uCAAuC;IACvC,OAAO,GAAG,KAAK,EAAE,EAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,EAAqB,EAAE,EAAE;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEnC,oDAAoD;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;QAEnD,OAAO,IAAI,gBAAgB,CACzB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,SAAS,EAAC,EAAE;YACrC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;YAEtF,OAAO,IAAI,CAAC,GAAG;iBACZ,GAAG,CAAC,SAAS,CAAC;iBACd,OAAO,CAAC,EAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,EAAC,CAAC,CAAA;QACjE,CAAC,CAAC,CACH,CACF,CAAA;IACH,CAAC,CAAA;CACF"}

package/dist/app/src/plugins/zappers.d.ts

@@ -18,9 +18,7 @@ export declare class Zappers extends LoadableMapPlugin<Zapper> {
      * Resolve the zapper a zap receipt should be validated against. A receipt's
      * `p` tag is the recipient (copied from the zap request), so we honor only
      * receipts addressed to one of the parent's designated split recipients and
-     * load *that* recipient's zapper. The old lookup always used the first
-     * recipient's lnurl, which silently dropped legitimate zaps to any of the
-     * other split recipients.
+     * load *that* recipient's zapper, so zaps to any split recipient validate.
      */
     loadZapperForZap: (zapReceipt: TrustedEvent, parent: TrustedEvent, relays?: string[]) => Promise<Maybe<Zapper>>;
     validateZapReceipt: (zapReceipt: TrustedEvent, parent: TrustedEvent, relays?: string[]) => Promise<Zap | undefined>;

package/dist/app/src/plugins/zappers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAe,MAAM,EAAa,MAAM,kBAAkB,CAAA;AACjE,OAAO,KAAK,EAAC,GAAG,EAAgB,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAC,iBAAiB,EAAa,MAAM,WAAW,CAAA;AACvD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC;;;;;GAKG;AACH,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,KAAK,mDAwCH;IAEF,aAAa,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,4BAM3D;IAED,SAAS,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,KAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAgB7E;IAED;;;;;;;OAOG;IACH,gBAAgB,GACd,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,4BAQtB;IAED,kBAAkB,GAChB,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,8BAStB;IAED,mBAAmB,GACjB,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,oBAMpB;IAEH,gBAAgB,GACd,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,KACpB,UAAU,CAAC,GAAG,EAAE,CAAC,CA2CnB;CACF"}
+{"version":3,"file":"zappers.d.ts","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAe,MAAM,EAAa,MAAM,kBAAkB,CAAA;AACjE,OAAO,KAAK,EAAC,GAAG,EAAgB,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAC,iBAAiB,EAAa,MAAM,WAAW,CAAA;AACvD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAIzC;;;;;GAKG;AACH,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,KAAK,mDAwCH;IAEF,aAAa,GAAU,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,4BAM3D;IAED,SAAS,GAAI,QAAQ,MAAM,EAAE,SAAQ,MAAM,EAAO,KAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAgB7E;IAED;;;;;OAKG;IACH,gBAAgB,GACd,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,4BAQtB;IAED,kBAAkB,GAChB,YAAY,YAAY,EACxB,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,8BAStB;IAED,mBAAmB,GACjB,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,oBAMpB;IAEH,gBAAgB,GACd,aAAa,YAAY,EAAE,EAC3B,QAAQ,YAAY,EACpB,SAAQ,MAAM,EAAO,KACpB,UAAU,CAAC,GAAG,EAAE,CAAC,CA2CnB;CACF"}

package/dist/app/src/plugins/zappers.js

@@ -62,9 +62,7 @@ export class Zappers extends LoadableMapPlugin {
      * Resolve the zapper a zap receipt should be validated against. A receipt's
      * `p` tag is the recipient (copied from the zap request), so we honor only
      * receipts addressed to one of the parent's designated split recipients and
-     * load *that* recipient's zapper. The old lookup always used the first
-     * recipient's lnurl, which silently dropped legitimate zaps to any of the
-     * other split recipients.
+     * load *that* recipient's zapper, so zaps to any split recipient validate.
      */
     loadZapperForZap = async (zapReceipt, parent, relays = []) => {
         const recipient = tagValue(tagSpec("p"), zapReceipt.tags);

package/dist/app/src/plugins/zappers.js.map

@@ -1 +1 @@
-{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zappers.js","sourceRoot":"","sources":["../../../../src/plugins/zappers.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/core/ListWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ListWriter.d.ts","sourceRoot":"","sources":["../../../../../domain/src/core/ListWriter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE/C,8BAAsB,UAAU,CAC9B,MAAM,SAAS,UAAU,GAAG,UAAU,CACtC,SAAQ,WAAW,CAAC,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,EAAE,EAAE,CAAK;IAC3B,WAAW,EAAE,MAAM,EAAE,EAAE,CAAK;gBAEhB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;IAU/D,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE;IAM7B,UAAU,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE;IAM9B,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM3C,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM5C,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAOzC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM3C,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM5C,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAOzC,QAAQ;IAUR,SAAS,CAAC,gBAAgB;IAIpB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;CAiBvC"}
+{"version":3,"file":"ListWriter.d.ts","sourceRoot":"","sources":["../../../../../domain/src/core/ListWriter.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAE/C,8BAAsB,UAAU,CAC9B,MAAM,SAAS,UAAU,GAAG,UAAU,CACtC,SAAQ,WAAW,CAAC,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,EAAE,EAAE,CAAK;IAC3B,WAAW,EAAE,MAAM,EAAE,EAAE,CAAK;gBAEhB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;IAU/D,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE;IAM7B,UAAU,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,EAAE;IAM9B,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM3C,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM5C,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAOzC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM3C,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAM5C,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,OAAO;IAOzC,QAAQ;IAYR,SAAS,CAAC,gBAAgB;IAIpB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;CAiBvC"}

package/dist/domain/src/core/ListWriter.js

@@ -45,6 +45,7 @@ export class ListWriter extends EventWriter {
         return this;
     }
     validate() {
+        super.validate();
         if (this.reader?.decrypted === false &&
             this.reader?.event.content &&
             this.privateTags.length > 0) {

package/dist/domain/src/core/ListWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListWriter.js","sourceRoot":"","sources":["../../../../../domain/src/core/ListWriter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ListWriter.js","sourceRoot":"","sources":["../../../../../domain/src/core/ListWriter.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/kinds/Feed.js

@@ -4,7 +4,7 @@ import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
-// NIP-51 kind-31890 saved-feed definition.
+// Kind-31890 saved-feed definition: a `@welshman/feeds` feed, JSON-encoded in a `feed` tag.
 export class FeedReader extends EventReader {
     title() {
         return tagValue(tagSpec("title"), this.event.tags) || "";

package/dist/domain/src/kinds/Feed.js.map

@@ -1 +1 @@
-{"version":3,"file":"Feed.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Feed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAGtD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,2CAA2C;AAC3C,MAAM,OAAO,UAAW,SAAQ,WAAW;IACzC,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAC1D,CAAC;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAChE,CAAC;IAED,UAAU;QACR,OAAO,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,WAAuB;IACrD,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,aAAa,CAAC,IAAoB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC9E,CAAC;CACF;AAED,MAAM,OAAO,SAAU,SAAQ,UAAU;IAC7B,YAAY;QACpB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC;IAClC,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,SAAS;CACjB,CAAC,CAAA"}
+{"version":3,"file":"Feed.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Feed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAGtD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,4FAA4F;AAC5F,MAAM,OAAO,UAAW,SAAQ,WAAW;IACzC,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAC1D,CAAC;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAChE,CAAC;IAED,UAAU;QACR,OAAO,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,WAAuB;IACrD,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,aAAa,CAAC,IAAoB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC9E,CAAC;CACF;AAED,MAAM,OAAO,SAAU,SAAQ,UAAU;IAC7B,YAAY;QACpB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC;IAClC,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,SAAS;CACjB,CAAC,CAAA"}

package/dist/domain/src/kinds/Label.d.ts

@@ -20,6 +20,11 @@ export declare class LabelWriter extends EventWriter<LabelReader> {
     addAddress(address: string): this;
     addTopic(topic: string): this;
     addUrl(url: string): this;
+    removeEventId(id: string): this;
+    removePubkey(pubkey: string): this;
+    removeAddress(address: string): this;
+    removeTopic(topic: string): this;
+    removeUrl(url: string): this;
     validate(): void;
 }
 export declare class LabelQuery extends EventQuery {

package/dist/domain/src/kinds/Label.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Label.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Label.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAK3C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,UAAU;IAKV,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM;IAMzB,QAAQ;IAIR,OAAO;IAIP,SAAS;IAIT,MAAM;IAIN,IAAI;CAGL;AAED,qBAAa,WAAY,SAAQ,WAAW,CAAC,WAAW,CAAC;cAGvC,YAAY;IAK5B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAcxC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAU3C,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,QAAQ;CAOT;AAED,qBAAa,UAAW,SAAQ,UAAU;IACxC,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,KAAK,mDAKhB,CAAA"}
+{"version":3,"file":"Label.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Label.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAM3C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,UAAU;IAKV,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM;IAMzB,QAAQ;IAIR,OAAO;IAIP,SAAS;IAIT,MAAM;IAIN,IAAI;CAGL;AAED,qBAAa,WAAY,SAAQ,WAAW,CAAC,WAAW,CAAC;cAGvC,YAAY;IAK5B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAcxC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAU3C,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,aAAa,CAAC,EAAE,EAAE,MAAM;IAIxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,aAAa,CAAC,OAAO,EAAE,MAAM;IAI7B,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,QAAQ;CAOT;AAED,qBAAa,UAAW,SAAQ,UAAU;IACxC,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,KAAK,mDAKhB,CAAA"}

package/dist/domain/src/kinds/Label.js

@@ -1,12 +1,13 @@
 import { nth, spec } from "@welshman/lib";
-import { LABEL, addressTags, hexTags, matchTags, relayTags, tagSpec, tagValues, topicTags, userOutbox, } from "@welshman/util";
+import { LABEL, addressTags, hexTags, matchTags, tagSpec, tagValues, topicTags, urlTags, userOutbox, } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 // NIP-32 label. `L` declares a namespace and `l` carries the labels within it,
 // while the labeled subjects are referenced with ordinary `e`/`p`/`a`/`r`/`t`
-// tags. One event may label several subjects across several namespaces.
+// tags. One event may label several subjects across several namespaces. An `r`
+// subject is any url, not only a relay.
 export class LabelReader extends EventReader {
     namespaces() {
         return tagValues(tagSpec("L"), this.event.tags);
@@ -30,7 +31,7 @@ export class LabelReader extends EventReader {
         return tagValues(topicTags("t"), this.event.tags);
     }
     urls() {
-        return tagValues(relayTags("r"), this.event.tags);
+        return tagValues(urlTags("r"), this.event.tags);
     }
 }
 export class LabelWriter extends EventWriter {
@@ -74,6 +75,21 @@ export class LabelWriter extends EventWriter {
     addUrl(url) {
         return this.addTags(["r", url]);
     }
+    removeEventId(id) {
+        return this.dropTags(spec(["e", id]));
+    }
+    removePubkey(pubkey) {
+        return this.dropTags(spec(["p", pubkey]));
+    }
+    removeAddress(address) {
+        return this.dropTags(spec(["a", address]));
+    }
+    removeTopic(topic) {
+        return this.dropTags(spec(["t", topic]));
+    }
+    removeUrl(url) {
+        return this.dropTags(spec(["r", url]));
+    }
     validate() {
         super.validate();
         if (!this.extraTags.some(spec(["l"]))) {

package/dist/domain/src/kinds/Label.js.map

@@ -1 +1 @@
-{"version":3,"file":"Label.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Label.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Label.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Label.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvC,OAAO,EACL,KAAK,EACL,WAAW,EACX,OAAO,EACP,SAAS,EACT,OAAO,EACP,SAAS,EACT,SAAS,EACT,OAAO,EACP,UAAU,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,+EAA+E;AAC/E,8EAA8E;AAC9E,+EAA+E;AAC/E,wCAAwC;AACxC,MAAM,OAAO,WAAY,SAAQ,WAAW;IAC1C,UAAU;QACR,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC;IAED,0DAA0D;IAC1D,MAAM,CAAC,SAAkB;QACvB,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;aAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;aAC7C,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;IAED,QAAQ;QACN,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC;IAED,OAAO;QACL,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC;IAED,SAAS;QACP,OAAO,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACrD,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,IAAI;QACF,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjD,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,WAAwB;IACvD,6EAA6E;IAC7E,gFAAgF;IACtE,KAAK,CAAC,YAAY;QAC1B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;IACvB,CAAC;IAED,yEAAyE;IACzE,QAAQ,CAAC,IAAY,EAAE,SAAiB;QACtC,KAAK,MAAM,GAAG,IAAI;YAChB,CAAC,GAAG,EAAE,SAAS,CAAC;YAChB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC;SACvB,EAAE,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACnB,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,wEAAwE;IACxE,WAAW,CAAC,IAAY,EAAE,SAAiB;QACzC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;QAE3C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,CAAA;QACvC,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,UAAU,CAAC,EAAU;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA;IAChC,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACpC,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACrC,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IACjC,CAAC;IAED,aAAa,CAAC,EAAU;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IACvC,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,aAAa,CAAC,OAAe;QAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5C,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1C,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;IACxC,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;QAC1D,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,UAAU;IAC9B,YAAY;QACpB,OAAO,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC;IACnC,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;IACnB,KAAK,EAAE,UAAU;CAClB,CAAC,CAAA"}

package/dist/domain/src/kinds/Profile.d.ts

@@ -16,7 +16,7 @@ export declare class ProfileReader extends EventReader {
     banner(): Maybe<string>;
     picture(): Maybe<string>;
     website(): Maybe<string>;
-    display(fallback?: string): string;
+    display(): string;
 }
 export declare class ProfileWriter extends EventWriter<ProfileReader> {
     values: Record<string, any>;

package/dist/domain/src/kinds/Profile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Profile.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Profile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAEhD,eAAO,MAAM,UAAU,GAAI,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,KAAG,KAAK,CAAC,MAAM,CAUzE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,WAI3C,CAAA;AAGD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;IAEzC,KAAK;IAUL,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;IAIrB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IAIvB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,CAAC,QAAQ,SAAK;CAOtB;AAED,qBAAa,aAAc,SAAQ,WAAW,CAAC,aAAa,CAAC;IAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;gBAEpB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,aAAa;IAMtE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMlC,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,SAAS,CAAC,MAAM,EAAE,MAAM;IAMxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,aAAa;CAGd;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC1C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,OAAO,yDAKlB,CAAA"}
+{"version":3,"file":"Profile.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Profile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAEhD,eAAO,MAAM,UAAU,GAAI,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,KAAG,KAAK,CAAC,MAAM,CAUzE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,WAI3C,CAAA;AAGD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;IAEzC,KAAK;IAUL,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;IAIrB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IAIvB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO;CAKR;AAED,qBAAa,aAAc,SAAQ,WAAW,CAAC,aAAa,CAAC;IAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;gBAEpB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,aAAa;IAMtE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMlC,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,SAAS,CAAC,MAAM,EAAE,MAAM;IAMxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,aAAa;CAGd;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC1C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,OAAO,yDAKlB,CAAA"}

package/dist/domain/src/kinds/Profile.js

@@ -50,11 +50,9 @@ export class ProfileReader extends EventReader {
     website() {
         return this.values.website;
     }
-    display(fallback = "") {
+    display() {
         const name = this.name();
-        if (name)
-            return ellipsize(name, 60).trim();
-        return displayPubkey(this.event.pubkey).trim() || fallback.trim();
+        return name ? ellipsize(name, 60).trim() : displayPubkey(this.event.pubkey);
     }
 }
 export class ProfileWriter extends EventWriter {

package/dist/domain/src/kinds/Profile.js.map

@@ -1 +1 @@
-{"version":3,"file":"Profile.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Profile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Profile.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Profile.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/kinds/Repost.d.ts

@@ -1,4 +1,3 @@
-import type { Maybe } from "@welshman/lib";
 import type { TrustedEvent } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
@@ -9,7 +8,7 @@ export declare class RepostReader extends EventReader {
     eventAddress(): string | undefined;
     pubkey(): string | undefined;
     eventKind(): number | undefined;
-    repostedEvent(): Maybe<TrustedEvent>;
+    repostedEvent(): TrustedEvent | undefined;
 }
 export declare class RepostWriter extends EventWriter<RepostReader> {
     setEvent(event: TrustedEvent): this;

package/dist/domain/src/kinds/Repost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Repost.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Repost.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAaxC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAO3C,qBAAa,YAAa,SAAQ,WAAW;IAC3C,OAAO;IAIP,YAAY;IAIZ,MAAM;IAKN,SAAS;IAKT,aAAa,IAC6B,KAAK,CAAC,YAAY,CAAC;CAE9D;AAED,qBAAa,YAAa,SAAQ,WAAW,CAAC,YAAY,CAAC;IAEzD,QAAQ,CAAC,KAAK,EAAE,YAAY;IA+B5B,QAAQ;CAOT;AAED,qBAAa,WAAY,SAAQ,UAAU;IACzC,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,MAAM,sDAKjB,CAAA;AAEF,eAAO,MAAM,aAAa,sDAKxB,CAAA"}
+{"version":3,"file":"Repost.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Repost.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAc3C,qBAAa,YAAa,SAAQ,WAAW;IAC3C,OAAO;IAIP,YAAY;IAIZ,MAAM;IAKN,SAAS;IAMT,aAAa;CAMd;AAED,qBAAa,YAAa,SAAQ,WAAW,CAAC,YAAY,CAAC;IAEzD,QAAQ,CAAC,KAAK,EAAE,YAAY;IA+B5B,QAAQ;CAyCT;AAED,qBAAa,WAAY,SAAQ,UAAU;IACzC,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,MAAM,sDAKjB,CAAA;AAEF,eAAO,MAAM,aAAa,sDAKxB,CAAA"}

package/dist/domain/src/kinds/Repost.js

@@ -1,10 +1,15 @@
 import { first, parseJson, spec } from "@welshman/lib";
-import { GENERIC_REPOST, NOTE, REPOST, getAddress, isReplaceable, kindTags, outbox, tagSpec, tagValue, tagValues, } from "@welshman/util";
+import { GENERIC_REPOST, NOTE, REPOST, getAddress, getHash, isHashedEvent, isReplaceable, kindTags, outbox, tagSpec, tagValue, tagValues, verifyEvent, } from "@welshman/util";
 import { EventReader } from "../core/EventReader.js";
 import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 const TARGET_KEYS = ["e", "a", "p", "k"];
+// The content's event, when it has an event's shape. Its signature is not checked.
+const parseEvent = (content) => {
+    const event = parseJson(content);
+    return event && isHashedEvent(event) ? event : undefined;
+};
 // NIP-18 repost. Kind 6 reposts notes; kind 16 reposts any other kind and names
 // it in a `k` tag. The reposted event is JSON-encoded in the content so a client
 // can render it without a second fetch.
@@ -22,9 +27,12 @@ export class RepostReader extends EventReader {
     eventKind() {
         return this.kind === REPOST ? NOTE : first(tagValues(kindTags("k"), this.event.tags));
     }
-    // The embedded event, or undefined when the content is absent or malformed.
+    // The embedded event, or undefined when the content is absent, malformed, or a
+    // different event from the one the e tag names.
     repostedEvent() {
-        return parseJson(this.event.content);
+        const event = parseEvent(this.event.content);
+        const eventId = this.eventId();
+        return event && (!eventId || event.id === eventId) ? event : undefined;
     }
 }
 export class RepostWriter extends EventWriter {
@@ -53,9 +61,33 @@ export class RepostWriter extends EventWriter {
     }
     validate() {
         super.validate();
-        if (!this.extraTags.some(spec(["e"]))) {
+        const eventId = this.extraTags.find(spec(["e"]))?.[1];
+        const kind = this.extraTags.find(spec(["k"]))?.[1];
+        if (!eventId) {
             throw new Error("A repost must reference an event via an e tag");
         }
+        // Content may be left empty (e.g. for a protected event), but anything else must be the event.
+        if (this.content) {
+            const event = parseEvent(this.content);
+            if (!event) {
+                throw new Error("A repost's content must be the reposted event");
+            }
+            if (event.id !== eventId) {
+                throw new Error("A repost's embedded event must be the one its e tag names");
+            }
+            if (getHash(event) !== event.id) {
+                throw new Error("A repost's embedded event has an invalid id");
+            }
+            if (!verifyEvent(event)) {
+                throw new Error("A repost's embedded event has an invalid signature");
+            }
+            if (this.kind === REPOST && event.kind !== NOTE) {
+                throw new Error("A kind 6 repost must embed a kind 1 note; use GenericRepost for other kinds");
+            }
+            if (kind !== undefined && kind !== String(event.kind)) {
+                throw new Error("A repost's embedded event must match its k tag");
+            }
+        }
     }
 }
 export class RepostQuery extends EventQuery {

package/dist/domain/src/kinds/Repost.js.map

@@ -1 +1 @@
-{"version":3,"file":"Repost.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Repost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Repost.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/Repost.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/kinds/RoomList.d.ts

@@ -2,6 +2,7 @@ import { ListReader } from "../core/ListReader.js";
 import { ListWriter } from "../core/ListWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
+import type { KindContext } from "../core/Kind.js";
 export declare class RoomListReader extends ListReader {
     rooms(): string[];
     roomTags(): string[][];
@@ -10,6 +11,7 @@ export declare class RoomListReader extends ListReader {
     roomsForUrl(url: string): string[];
 }
 export declare class RoomListWriter extends ListWriter<RoomListReader> {
+    constructor(kind: number, context: KindContext, reader?: RoomListReader);
     scenario(): Promise<import("@welshman/util").RelayScenario>;
     protected renderRoutes(): Promise<import("@welshman/util").RelaySelection[]>;
     addRoom(roomId: string, url: string): this;

package/dist/domain/src/kinds/RoomList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomList.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAmB3C,qBAAa,cAAe,SAAQ,UAAU;IAC5C,KAAK;IAIL,QAAQ;IAIR,MAAM;IAIN,IAAI;IAIJ,WAAW,CAAC,GAAG,EAAE,MAAM;CAOxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;IAGtD,QAAQ;cAOE,YAAY;IAO5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAInC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAWvC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAWpB,WAAW,CAAC,GAAG,EAAE,MAAM;IAYvB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE;IAcxB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAiB5C;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}
+{"version":3,"file":"RoomList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomList.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAqBhD,qBAAa,cAAe,SAAQ,UAAU;IAC5C,KAAK;IAIL,QAAQ;IAIR,MAAM;IAIN,IAAI;IAIJ,WAAW,CAAC,GAAG,EAAE,MAAM;CAOxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;gBAChD,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,cAAc;IAYjE,QAAQ;cAOE,YAAY;IAO5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAInC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAQvC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAWpB,WAAW,CAAC,GAAG,EAAE,MAAM;IAYvB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE;IAcxB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAwB5C;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}

package/dist/domain/src/kinds/RoomList.js

@@ -1,5 +1,5 @@
 import { nth, uniq, spec, partition, indexBy } from "@welshman/lib";
-import { ROOMS, matchTags, tagSpec, tagValues, isRelayUrl, normalizeRelayUrl, relays, userOutbox, } from "@welshman/util";
+import { ROOMS, matchTags, tagMatcher, tagSpec, tagValues, isRelayUrl, normalizeRelayUrl, relays, userOutbox, } from "@welshman/util";
 import { ListReader } from "../core/ListReader.js";
 import { ListWriter } from "../core/ListWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
@@ -7,6 +7,7 @@ import { KindFactory } from "../core/Kind.js";
 // Room tags (`h`, and the `group` tag NIP-51 uses for this list) carry the room
 // id at t[1] and a relay hint at t[2].
 const roomSpec = tagSpec(["h", "group"]);
+const isRoomTag = tagMatcher(roomSpec);
 const matchesUrl = (normalized, value = "") => isRelayUrl(value) && normalizeRelayUrl(value) === normalized;
 // Every relay a room list references: its `r` relays plus the relay hints on its
 // room tags, normalized and deduped.
@@ -35,6 +36,14 @@ export class RoomListReader extends ListReader {
     }
 }
 export class RoomListWriter extends ListWriter {
+    constructor(kind, context, reader) {
+        super(kind, context, reader);
+        // Legacy `h` entries are listed rooms, not this event's own room scope.
+        if (reader) {
+            this.roomTag = undefined;
+            this.publicTags = reader.event.tags.filter(t => t[0] === "h" || this.publicTags.includes(t));
+        }
+    }
     // Every relay this event routes to has to receive it, so lift the scenario's
     // default limit, which is tuned for reads and would drop most of them.
     async scenario() {
@@ -53,9 +62,7 @@ export class RoomListWriter extends ListWriter {
     }
     removeRoom(roomId, url) {
         const normalized = url ? normalizeRelayUrl(url) : undefined;
-        return this.dropTags(t => t[0] === "group" &&
-            t[1] === roomId &&
-            (!normalized || matchesUrl(normalized, t[2])));
+        return this.dropTags(t => isRoomTag(t) && t[1] === roomId && (!normalized || matchesUrl(normalized, t[2])));
     }
     addRelay(url) {
         const normalized = normalizeRelayUrl(url);
@@ -68,7 +75,7 @@ export class RoomListWriter extends ListWriter {
     removeRelay(url) {
         const normalized = normalizeRelayUrl(url);
         return this.dropTags(t => (t[0] === "r" && matchesUrl(normalized, t[1])) ||
-            (t[0] === "group" && matchesUrl(normalized, t[2])));
+            (isRoomTag(t) && matchesUrl(normalized, t[2])));
     }
     // Replace the relay set, in the given order. Existing tags are reused so any extra values
     // they carry survive a reorder, and non-relay tags are left alone.
@@ -87,11 +94,14 @@ export class RoomListWriter extends ListWriter {
         const from = normalizeRelayUrl(oldUrl);
         const to = normalizeRelayUrl(newUrl);
         const rewrite = (tags) => tags.map(t => {
-            if (t[0] === "r" && matchesUrl(from, t[1]))
-                return ["r", to];
-            if (t[0] === "group" && matchesUrl(from, t[2]))
-                return ["group", t[1], to];
-            return t;
+            let tag = t;
+            if (t[0] === "r" && matchesUrl(from, t[1])) {
+                tag = ["r", to, ...t.slice(2)];
+            }
+            if (isRoomTag(t) && matchesUrl(from, t[2])) {
+                tag = [t[0], t[1], to, ...t.slice(3)];
+            }
+            return tag;
         });
         this.publicTags = rewrite(this.publicTags);
         this.privateTags = rewrite(this.privateTags);

package/dist/domain/src/kinds/RoomList.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomList.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RoomList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,eAAe,CAAA;AACjE,OAAO,EACL,KAAK,EACL,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,UAAU,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,gFAAgF;AAChF,uCAAuC;AACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;AAExC,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;AAEtC,MAAM,UAAU,GAAG,CAAC,UAAkB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,CACpD,UAAU,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,KAAK,UAAU,CAAA;AAE9D,iFAAiF;AACjF,qCAAqC;AACrC,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE,CACnC,IAAI,CACF,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACzE,MAAM,CAAC,UAAU,CAAC;KAClB,GAAG,CAAC,iBAAiB,CAAC,CAC1B,CAAA;AAEH,mEAAmE;AACnE,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC5C,KAAK;QACH,OAAO,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACzC,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI;QACF,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7B,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QAEzC,OAAO,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;aACpC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACzC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,UAA0B;IAC5D,YAAY,IAAY,EAAE,OAAoB,EAAE,MAAuB;QACrE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAE5B,wEAAwE;QACxE,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;YACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9F,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,uEAAuE;IACvE,KAAK,CAAC,QAAQ;QACZ,OAAO,CAAC,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACjD,CAAC;IAED,gFAAgF;IAChF,kFAAkF;IAClF,sBAAsB;IACZ,KAAK,CAAC,YAAY;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QAEhD,OAAO,CAAC,UAAU,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACnE,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,GAAW;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;IAC7D,CAAC;IAED,UAAU,CAAC,MAAc,EAAE,GAAY;QACrC,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAE3D,OAAO,IAAI,CAAC,QAAQ,CAClB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACtF,CAAA;IACH,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QACzC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAA;QAEtD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAA;QACnC,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QAEzC,OAAO,IAAI,CAAC,QAAQ,CAClB,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjD,CAAA;IACH,CAAC;IAED,0FAA0F;IAC1F,mEAAmE;IACnE,SAAS,CAAC,IAAc;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACrD,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QACtE,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;QAEtE,IAAI,CAAC,UAAU,GAAG;YAChB,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/D,GAAG,SAAS;SACb,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,sFAAsF;IACtF,YAAY,CAAC,MAAc,EAAE,MAAc;QACzC,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACtC,MAAM,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAEpC,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE,CACnC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACX,IAAI,GAAG,GAAG,CAAC,CAAA;YAEX,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,GAAG,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAChC,CAAC;YAED,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACvC,CAAC;YAED,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;QAEJ,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC1C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE5C,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IACjC,YAAY;QACpB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAA;IAC5B,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,aAAa;CACrB,CAAC,CAAA"}

package/dist/domain/src/kinds/RoomPins.d.ts

@@ -8,12 +8,12 @@ export declare class RoomPinsReader extends EventReader {
     addresses(): string[];
     isPinned(idOrAddress: string): boolean;
 }
-export declare class RoomPinsWriter extends EventWriter<RoomPinsReader> {
+export declare class RoomPinsWriter<Reader extends RoomPinsReader = RoomPinsReader> extends EventWriter<Reader> {
     readonly requiresRelays = true;
     setPins(idsOrAddresses: string[]): this;
 }
 export declare class RoomPinsQuery extends EventQuery {
     protected renderRoutes(): never[];
 }
-export declare const RoomPins: KindFactory<RoomPinsReader, RoomPinsWriter, RoomPinsQuery>;
+export declare const RoomPins: KindFactory<RoomPinsReader, RoomPinsWriter<RoomPinsReader>, RoomPinsQuery>;
 //# sourceMappingURL=RoomPins.d.ts.map

package/dist/domain/src/kinds/RoomPins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomPins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomPins.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,IAAI;IAQJ,GAAG;IAIH,SAAS;IAIT,QAAQ,CAAC,WAAW,EAAE,MAAM;CAG7B;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,cAAc,QAAO;IAE9B,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE;CAOjC;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4DAKnB,CAAA"}
+{"version":3,"file":"RoomPins.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/RoomPins.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAI3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,IAAI;IAQJ,GAAG;IAIH,SAAS;IAIT,QAAQ,CAAC,WAAW,EAAE,MAAM;CAG7B;AAED,qBAAa,cAAc,CACzB,MAAM,SAAS,cAAc,GAAG,cAAc,CAC9C,SAAQ,WAAW,CAAC,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,QAAO;IAE9B,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE;CAOjC;AAED,qBAAa,aAAc,SAAQ,UAAU;IAC3C,SAAS,CAAC,YAAY;CAGvB;AAED,eAAO,MAAM,QAAQ,4EAKnB,CAAA"}

package/dist/domain/src/kinds/RoomPins.js

@@ -5,6 +5,7 @@ import { EventWriter } from "../core/EventWriter.js";
 import { EventQuery } from "../core/EventQuery.js";
 import { KindFactory } from "../core/Kind.js";
 // NIP-29 kind-39005 room pin list (see https://github.com/nostr-protocol/nips/pull/2379).
+// The kind-9010 op carries the same tags, so `RoomUpdatePins` extends these classes.
 export class RoomPinsReader extends EventReader {
     pins() {
         return uniq(this.event.tags