diff --git a/src/app/components/CalendarEventActions.svelte b/src/app/components/CalendarEventActions.svelte index 7e6030e..1d6979c 100644 --- a/src/app/components/CalendarEventActions.svelte +++ b/src/app/components/CalendarEventActions.svelte @@ -25,7 +25,7 @@ const {url, event, showRoom, showActivity}: Props = $props() - const room = getTagValue("h", event.tags) + const h = getTagValue("h", event.tags) const path = makeCalendarPath(url, event.id) const shouldProtect = canEnforceNip70(url) @@ -39,9 +39,9 @@
- {#if room && showRoom} - - Posted in # + {#if h && showRoom} + + Posted in # {/if} diff --git a/src/app/components/CalendarEventCreate.svelte b/src/app/components/CalendarEventCreate.svelte index 733db40..00b0b4e 100644 --- a/src/app/components/CalendarEventCreate.svelte +++ b/src/app/components/CalendarEventCreate.svelte @@ -4,13 +4,13 @@ type Props = { url: string - room?: string + h?: string } - const {url, room}: Props = $props() + const {url, h}: Props = $props() - + {#snippet header()} {#snippet title()} diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte index 71c5095..54daaf8 100644 --- a/src/app/components/CalendarEventForm.svelte +++ b/src/app/components/CalendarEventForm.svelte @@ -23,7 +23,7 @@ type Props = { url: string - room?: string + h?: string header: Snippet initialValues?: { d: string @@ -35,7 +35,7 @@ } } - const {url, room, header, initialValues}: Props = $props() + const {url, h, header, initialValues}: Props = $props() const shouldProtect = canEnforceNip70(url) @@ -85,8 +85,8 @@ tags.push(PROTECTED) } - if (room) { - tags.push(["h", room]) + if (h) { + tags.push(["h", h]) } const event = makeEvent(EVENT_TIME, {content, tags}) diff --git a/src/app/components/CalendarEventItem.svelte b/src/app/components/CalendarEventItem.svelte index 483b02f..5dfb205 100644 --- a/src/app/components/CalendarEventItem.svelte +++ b/src/app/components/CalendarEventItem.svelte @@ -15,7 +15,7 @@ const {url, event}: Props = $props() - const room = getTagValue("h", event.tags) + const h = getTagValue("h", event.tags) @@ -23,8 +23,8 @@
Posted by - {#if room} - in + {#if h} + in {/if} diff --git a/src/app/components/ChannelCompose.svelte b/src/app/components/ChannelCompose.svelte index 989a45b..1ba48a9 100644 --- a/src/app/components/ChannelCompose.svelte +++ b/src/app/components/ChannelCompose.svelte @@ -16,13 +16,13 @@ type Props = { url?: string - room?: string + h?: string content?: string onEditPrevious?: () => void onSubmit: (event: EventContent) => void } - const {url, room, content, onEditPrevious, onSubmit}: Props = $props() + const {url, h, content, onEditPrevious, onSubmit}: Props = $props() const autofocus = !isMobile @@ -90,7 +90,7 @@ {/each} diff --git a/src/app/components/GoalActions.svelte b/src/app/components/GoalActions.svelte index 2b6ced9..88d660c 100644 --- a/src/app/components/GoalActions.svelte +++ b/src/app/components/GoalActions.svelte @@ -20,7 +20,7 @@ const {url, event, showRoom, showActivity}: Props = $props() const path = makeGoalPath(url, event.id) - const room = getTagValue("h", event.tags) + const h = getTagValue("h", event.tags) const shouldProtect = canEnforceNip70(url) const deleteReaction = async (event: TrustedEvent) => @@ -31,9 +31,9 @@
- {#if room && showRoom} - - Posted in # + {#if h && showRoom} + + Posted in # {/if} diff --git a/src/app/components/GoalCreate.svelte b/src/app/components/GoalCreate.svelte index 1a6b7b7..50c161f 100644 --- a/src/app/components/GoalCreate.svelte +++ b/src/app/components/GoalCreate.svelte @@ -20,10 +20,10 @@ type Props = { url: string - room?: string + h?: string } - const {url, room}: Props = $props() + const {url, h}: Props = $props() const shouldProtect = canEnforceNip70(url) @@ -64,8 +64,8 @@ tags.push(PROTECTED) } - if (room) { - tags.push(["h", room]) + if (h) { + tags.push(["h", h]) } publishThunk({ diff --git a/src/app/components/GoalItem.svelte b/src/app/components/GoalItem.svelte index 4aed889..07af75a 100644 --- a/src/app/components/GoalItem.svelte +++ b/src/app/components/GoalItem.svelte @@ -17,7 +17,7 @@ const {url, event}: Props = $props() const summary = getTagValue("summary", event.tags) - const room = getTagValue("h", event.tags) + const h = getTagValue("h", event.tags) @@ -32,8 +32,8 @@
Posted by - {#if room} - in + {#if h} + in {/if} diff --git a/src/app/components/MenuSpace.svelte b/src/app/components/MenuSpace.svelte index f04137d..9db7c97 100644 --- a/src/app/components/MenuSpace.svelte +++ b/src/app/components/MenuSpace.svelte @@ -216,8 +216,8 @@
Your Rooms {/if} - {#each $userRooms as room, i (room)} - + {#each $userRooms as h, i (h)} + {/each} {#if $otherRooms.length > 0}
@@ -229,8 +229,8 @@ {/if} {/if} - {#each $otherRooms as room, i (room)} - + {#each $otherRooms as h, i (h)} + {/each} {#if $canCreateRoom} diff --git a/src/app/components/MenuSpaceRoomItem.svelte b/src/app/components/MenuSpaceRoomItem.svelte index 3e215f5..ae468cd 100644 --- a/src/app/components/MenuSpaceRoomItem.svelte +++ b/src/app/components/MenuSpaceRoomItem.svelte @@ -6,19 +6,19 @@ interface Props { url: any - room: any + h: any notify?: boolean replaceState?: boolean } - const {url, room, notify = false, replaceState = false}: Props = $props() + const {url, h, notify = false, replaceState = false}: Props = $props() - const path = makeRoomPath(url, room) + const path = makeRoomPath(url, h) - + diff --git a/src/app/components/RoomEdit.svelte b/src/app/components/RoomEdit.svelte index d3ceb0e..c3b57e4 100644 --- a/src/app/components/RoomEdit.svelte +++ b/src/app/components/RoomEdit.svelte @@ -19,13 +19,13 @@ type Props = { url: string - room: string + h: string } - const {url, room}: Props = $props() + const {url, h}: Props = $props() - const channel = deriveChannel(url, room) - const initialValues = $channel ? readRoomMeta($channel.event) : makeRoomMeta({h: room}) + const channel = deriveChannel(url, h) + const initialValues = $channel ? readRoomMeta($channel.event) : makeRoomMeta({h}) const back = () => history.back() @@ -37,7 +37,7 @@ message: "This room will no longer be accessible to space members, and all messages posted to it will be deleted.", confirm: async () => { - const thunk = deleteRoom(url, makeRoomMeta({h: room})) + const thunk = deleteRoom(url, makeRoomMeta({h})) const message = await waitForThunkError(thunk) if (message) { diff --git a/src/app/components/RoomForm.svelte b/src/app/components/RoomForm.svelte index 2a4c542..db13cbd 100644 --- a/src/app/components/RoomForm.svelte +++ b/src/app/components/RoomForm.svelte @@ -113,7 +113,10 @@ {#if imagePreview}
Selected: - Room icon preview + Room icon preview
{:else if selectedIcon}
@@ -161,7 +164,7 @@ {/snippet} {#snippet input()} {/snippet} diff --git a/src/app/components/ThreadActions.svelte b/src/app/components/ThreadActions.svelte index cb6bf41..9a852de 100644 --- a/src/app/components/ThreadActions.svelte +++ b/src/app/components/ThreadActions.svelte @@ -19,8 +19,8 @@ const {url, event, showRoom, showActivity}: Props = $props() + const h = getTagValue("h", event.tags) const path = makeThreadPath(url, event.id) - const room = getTagValue("h", event.tags) const shouldProtect = canEnforceNip70(url) const deleteReaction = async (event: TrustedEvent) => @@ -31,9 +31,9 @@
- {#if room && showRoom} - - Posted in # + {#if h && showRoom} + + Posted in # {/if} diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte index 51723d4..7a8169b 100644 --- a/src/app/components/ThreadCreate.svelte +++ b/src/app/components/ThreadCreate.svelte @@ -18,10 +18,10 @@ type Props = { url: string - room?: string + h?: string } - const {url, room}: Props = $props() + const {url, h}: Props = $props() const shouldProtect = canEnforceNip70(url) @@ -57,8 +57,8 @@ tags.push(PROTECTED) } - if (room) { - tags.push(["h", room]) + if (h) { + tags.push(["h", h]) } publishThunk({ diff --git a/src/app/components/ThreadItem.svelte b/src/app/components/ThreadItem.svelte index 8ce989c..c14a8b8 100644 --- a/src/app/components/ThreadItem.svelte +++ b/src/app/components/ThreadItem.svelte @@ -17,7 +17,7 @@ const {url, event}: Props = $props() const title = getTagValue("title", event.tags) - const room = getTagValue("h", event.tags) + const h = getTagValue("h", event.tags) @@ -38,8 +38,8 @@ Posted by - {#if room} - in + {#if h} + in {/if} diff --git a/src/app/core/commands.ts b/src/app/core/commands.ts index 6ad71aa..155dc66 100644 --- a/src/app/core/commands.ts +++ b/src/app/core/commands.ts @@ -191,11 +191,11 @@ export const removeSpaceMembership = async (url: string) => { return publishThunk({event, relays}) } -export const addRoomMembership = async (url: string, room: string) => { +export const addRoomMembership = async (url: string, h: string) => { const list = get(userGroupSelections) || makeList({kind: ROOMS}) const newTags = [ ["r", url], - ["group", room, url], + ["group", h, url], ] const event = await addToListPublicly(list, ...newTags).reconcile(nip44EncryptToSelf) const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)]) @@ -203,9 +203,9 @@ export const addRoomMembership = async (url: string, room: string) => { return publishThunk({event, relays}) } -export const removeRoomMembership = async (url: string, room: string) => { +export const removeRoomMembership = async (url: string, h: string) => { const list = get(userGroupSelections) || makeList({kind: ROOMS}) - const pred = (t: string[]) => equals(["group", room, url], t.slice(0, 3)) + const pred = (t: string[]) => equals(["group", h, 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/core/state.ts b/src/app/core/state.ts index 3eb7b66..95213f7 100644 --- a/src/app/core/state.ts +++ b/src/app/core/state.ts @@ -537,7 +537,7 @@ export const messages = deriveEvents(repository, {filters: [{kinds: [MESSAGE]}]} export type Channel = { id: string url: string - room: string + h: string name: string event: TrustedEvent closed: boolean @@ -546,7 +546,7 @@ export type Channel = { about?: string } -export const makeChannelId = (url: string, room: string) => `${url}'${room}` +export const makeChannelId = (url: string, h: string) => `${url}'${h}` export const splitChannelId = (id: string) => id.split("'") @@ -562,17 +562,17 @@ export const channels = derived( for (const url of $getUrlsForEvent(event.id)) { if (event.kind === ROOM_META) { const meta = fromPairs(event.tags) - const room = meta.d + const h = meta.d - if (room) { - const id = makeChannelId(url, room) + if (h) { + const id = makeChannelId(url, h) result.set(id, { id, url, - room, + h, event, - name: meta.name || room, + name: meta.name || h, closed: Boolean(getTag("closed", event.tags)), private: Boolean(getTag("private", event.tags)), picture: meta.picture, @@ -582,8 +582,8 @@ export const channels = derived( } if (event.kind === ROOM_DELETE) { - for (const room of getTagValues("h", event.tags)) { - result.delete(makeChannelId(url, room)) + for (const h of getTagValues("h", event.tags)) { + result.delete(makeChannelId(url, h)) } } } @@ -604,24 +604,21 @@ export const { store: channels, getKey: channel => channel.id, load: async (id: string) => { - const [url, room] = splitChannelId(id) + const [url, h] = splitChannelId(id) await load({ relays: [url], - filters: [{kinds: [ROOM_META], "#d": [room]}], + filters: [{kinds: [ROOM_META], "#d": [h]}], }) }, }) -export const deriveChannel = (url: string, room: string) => _deriveChannel(makeChannelId(url, room)) +export const deriveChannel = (url: string, h: string) => _deriveChannel(makeChannelId(url, h)) -export const loadChannel = (url: string, room: string) => _loadChannel(makeChannelId(url, room)) +export const displayChannel = (url: string, h: string) => + channelsById.get().get(makeChannelId(url, h))?.name || h -export const displayChannel = (url: string, room: string) => - channelsById.get().get(makeChannelId(url, room))?.name || room - -export const roomComparator = (url: string) => (room: string) => - displayChannel(url, room).toLowerCase() +export const roomComparator = (url: string) => (h: string) => displayChannel(url, h).toLowerCase() // User space/room selections @@ -685,9 +682,9 @@ export const getSpaceRoomsFromGroupSelections = ( ) => { const rooms: string[] = [] - for (const [_, room, relay] of getGroupTags(getListTags($groupSelections))) { + for (const [_, h, relay] of getGroupTags(getListTags($groupSelections))) { if (url === relay) { - rooms.push(room) + rooms.push(h) } } @@ -707,9 +704,9 @@ export const deriveUserRooms = (url: string) => derived([userGroupSelections, channelsById], ([$userGroupSelections, $channelsById]) => { const rooms: string[] = [] - for (const room of getSpaceRoomsFromGroupSelections(url, $userGroupSelections)) { - if ($channelsById.has(makeChannelId(url, room))) { - rooms.push(room) + for (const h of getSpaceRoomsFromGroupSelections(url, $userGroupSelections)) { + if ($channelsById.has(makeChannelId(url, h))) { + rooms.push(h) } } @@ -720,9 +717,9 @@ export const deriveOtherRooms = (url: string) => derived([deriveUserRooms(url), channelsByUrl], ([$userRooms, $channelsByUrl]) => { const rooms: string[] = [] - for (const {room} of $channelsByUrl.get(url) || []) { - if (!$userRooms.includes(room)) { - rooms.push(room) + for (const {h} of $channelsByUrl.get(url) || []) { + if (!$userRooms.includes(h)) { + rooms.push(h) } } @@ -765,11 +762,11 @@ export const deriveSpaceMembers = (url: string) => }, ) -export const deriveRoomMembers = (url: string, room: string) => +export const deriveRoomMembers = (url: string, h: string) => derived( deriveEventsForUrl(url, [ - {kinds: [ROOM_MEMBERS], "#d": [room]}, - {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [room]}, + {kinds: [ROOM_MEMBERS], "#d": [h]}, + {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}, ]), $events => { const membersEvent = $events.find(spec({kind: ROOM_MEMBERS})) @@ -800,8 +797,8 @@ export const deriveRoomMembers = (url: string, room: string) => }, ) -export const deriveRoomAdmins = (url: string, room: string) => - derived(deriveEventsForUrl(url, [{kinds: [ROOM_ADMINS], "#d": [room]}]), $events => { +export const deriveRoomAdmins = (url: string, h: string) => + derived(deriveEventsForUrl(url, [{kinds: [ROOM_ADMINS], "#d": [h]}]), $events => { const adminsEvent = first($events) if (adminsEvent) { @@ -847,12 +844,12 @@ export const deriveUserSpaceMembershipStatus = (url: string) => }, ) -export const deriveUserRoomMembershipStatus = (url: string, room: string) => +export const deriveUserRoomMembershipStatus = (url: string, h: string) => derived( [ pubkey, - deriveRoomMembers(url, room), - deriveEventsForUrl(url, [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [room]}]), + deriveRoomMembers(url, h), + deriveEventsForUrl(url, [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [h]}]), ], ([$pubkey, $members, $events]) => { const isMember = $members.includes($pubkey) @@ -885,8 +882,8 @@ export const deriveUserCanCreateRoom = (url: string) => }, ) -export const deriveUserIsRoomAdmin = (url: string, room: string) => - derived([pubkey, deriveRoomAdmins(url, room)], ([$pubkey, $admins]) => $admins.includes($pubkey!)) +export const deriveUserIsRoomAdmin = (url: string, h: string) => + derived([pubkey, deriveRoomAdmins(url, h)], ([$pubkey, $admins]) => $admins.includes($pubkey!)) // Other utils diff --git a/src/app/core/sync.ts b/src/app/core/sync.ts index 3555e9c..de20d39 100644 --- a/src/app/core/sync.ts +++ b/src/app/core/sync.ts @@ -150,7 +150,7 @@ const syncUserSpaceMembership = (url: string) => { return () => controller.abort() } -const syncUserRoomMembership = (url: string, room: string) => { +const syncUserRoomMembership = (url: string, h: string) => { const $pubkey = pubkey.get() const controller = new AbortController() @@ -162,7 +162,7 @@ const syncUserRoomMembership = (url: string, room: string) => { { kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#p": [$pubkey], - "#h": [room], + "#h": [h], }, ], }) @@ -187,11 +187,11 @@ const syncUserData = () => { keys.add(url) - for (const room of getSpaceRoomsFromGroupSelections(url, $l)) { - const key = `${url}'${room}` + for (const h of getSpaceRoomsFromGroupSelections(url, $l)) { + const key = `${url}'${h}` if (!unsubscribersByKey.has(key)) { - unsubscribersByKey.set(key, syncUserRoomMembership(url, room)) + unsubscribersByKey.set(key, syncUserRoomMembership(url, h)) } keys.add(key) @@ -328,16 +328,16 @@ const syncSpaces = () => { // Chat -const syncRoomChat = (url: string, room: string) => { +const syncRoomChat = (url: string, h: string) => { const controller = new AbortController() pullAndListen({ relays: [url], signal: controller.signal, filters: [ - {kinds: [ROOM_ADMINS, ROOM_MEMBERS], "#d": [room]}, - {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [room]}, - {kinds: [MESSAGE], "#h": [room]}, + {kinds: [ROOM_ADMINS, ROOM_MEMBERS], "#d": [h]}, + {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}, + {kinds: [MESSAGE], "#h": [h]}, ], }) @@ -355,11 +355,11 @@ const syncRooms = () => { // Add new subscriptions, depending on whether nip 29 is supported for (const url of getRelayTagValues(getListTags($l))) { if (hasNip29($relaysByUrl.get(url))) { - for (const room of getSpaceRoomsFromGroupSelections(url, $l)) { - const key = `${url}'${room}` + for (const h of getSpaceRoomsFromGroupSelections(url, $l)) { + const key = `${url}'${h}` if (!unsubscribersByKey.has(key)) { - newUnsubscribersByKey.set(key, syncRoomChat(url, room)) + newUnsubscribersByKey.set(key, syncRoomChat(url, h)) } keys.add(key) diff --git a/src/app/util/notifications.ts b/src/app/util/notifications.ts index bdc4bd3..278202b 100644 --- a/src/app/util/notifications.ts +++ b/src/app/util/notifications.ts @@ -171,10 +171,10 @@ export const notifications = derived( } if (hasNip29($relaysByUrl.get(url))) { - for (const room of getSpaceRoomsFromGroupSelections(url, $userGroupSelections)) { - const roomPath = makeRoomPath(url, room) + for (const h of getSpaceRoomsFromGroupSelections(url, $userGroupSelections)) { + const roomPath = makeRoomPath(url, h) const latestEvent = allMessages.find( - e => $getUrlsForEvent(e.id).includes(url) && e.tags.find(spec(["h", room])), + e => $getUrlsForEvent(e.id).includes(url) && e.tags.find(spec(["h", h])), ) if (hasNotification(roomPath, latestEvent)) { diff --git a/src/app/util/routes.ts b/src/app/util/routes.ts index 1a14cae..f6fc1ac 100644 --- a/src/app/util/routes.ts +++ b/src/app/util/routes.ts @@ -52,7 +52,7 @@ export const makeSpacePath = (url: string, ...extra: (string | undefined)[]) => export const makeChatPath = (pubkeys: string[]) => `/chat/${makeChatId(pubkeys)}` -export const makeRoomPath = (url: string, room: string) => `/spaces/${encodeRelay(url)}/${room}` +export const makeRoomPath = (url: string, h: string) => `/spaces/${encodeRelay(url)}/${h}` export const makeSpaceChatPath = (url: string) => makeRoomPath(url, "chat") @@ -103,7 +103,7 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => { return makeChatPath([event.pubkey, ...getPubkeyTagValues(event.tags)]) } - const room = getTagValue(ROOM, event.tags) + const h = getTagValue(ROOM, event.tags) if (urls.length > 0) { const url = urls[0] @@ -121,7 +121,7 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => { } if (event.kind === MESSAGE) { - return room ? makeRoomPath(url, room) : makeSpacePath(url, "chat") + return h ? makeRoomPath(url, h) : makeSpacePath(url, "chat") } const kind = event.tags.find(nthEq(0, "K"))?.[1] @@ -141,7 +141,7 @@ export const getEventPath = async (event: TrustedEvent, urls: string[]) => { } if (parseInt(kind) === MESSAGE) { - return room ? makeRoomPath(url, room) : makeSpacePath(url, "chat") + return h ? makeRoomPath(url, h) : makeSpacePath(url, "chat") } } } diff --git a/src/routes/spaces/[relay]/[room]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte similarity index 95% rename from src/routes/spaces/[relay]/[room]/+page.svelte rename to src/routes/spaces/[relay]/[h]/+page.svelte index a94bf0e..047bb50 100644 --- a/src/routes/spaces/[relay]/[room]/+page.svelte +++ b/src/routes/spaces/[relay]/[h]/+page.svelte @@ -63,26 +63,26 @@ import {pushToast} from "@app/util/toast" import {pushModal} from "@app/util/modal" - const {room, relay} = $page.params as MakeNonOptional + const {h, relay} = $page.params as MakeNonOptional const mounted = now() const lastChecked = $checked[$page.url.pathname] const url = decodeRelay(relay) - const channel = deriveChannel(url, room) + const channel = deriveChannel(url, h) const shouldProtect = canEnforceNip70(url) const userRooms = deriveUserRooms(url) - const userIsAdmin = deriveUserIsRoomAdmin(url, room) - const isFavorite = $derived($userRooms.includes(room)) - const membershipStatus = deriveUserRoomMembershipStatus(url, room) + const userIsAdmin = deriveUserIsRoomAdmin(url, h) + const isFavorite = $derived($userRooms.includes(h)) + const membershipStatus = deriveUserRoomMembershipStatus(url, h) - const addFavorite = () => addRoomMembership(url, room) + const addFavorite = () => addRoomMembership(url, h) - const removeFavorite = () => removeRoomMembership(url, room) + const removeFavorite = () => removeRoomMembership(url, h) const join = async () => { joining = true try { - const message = await waitForThunkError(joinRoom(url, makeRoomMeta({h: room}))) + const message = await waitForThunkError(joinRoom(url, makeRoomMeta({h}))) if (message && !message.startsWith("duplicate:")) { return pushToast({theme: "error", message}) @@ -98,7 +98,7 @@ const leave = async () => { leaving = true try { - const message = await waitForThunkError(leaveRoom(url, makeRoomMeta({h: room}))) + const message = await waitForThunkError(leaveRoom(url, makeRoomMeta({h}))) if (message && !message.startsWith("duplicate:")) { pushToast({theme: "error", message}) @@ -126,7 +126,7 @@ } const onSubmit = async ({content, tags}: EventContent) => { - tags.push(["h", room]) + tags.push(["h", h]) if (await shouldProtect) { tags.push(PROTECTED) @@ -270,7 +270,7 @@ const feed = makeFeed({ url, element: element!, - filters: [{kinds: [...MESSAGE_KINDS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [room]}], + filters: [{kinds: [...MESSAGE_KINDS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}], onExhausted: () => { loadingEvents = false }, @@ -297,7 +297,7 @@ } } - const startEdit = () => pushModal(RoomEdit, {url, room}) + const startEdit = () => pushModal(RoomEdit, {url, h}) onMount(() => { const observer = new ResizeObserver(() => { @@ -334,7 +334,7 @@ {/snippet} {#snippet title()} - + {/snippet} {#snippet action()} @@ -486,7 +486,7 @@ {#key eventToEdit} { const convs = [] - for (const [room, messages] of groupBy(e => getTagValue("h", e.tags), $messages).entries()) { + for (const [h, messages] of groupBy(e => getTagValue("h", e.tags), $messages).entries()) { const avgTime = avg(overlappingPairs(messages).map(([a, b]) => a.created_at - b.created_at)) const groups: TrustedEvent[][] = [] const group: TrustedEvent[] = [] @@ -52,7 +52,7 @@ const earliest = last(events)! const participants = uniq(events.map(msg => msg.pubkey)) - convs.push({room, events, latest, earliest, participants}) + convs.push({h, events, latest, earliest, participants}) } } @@ -96,10 +96,10 @@ {#if $messages.length > 0} {@const events = $messages.slice(0, 1)} {@const event = events[0]} - {@const room = getTagValue("h", event.tags)} + {@const h = getTagValue("h", event.tags)} {/if} {:else} - {#each $conversations.slice(0, limit) as { room, events, latest, earliest, participants } (latest.id)} - + {#each $conversations.slice(0, limit) as { h, events, latest, earliest, participants } (latest.id)} + {/each} {/if}