diff --git a/src/app/commands.ts b/src/app/commands.ts index f4f6177ef..834456679 100644 --- a/src/app/commands.ts +++ b/src/app/commands.ts @@ -51,7 +51,6 @@ import { } from "@welshman/app" import { COMMENT, - tagRoom, userMembership, MEMBERSHIPS, INDEXER_RELAYS, @@ -242,7 +241,9 @@ export const removeSpaceMembership = async (url: string) => { export const addRoomMembership = async (url: string, room: string) => { const list = get(userMembership) || makeList({kind: MEMBERSHIPS}) - const event = await addToListPublicly(list, tagRoom(room, url)).reconcile(nip44EncryptToSelf) + const event = await addToListPublicly(list, ["r", url], ["group", room, url]).reconcile( + nip44EncryptToSelf, + ) const relays = uniq([...ctx.app.router.FromUser().getUrls(), ...getRelayTagValues(event.tags)]) return publishThunk({event, relays}) @@ -250,7 +251,7 @@ export const addRoomMembership = async (url: string, room: string) => { export const removeRoomMembership = async (url: string, room: string) => { const list = get(userMembership) || makeList({kind: MEMBERSHIPS}) - const pred = (t: string[]) => equals(tagRoom(room, url), t) + const pred = (t: string[]) => equals(["group", room, url], t) const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf) const relays = uniq([ url, diff --git a/src/app/components/ChatEnable.svelte b/src/app/components/ChatEnable.svelte index efbb9e7d8..1775d51df 100644 --- a/src/app/components/ChatEnable.svelte +++ b/src/app/components/ChatEnable.svelte @@ -10,6 +10,8 @@ import {canDecrypt, PLATFORM_NAME, ensureUnwrapped} from "@app/state" import {clearModals} from "@app/modal" + export let next + let loading = false const enableChat = async () => { @@ -20,7 +22,7 @@ } clearModals() - goto("/chat") + goto(next) } const submit = async () => { @@ -38,16 +40,16 @@
-
Enable Chat
-
Do you want to enable direct messages?
+
Enable Messages
+
Do you want to enable notes and direct messages?

- By default, direct messages are disabled, since loading them requires + By default, notes and direct messages are disabled, since loading them requires {PLATFORM_NAME} to download and decrypt a lot of data.

- If you'd like to enable direct messages, please make sure your signer is set up to to - auto-approve requests to decrypt data. + If you'd like to enable them, please make sure your signer is set up to to auto-approve requests + to decrypt data.

diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte index cb638e69d..9ef56c06c 100644 --- a/src/app/components/Content.svelte +++ b/src/app/components/Content.svelte @@ -4,7 +4,7 @@ import { parse, truncate, - render as renderParsed, + renderAsHtml, isText, isTopic, isCode, @@ -146,10 +146,10 @@ {/if} {:else if isEllipsis(parsed) && expandInline} - {@html renderParsed(parsed)} + {@html renderAsHtml(parsed)} {:else} - {@html renderParsed(parsed)} + {@html renderAsHtml(parsed)} {/if} {/each} diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte index 0690c349b..3ec7fd484 100644 --- a/src/app/components/ContentQuote.svelte +++ b/src/app/components/ContentQuote.svelte @@ -2,12 +2,13 @@ import {nip19} from "nostr-tools" import {goto} from "$app/navigation" import {ctx, nthEq} from "@welshman/lib" + import {tracker, repository} from "@welshman/app" import {Address, DIRECT_MESSAGE} from "@welshman/util" import Button from "@lib/components/Button.svelte" import Spinner from "@lib/components/Spinner.svelte" import NoteCard from "@app/components/NoteCard.svelte" - import {deriveEvent, entityLink, MESSAGE, THREAD} from "@app/state" - import {makeThreadPath} from "@app/routes" + import {deriveEvent, entityLink, ROOM, MESSAGE, THREAD} from "@app/state" + import {makeThreadPath, makeRoomPath} from "@app/routes" export let value export let event @@ -41,13 +42,27 @@ return Boolean(element) } + const openMessage = (url: string, room: string, id: string) => { + const event = repository.getEvent(id) + + if (event) { + goto(makeRoomPath(url, room)) + + // TODO: if the event doesn't immediately load, this won't work. Scroll up until it's found + setTimeout(() => scrollToEvent(id), 300) + } + + return Boolean(event) + } + const onClick = (e: Event) => { if ($quote) { if ($quote.kind === DIRECT_MESSAGE) { return scrollToEvent($quote.id) } - const [room, url] = $quote.tags.find(nthEq(0, "~"))?.slice(1) || [] + const [url] = tracker.getRelays($quote.id) + const room = $quote.tags.find(nthEq(0, ROOM))?.[1] if (url && room) { if ($quote.kind === THREAD) { @@ -55,7 +70,7 @@ } if ($quote.kind === MESSAGE) { - return scrollToEvent($quote.id) + return scrollToEvent($quote.id) || openMessage(url, room, $quote.id) } const kind = $quote.tags.find(nthEq(0, "K"))?.[1] @@ -67,7 +82,7 @@ } if (parseInt(kind) === MESSAGE) { - return scrollToEvent(id) + return scrollToEvent(id) || openMessage(url, room, id) } } } diff --git a/src/app/components/NoteItem.svelte b/src/app/components/NoteItem.svelte index 2434b01f5..229982c40 100644 --- a/src/app/components/NoteItem.svelte +++ b/src/app/components/NoteItem.svelte @@ -29,7 +29,7 @@
- + diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index 4331c84f1..c88481a23 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -28,7 +28,9 @@ const showSettingsMenu = () => pushModal(MenuSettings) - const openChat = () => ($canDecrypt ? goto("/chat") : pushModal(ChatEnable)) + const openNotes = () => ($canDecrypt ? goto("/notes") : pushModal(ChatEnable, {next: "/notes"})) + + const openChat = () => ($canDecrypt ? goto("/chat") : pushModal(ChatEnable, {next: "/chat"}))