@welshman/app 0.6.2 → 0.6.4

package/dist/util/src/Room.d.ts

@@ -1,7 +1,14 @@
 import { TrustedEvent } from "./Events.js";
 export type RoomMeta = {
-    id: string;
-    tags: string[][];
+    h: string;
+    name?: string;
+    about?: string;
+    picture?: string;
+    pictureMeta?: string[];
+    isClosed?: boolean;
+    isHidden?: boolean;
+    isPrivate?: boolean;
+    isRestricted?: boolean;
     event?: TrustedEvent;
 };
 export type PublishedRoomMeta = Omit<RoomMeta, "event"> & {

package/dist/util/src/Room.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Room.d.ts","sourceRoot":"","sources":["../../../../util/src/Room.ts"],"names":[],"mappings":"AASA,OAAO,EAAY,YAAY,EAAgB,MAAM,aAAa,CAAA;AAElE,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,EAAE,EAAE,CAAA;IAChB,KAAK,CAAC,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG;IACxD,KAAK,EAAE,YAAY,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,OAAM,OAAO,CAAC,QAAQ,CAAM,KAAG,QAI1D,CAAA;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,YAAY,KAAG,iBAclD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,MAAM,QAAQ;;;;;CACA,CAAA;AAElD,eAAO,MAAM,mBAAmB,GAAI,MAAM,QAAQ;;;;;CACA,CAAA;AAElD,eAAO,MAAM,iBAAiB,GAAI,MAAM,QAAQ;;;;;CACmB,CAAA;AAEnE,eAAO,MAAM,iBAAiB,GAAI,MAAM,QAAQ;;;;;CAAmD,CAAA;AAEnG,eAAO,MAAM,kBAAkB,GAAI,MAAM,QAAQ;;;;;CACA,CAAA"}
+{"version":3,"file":"Room.d.ts","sourceRoot":"","sources":["../../../../util/src/Room.ts"],"names":[],"mappings":"AASA,OAAO,EAAY,YAAY,EAAgB,MAAM,aAAa,CAAA;AAGlE,MAAM,MAAM,QAAQ,GAAG;IACrB,CAAC,EAAE,MAAM,CAAA;IACT,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,KAAK,CAAC,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG;IACxD,KAAK,EAAE,YAAY,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,OAAM,OAAO,CAAC,QAAQ,CAAM,KAAG,QAK3D,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,OAAO,YAAY,KAAG,iBAuBlD,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,MAAM,QAAQ;;;;;CACD,CAAA;AAEjD,eAAO,MAAM,mBAAmB,GAAI,MAAM,QAAQ;;;;;CACD,CAAA;AAEjD,eAAO,MAAM,iBAAiB,GAAI,MAAM,QAAQ;;;;;CAiC/C,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,QAAQ;;;;;CAAkD,CAAA;AAElG,eAAO,MAAM,kBAAkB,GAAI,MAAM,QAAQ;;;;;CAAmD,CAAA"}

package/dist/util/src/Room.js

@@ -1,25 +1,69 @@
-import { randomId, nthNe } from "@welshman/lib";
+import { randomId, spec } from "@welshman/lib";
 import { ROOM_META, ROOM_DELETE, ROOM_CREATE, ROOM_EDIT_META, ROOM_JOIN, ROOM_LEAVE, } from "./Kinds.js";
 import { makeEvent, getIdentifier } from "./Events.js";
-export const makeRoomMeta = (room = {}) => ({
-    id: randomId(),
-    tags: [],
-    ...room,
-});
+import { getTag, getTagValue } from "./Tags.js";
+export const makeRoomMeta = (room = {}) => {
+    return {
+        h: randomId(),
+        ...room,
+    };
+};
 export const readRoomMeta = (event) => {
     if (event.kind !== ROOM_META) {
         throw new Error("Invalid group meta event");
     }
-    const id = getIdentifier(event);
-    if (!id) {
+    const h = getIdentifier(event);
+    if (!h) {
         throw new Error("Group meta event had no d tag");
     }
-    const tags = event.tags.filter(nthNe(0, "d"));
-    return { id, tags, event };
+    return {
+        h,
+        event,
+        name: getTagValue("name", event.tags),
+        about: getTagValue("about", event.tags),
+        picture: getTagValue("picture", event.tags),
+        pictureMeta: getTag("picture", event.tags)?.slice(2),
+        isClosed: event.tags.some(spec(["closed"])),
+        isHidden: event.tags.some(spec(["hidden"])),
+        isPrivate: event.tags.some(spec(["private"])),
+        isRestricted: event.tags.some(spec(["restricted"])),
+    };
+};
+export const makeRoomCreateEvent = (room) => makeEvent(ROOM_CREATE, { tags: [["h", room.h]] });
+export const makeRoomDeleteEvent = (room) => makeEvent(ROOM_DELETE, { tags: [["h", room.h]] });
+export const makeRoomEditEvent = (room) => {
+    const tags = [["h", room.h]];
+    if (room.name)
+        tags.push(["name", room.name]);
+    if (room.about)
+        tags.push(["about", room.about]);
+    if (room.picture) {
+        const tag = ["picture", room.picture];
+        if (room.pictureMeta) {
+            tag.push(...room.pictureMeta);
+        }
+        tags.push(tag);
+    }
+    if (room.isClosed)
+        tags.push(["closed"]);
+    if (room.isHidden)
+        tags.push(["hidden"]);
+    if (room.isPrivate)
+        tags.push(["private"]);
+    if (room.isRestricted)
+        tags.push(["restricted"]);
+    if (room.event) {
+        for (const t of room.event.tags) {
+            if (tags.some(spec(t.slice(0, 1))))
+                continue;
+            if (["closed", "hidden", "private", "restricted"].includes(t[0]))
+                continue;
+            tags.push(t);
+        }
+    }
+    console.log(room, tags);
+    return makeEvent(ROOM_EDIT_META, { tags });
 };
-export const makeRoomCreateEvent = (room) => makeEvent(ROOM_CREATE, { tags: [["h", room.id]] });
-export const makeRoomDeleteEvent = (room) => makeEvent(ROOM_DELETE, { tags: [["h", room.id]] });
-export const makeRoomEditEvent = (room) => makeEvent(ROOM_EDIT_META, { tags: [["h", room.id], ...room.tags] });
-export const makeRoomJoinEvent = (room) => makeEvent(ROOM_JOIN, { tags: [["h", room.id]] });
-export const makeRoomLeaveEvent = (room) => makeEvent(ROOM_LEAVE, { tags: [["h", room.id]] });
+export const makeRoomJoinEvent = (room) => makeEvent(ROOM_JOIN, { tags: [["h", room.h]] });
+export const makeRoomLeaveEvent = (room) => makeEvent(ROOM_LEAVE, { tags: [["h", room.h]] });
 //# sourceMappingURL=Room.js.map

package/dist/util/src/Room.js.map

@@ -1 +1 @@
-{"version":3,"file":"Room.js","sourceRoot":"","sources":["../../../../util/src/Room.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,eAAe,CAAA;AAC7C,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EACX,cAAc,EACd,SAAS,EACT,UAAU,GACX,MAAM,YAAY,CAAA;AACnB,OAAO,EAAC,SAAS,EAAgB,aAAa,EAAC,MAAM,aAAa,CAAA;AAYlE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAA0B,EAAE,EAAY,EAAE,CAAC,CAAC;IACvE,EAAE,EAAE,QAAQ,EAAE;IACd,IAAI,EAAE,EAAE;IACR,GAAG,IAAI;CACR,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAqB,EAAE;IACrE,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IAE/B,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;IAE7C,OAAO,EAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAC,CAAA;AAC1B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAc,EAAE,EAAE,CACpD,SAAS,CAAC,WAAW,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAC,CAAC,CAAA;AAElD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAc,EAAE,EAAE,CACpD,SAAS,CAAC,WAAW,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAC,CAAC,CAAA;AAElD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,EAAE,CAClD,SAAS,CAAC,cAAc,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAC,CAAC,CAAA;AAEnE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAC,CAAC,CAAA;AAEnG,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAc,EAAE,EAAE,CACnD,SAAS,CAAC,UAAU,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAC,CAAC,CAAA"}
+{"version":3,"file":"Room.js","sourceRoot":"","sources":["../../../../util/src/Room.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC5C,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EACX,cAAc,EACd,SAAS,EACT,UAAU,GACX,MAAM,YAAY,CAAA;AACnB,OAAO,EAAC,SAAS,EAAgB,aAAa,EAAC,MAAM,aAAa,CAAA;AAClE,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,WAAW,CAAA;AAmB7C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAA0B,EAAE,EAAY,EAAE;IACrE,OAAO;QACL,CAAC,EAAE,QAAQ,EAAE;QACb,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAqB,EAAE;IACrE,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC7C,CAAC;IAED,MAAM,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IAE9B,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IAED,OAAO;QACL,CAAC;QACD,KAAK;QACL,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC;QACrC,KAAK,EAAE,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC;QACvC,OAAO,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC;QAC3C,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACpD,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3C,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3C,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7C,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;KACpD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAc,EAAE,EAAE,CACpD,SAAS,CAAC,WAAW,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAAA;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAc,EAAE,EAAE,CACpD,SAAS,CAAC,WAAW,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAAA;AAEjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,EAAE;IAClD,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5B,IAAI,IAAI,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC7C,IAAI,IAAI,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IAEhD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAErC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAA;QAC/B,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IACxC,IAAI,IAAI,CAAC,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IACxC,IAAI,IAAI,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IAC1C,IAAI,IAAI,CAAC,YAAY;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAA;IAEhD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAAE,SAAQ;YAC5C,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAAE,SAAQ;YAE1E,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACd,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAEvB,OAAO,SAAS,CAAC,cAAc,EAAE,EAAC,IAAI,EAAC,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAAA;AAElG,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/app",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of svelte stores for use in building nostr client applications.",
@@ -18,13 +18,13 @@
     "fuse.js": "^7.0.0",
     "svelte": "^4.2.18",
     "throttle-debounce": "^5.0.2",
-    "@welshman/feeds": "0.6.2",
-    "@welshman/router": "0.6.2",
-    "@welshman/signer": "0.6.2",
-    "@welshman/lib": "0.6.2",
-    "@welshman/util": "0.6.2",
-    "@welshman/store": "0.6.2",
-    "@welshman/net": "0.6.2"
+    "@welshman/net": "0.6.4",
+    "@welshman/router": "0.6.4",
+    "@welshman/store": "0.6.4",
+    "@welshman/feeds": "0.6.4",
+    "@welshman/lib": "0.6.4",
+    "@welshman/signer": "0.6.4",
+    "@welshman/util": "0.6.4"
   },
   "devDependencies": {
     "rimraf": "~6.0.0",