From fa7852113bddb3014a78ad6427523a41e40a8198 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Thu, 10 Oct 2024 17:49:42 -0700 Subject: [PATCH] Confirm when joining a public relay --- src/app/commands.ts | 6 ++-- src/app/components/MenuSpaces.svelte | 8 +++--- src/app/components/SpaceAdd.svelte | 14 +++++----- src/app/components/SpaceCheck.svelte | 18 ++++++++++-- src/app/components/SpaceInviteAccept.svelte | 28 +++++++++++++++---- src/lib/components/Confirm.svelte | 31 +++++++++++++++++++++ 6 files changed, 84 insertions(+), 21 deletions(-) create mode 100644 src/lib/components/Confirm.svelte diff --git a/src/app/commands.ts b/src/app/commands.ts index dc63d342..f2e267a5 100644 --- a/src/app/commands.ts +++ b/src/app/commands.ts @@ -214,20 +214,22 @@ export const checkRelayProfile = async (url: string) => { export const checkRelayConnection = async (url: string) => { const connection = ctx.net.pool.get(url) + const okStatuses = [ConnectionStatus.Ok, ConnectionStatus.Slow, ConnectionStatus.Unauthorized] await connection.ensureConnected() - if (![ConnectionStatus.Ok, ConnectionStatus.Slow].includes(connection.meta.getStatus())) { + if (!okStatuses.includes(connection.meta.getStatus())) { return `Failed to connect: "${connection.meta.getDescription()}"` } } export const checkRelayAuth = async (url: string) => { const connection = ctx.net.pool.get(url) + const okStatuses = [AuthStatus.Ok, AuthStatus.Pending] await connection.ensureAuth() - if (![AuthStatus.Ok, AuthStatus.Pending].includes(connection.meta.authStatus)) { + if (!okStatuses.includes(connection.meta.authStatus)) { return `Failed to authenticate: "${connection.meta.authStatus}"` } } diff --git a/src/app/components/MenuSpaces.svelte b/src/app/components/MenuSpaces.svelte index 96701707..2c079c05 100644 --- a/src/app/components/MenuSpaces.svelte +++ b/src/app/components/MenuSpaces.svelte @@ -9,7 +9,7 @@ import SpaceAvatar from "@app/components/SpaceAvatar.svelte" import RelayName from "@app/components/RelayName.svelte" import RelayDescription from "@app/components/RelayDescription.svelte" - import SpaceCreateExternal from "@app/components/SpaceCreateExternal.svelte" + import SpaceAdd from "@app/components/SpaceAdd.svelte" import SpaceExit from "@app/components/SpaceExit.svelte" import SpaceJoin from "@app/components/SpaceJoin.svelte" import RoomCreate from "@app/components/RoomCreate.svelte" @@ -43,7 +43,7 @@ showSettings = false } - const createSpace = () => pushModal(SpaceCreateExternal) + const addSpace = () => pushModal(SpaceAdd) const browseSpaces = () => goto("/discover") @@ -125,10 +125,10 @@ {#if getMembershipUrls($userMembership).length > 0} {/if} - diff --git a/src/app/components/SpaceAdd.svelte b/src/app/components/SpaceAdd.svelte index 08078ce4..558981c9 100644 --- a/src/app/components/SpaceAdd.svelte +++ b/src/app/components/SpaceAdd.svelte @@ -19,13 +19,6 @@ Spaces are places where communities come together to work, play, and hang out. - + diff --git a/src/app/components/SpaceCheck.svelte b/src/app/components/SpaceCheck.svelte index 08692f9d..3eab9777 100644 --- a/src/app/components/SpaceCheck.svelte +++ b/src/app/components/SpaceCheck.svelte @@ -1,21 +1,35 @@ + +
+ +
{title}
+
{subtitle}
+
+

{message}

+ + + + +