From cb0119b9b8d57d99ee4a520d7afe171298acd019 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Mon, 16 Jun 2025 10:12:24 -0700 Subject: [PATCH] Update welshman --- package.json | 22 +++++++------- pnpm-lock.yaml | Bin 335670 -> 335780 bytes src/app/commands.ts | 10 +++---- src/app/components/ProfileBadges.svelte | 4 +-- src/app/components/ProfileEdit.svelte | 7 +++-- src/app/components/RoomCreate.svelte | 14 +++++---- src/app/state.ts | 28 +++++++++--------- src/routes/discover/+page.svelte | 4 +-- src/routes/spaces/[relay]/+layout.svelte | 4 +-- src/routes/spaces/[relay]/[room]/+page.svelte | 11 +++---- 10 files changed, 54 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index f3e17cbe..112dbac9 100644 --- a/package.json +++ b/package.json @@ -52,17 +52,17 @@ "@types/qrcode": "^1.5.5", "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.6", - "@welshman/app": "^0.3.5", - "@welshman/content": "^0.3.5", - "@welshman/editor": "^0.3.5", - "@welshman/feeds": "^0.3.5", - "@welshman/lib": "^0.3.5", - "@welshman/net": "^0.3.5", - "@welshman/relay": "^0.3.5", - "@welshman/router": "^0.3.5", - "@welshman/signer": "^0.3.5", - "@welshman/store": "^0.3.5", - "@welshman/util": "^0.3.5", + "@welshman/app": "^0.3.7", + "@welshman/content": "^0.3.7", + "@welshman/editor": "^0.3.7", + "@welshman/feeds": "^0.3.7", + "@welshman/lib": "^0.3.7", + "@welshman/net": "^0.3.7", + "@welshman/relay": "^0.3.7", + "@welshman/router": "^0.3.7", + "@welshman/signer": "^0.3.7", + "@welshman/store": "^0.3.7", + "@welshman/util": "^0.3.7", "compressorjs": "^1.2.1", "daisyui": "^4.12.10", "date-picker-svelte": "^2.13.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ad2620b57d6247d172dd768eacadf75b78b217e..8f03d2da473725fbed3292d086280d009f934eb5 100644 GIT binary patch delta 2123 zcmb7FTZrT46~^O#FEcyd8P6Qaeww70GluBqG$boMfXp|Z(uhv@U>6FD*WMg=#2l$*-H=g{)>B;VEr7} z^#6JG@rP>o;Tf>+-`xBMy#2@UqcE`nn*Ix0i8VmLXZlZ_ySS$M!!CHle|>vRennLysNu^KL#pXR{TfUCzh^rP2K~W7h>N!6}uR zo>Q77*Wnn9mMIQPlBg@^G^QhPU0G2rG0ydc1+BzJQd>h>D6FSDP()enjxkqZKlHwTUD)%S5zZCoj#M_~DL3TmN_Fl@ zxYNiqlvS^(WS66ikKVol|NiHVE%@k8X#c3k3sR{}T1m|$>julZHldd!OGi?x%0%>v zwq*$vvYchh_F}v!rz$+7wN%}%syO3FXjL8Xy+Ni?%V`d2O|zNKlq>gW!G*+bXdiy< ze6SjagEXMxiXiYE9mnJ*l`1-;`IK@|ZYIiTB{_>3Vj~;t=6XESQsr8&vl^1aSRKW1 zu{J|kuT?&GSQU+Fd? zl1_zF^tvUoE1Di&+f$FI@@A6jTA~mi&j?(lhiGXO4C==x{54Lm zrxsdYoy?pGIvALp%p6Twf};-&WhC}UJYHOMu~MfamuBhObZj|sWUMs!Nnw$6C0vy8 zNjm1`r+lo@S99s9SZ#@}|M;J-!aLE>&7&HL1-wpF8;gZRczxV5np&z+Xqr``N+!u9 zElz7)v`v(Zw8UxYPAyyDm#d^kD?Ev)X;q_YHip~FzEvA5i*`IOR_9KFkzjrAc%FJw zqe6@lZ8V#x=chVuuS`7YQW;h#YF>ixxw13PA!MH7X+x@zwkP-Xv`{jpOomA176vwG z^HwZ395i_X&8iHR;%B%bJ^l38Vdw(5c57!pbg;9(v57(S%b~BfTEX7NwM@tA3I#&8 zmtJGy=$XliXf9_>f>r1em+Zm7$7deK5UUb@Ffyw0yIJttwd#!1z_l%hJ50abX4Gf2Gy$Zf~>soQ+;94>Kn|DG-C%XsV z+ya;3OTPf8q5Nq$bF6iOCpflW3S~|X>~BhHbFGBYt9Wz(B%2tm|tJW!Jb970C^naQMU0w z{{NE;{(+NZzOoH&1src}12>3uH*)!~hKH<;yWz*yi?e3)Nd$a5Km-NI1h z0Rr#tf%EXn4hTG)K>jD!y2;;mLx(28|8>8QKm7qX17F?+RG?kUaV?Nwm#+BsE&_iX z1?J~)cM<+-5A=?K$nl(1_Q8{(%z?EJzV|Kg?C0vtuU`iL4#7`;4z}UW+aLm;dk368 Lc=uKC{5SstB`dIg delta 2167 zcma)8U98)76;~3sx4j>|&CR6JZMVBc6Ri|_}}#JYw-1lk+c3!{ssTT-y)ZP z1YLOXfq!uOnqag#T3H=pHAR?tS%O#)HN1+ExXW=BL>0!AB#;YNA&cgTAT+YYu2O3B zV7EGwU|FGgzGTBz0$bE24s8y_tb`#Ixi@^}mCwDVL(i=|v`15?EHUXq-Do9=W*fsZ zjFD-0wu2N0StgG5hYZ{=;z_TI!u9fe%GOj`oM5b*UMe+J!^I#VcOleubD@!%+@|1V zFAi?*g|4jWnYO-2GmEN5D)^A2`f=4&`^C~YB`_Y#wuX4Q%U7i30PCy$4nx?SoaGpD zH0hT!EvvR9S-RPvr;M(Z3W${JDdiSkK*4YKLWe7Qn{P}^Z%ANqB2DUodQ!nAY`SJ* z0_>G$HJL~!=hnD4;z_(gBs_+65T~9s3u$^BACgi@6#7Z4eNt+XaaXhW6f-X<(^@X5 z&-V7w(Y0H1*_f!NXeEqM|5h+ve)RVB)?!)b>LOQwVOmNJ6Jv7W%uOoOC~I^h19us! zn9mS;8&wUZHDF9+R@ISi&2DMPGUL^Xg9+DEMc!GIaB8TZPz5h3H+=TmA=v$6co)cf zP;8Z2hcDy`j?Nfu&s;9_bk=KPj8W~FaaA=X7!juhSCAArXE<0DNwuouo|Y|CI>@v! zYcF**H<`m4jMM$D(64q~yiIjeY%&M#?}wgW^TVu@=uJCrqA4%9c+Qz+=1E-}O-&;o zSNip;MxF3FG4tj;oe*reK-06?{3JPP52|Vf)dmZKs3dyD^0dfQaYHvn423Or#UBIC zKD51Z@_B(uQNwyNyU51PB8%vmD$C)#nrK?4QOji5QXavrc(F3(X^Kfu^EjQ)oCuDP zH#>w#b4ym4d6jy-JEwY{Sa60|DQ)2M|Lo6XG_+)Q)uLnc+Dk$2j*eV;V*6KaKi3|q zBndfJ)iL~)?$iBvk(u*7cCVKVJ{f)`54 zxR^fi`gk^3K_u5qmCd+N@N;*sf*(XfpI)UY;C4AXv^gF|mC~%<mGzoz<+Q)FuriK5R_b&T0%nJqCSj z-7a=vpao9TtAlA)t8p1>)>L#!tQY25k64V=E;U6JxXNQf!EQ*5Yg%oxIbF(9HxVyN zY^mLGY6F!-?4$(e^K`jd$>^!volq=v8j6Kse3!c@ydCxNhl}t4zm8B`$)r{2|>Jn8H zd%Bfi>qc8Pk+IgobGFgNd9>v=2UZW2%i!Lh!&kwtisAP{uYxy9VHaHgHWa->P~lU8 ziu~ekXubFa@Q-ci5Zrn{at7S_Ac8+ar@dcn0tIS++J_DwTN+!??$xJM?xmxR z(&7F$&L>ab-h$Gh^))(u`8*U20c9KdRKOD)h;?poApifVJPH3pnULnlGG(|;Q&g2Mhvy?8T)YDAMWHvI#P&b@ wUIx1{NC;Ge-lf6oG3a^-J^gtM`r4O{p3;@gdERKsY4D4X4xa{7_t`K06Ys6YrvLx| diff --git a/src/app/commands.ts b/src/app/commands.ts index d45b29f0..ed56bf5f 100644 --- a/src/app/commands.ts +++ b/src/app/commands.ts @@ -12,7 +12,7 @@ import { FOLLOWS, REACTION, AUTH_JOIN, - GROUPS, + ROOMS, COMMENT, isSignedEvent, makeEvent, @@ -124,7 +124,7 @@ export const broadcastUserData = async (relays: string[]) => { // List updates export const addSpaceMembership = async (url: string) => { - const list = get(userMembership) || makeList({kind: GROUPS}) + const list = get(userMembership) || makeList({kind: ROOMS}) const event = await addToListPublicly(list, ["r", url]).reconcile(nip44EncryptToSelf) const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)]) @@ -132,7 +132,7 @@ export const addSpaceMembership = async (url: string) => { } export const removeSpaceMembership = async (url: string) => { - const list = get(userMembership) || makeList({kind: GROUPS}) + const list = get(userMembership) || makeList({kind: ROOMS}) const pred = (t: string[]) => t[t[0] === "r" ? 1 : 2] === url const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf) const relays = uniq([url, ...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)]) @@ -141,7 +141,7 @@ export const removeSpaceMembership = async (url: string) => { } export const addRoomMembership = async (url: string, room: string) => { - const list = get(userMembership) || makeList({kind: GROUPS}) + const list = get(userMembership) || makeList({kind: ROOMS}) const newTags = [ ["r", url], ["group", room, url], @@ -153,7 +153,7 @@ export const addRoomMembership = async (url: string, room: string) => { } export const removeRoomMembership = async (url: string, room: string) => { - const list = get(userMembership) || makeList({kind: GROUPS}) + const list = get(userMembership) || makeList({kind: ROOMS}) const pred = (t: string[]) => equals(["group", room, url], t.slice(0, 3)) const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf) const relays = uniq([url, ...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)]) diff --git a/src/app/components/ProfileBadges.svelte b/src/app/components/ProfileBadges.svelte index b176a819..44a455dd 100644 --- a/src/app/components/ProfileBadges.svelte +++ b/src/app/components/ProfileBadges.svelte @@ -5,7 +5,7 @@ import type {Filter} from "@welshman/util" import {deriveEvents} from "@welshman/store" import {formatTimestampRelative} from "@welshman/lib" - import {NOTE, GROUPS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util" + import {NOTE, ROOMS, MESSAGE, THREAD, COMMENT, getRelayTags, getListTags} from "@welshman/util" import {repository, loadRelaySelections} from "@welshman/app" import Button from "@lib/components/Button.svelte" import ProfileSpaces from "@app/components/ProfileSpaces.svelte" @@ -35,7 +35,7 @@ // Load groups and at least one note, regardless of time frame load({ filters: [ - {authors: [pubkey], kinds: [GROUPS]}, + {authors: [pubkey], kinds: [ROOMS]}, {authors: [pubkey], limit: 1, kinds: [NOTE, MESSAGE, THREAD, COMMENT]}, ], relays: Router.get().FromPubkeys([pubkey]).getUrls(), diff --git a/src/app/components/ProfileEdit.svelte b/src/app/components/ProfileEdit.svelte index 3309cdca..b18c8c81 100644 --- a/src/app/components/ProfileEdit.svelte +++ b/src/app/components/ProfileEdit.svelte @@ -1,4 +1,5 @@