diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte index 572ce445..755c1a8d 100644 --- a/src/app/components/Content.svelte +++ b/src/app/components/Content.svelte @@ -141,7 +141,7 @@ {:else if isLink(parsed)} {#if isBlock(i)} - + {:else} {/if} diff --git a/src/app/components/ContentLinkBlock.svelte b/src/app/components/ContentLinkBlock.svelte index 285912f5..adfdcf8d 100644 --- a/src/app/components/ContentLinkBlock.svelte +++ b/src/app/components/ContentLinkBlock.svelte @@ -4,9 +4,10 @@ import {preventDefault, stopPropagation} from "@lib/html" import Link from "@lib/components/Link.svelte" import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte" + import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte" import {pushModal} from "@app/modal" - const {value} = $props() + const {value, event} = $props() let hideImage = $state(false) @@ -37,7 +38,7 @@ {:else if url.match(/\.(jpe?g|png|gif|webp)$/)} {:else} {#await loadPreview()} diff --git a/src/app/components/ContentLinkBlockImage.svelte b/src/app/components/ContentLinkBlockImage.svelte new file mode 100644 index 00000000..83435caf --- /dev/null +++ b/src/app/components/ContentLinkBlockImage.svelte @@ -0,0 +1,49 @@ + + + diff --git a/src/app/requests.ts b/src/app/requests.ts index dbcc57e2..b4202db9 100644 --- a/src/app/requests.ts +++ b/src/app/requests.ts @@ -41,6 +41,7 @@ import { loadMutes, loadFollows, loadProfile, + loadRelaySelections, loadInboxRelaySelections, } from "@welshman/app" import {createScroller} from "@lib/html" @@ -384,7 +385,9 @@ export const listenForNotifications = () => { return () => controller.abort() } -export const loadUserData = (pubkey: string, relays: string[] = []) => { +export const loadUserData = async (pubkey: string, relays: string[] = []) => { + await Promise.race([sleep(3000), loadRelaySelections(pubkey, relays)]) + const promise = Promise.race([ sleep(3000), Promise.all([ diff --git a/src/app/state.ts b/src/app/state.ts index 777a2414..9080ba40 100644 --- a/src/app/state.ts +++ b/src/app/state.ts @@ -115,7 +115,7 @@ export const IMGPROXY_URL = "https://imgproxy.coracle.social" export const REACTION_KINDS = [REACTION, ZAP_RESPONSE] export const NIP46_PERMS = - "nip04_encrypt,nip04_decrypt,nip44_encrypt,nip44_decrypt," + + "nip44_encrypt,nip44_decrypt," + [CLIENT_AUTH, AUTH_JOIN, MESSAGE, THREAD, COMMENT, GROUPS, WRAP, REACTION] .map(k => `sign_event:${k}`) .join(",") diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 6338a337..986a70bd 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -18,16 +18,17 @@ const onsubmit = preventDefault(async () => { const json = JSON.stringify($state.snapshot(settings)) - const content = await $signer!.nip04.encrypt($pubkey!, json) + const content = await $signer!.nip44.encrypt($pubkey!, json) + const relays = Router.get().FromUser().getUrls() publishThunk({ event: createEvent(SETTINGS, {content}), - relays: Router.get().FromUser().getUrls(), + relays, }) publishThunk({ event: createEvent(MUTES, {tags: mutedPubkeys.map(tagPubkey)}), - relays: Router.get().FromUser().getUrls(), + relays, }) pushToast({message: "Your settings have been saved!"})