forked from coracle/flotilla
Detect nip29 properly before choosing smart path, more robust auth error checking
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
<script lang="ts">
|
||||
import {onMount} from "svelte"
|
||||
import {goto} from "$app/navigation"
|
||||
import {makeSpacePath} from "@app/util/routes"
|
||||
import {goToSpace} from "@app/util/routes"
|
||||
import {PLATFORM_RELAYS} from "@app/core/state"
|
||||
|
||||
onMount(() => {
|
||||
onMount(async () => {
|
||||
if (PLATFORM_RELAYS.length > 0) {
|
||||
goto(makeSpacePath(PLATFORM_RELAYS[0]))
|
||||
goToSpace(PLATFORM_RELAYS[0])
|
||||
} else {
|
||||
goto("/home")
|
||||
}
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
import SpaceAdd from "@app/components/SpaceAdd.svelte"
|
||||
import ChatEnable from "@app/components/ChatEnable.svelte"
|
||||
import {pushModal} from "@app/util/modal"
|
||||
import {makeSpacePath} from "@app/util/routes"
|
||||
import {goToSpace} from "@app/util/routes"
|
||||
import {PLATFORM_NAME, PLATFORM_RELAYS} from "@app/core/state"
|
||||
|
||||
const addSpace = () => pushModal(SpaceAdd)
|
||||
|
||||
const openChat = () => ($shouldUnwrap ? goto("/chat") : pushModal(ChatEnable, {next: "/chat"}))
|
||||
|
||||
onMount(() => {
|
||||
onMount(async () => {
|
||||
if (PLATFORM_RELAYS.length > 0) {
|
||||
goto(makeSpacePath(PLATFORM_RELAYS[0]))
|
||||
goToSpace(PLATFORM_RELAYS[0])
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
import {page} from "$app/stores"
|
||||
import {once} from "@welshman/lib"
|
||||
import Page from "@lib/components/Page.svelte"
|
||||
import Dialog from "@lib/components/Dialog.svelte"
|
||||
import SecondaryNav from "@lib/components/SecondaryNav.svelte"
|
||||
import MenuSpace from "@app/components/MenuSpace.svelte"
|
||||
import SpaceAuthError from "@app/components/SpaceAuthError.svelte"
|
||||
@@ -23,7 +22,11 @@
|
||||
|
||||
const authError = deriveRelayAuthError(url)
|
||||
|
||||
const showAuthError = once(() => pushModal(SpaceAuthError, {url, error: $authError}))
|
||||
const showAuthError = once(() =>
|
||||
pushModal(SpaceAuthError, {url, error: $authError}, {noEscape: true}),
|
||||
)
|
||||
|
||||
const showPendingTrust = once(() => pushModal(SpaceTrustRelay, {url}, {noEscape: true}))
|
||||
|
||||
// We have to watch this one, since on mobile the badge will be visible when active
|
||||
$effect(() => {
|
||||
@@ -36,6 +39,8 @@
|
||||
$effect(() => {
|
||||
if ($authError) {
|
||||
showAuthError()
|
||||
} else if ($relaysPendingTrust.includes(url)) {
|
||||
showPendingTrust()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
@@ -48,9 +53,3 @@
|
||||
{@render children?.()}
|
||||
{/key}
|
||||
</Page>
|
||||
|
||||
{#if $relaysPendingTrust.includes(url)}
|
||||
<Dialog>
|
||||
<SpaceTrustRelay {url} />
|
||||
</Dialog>
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user