- Forgot your password? .
diff --git a/src/app/components/RelayDescription.svelte b/src/app/components/RelayDescription.svelte index 7e67c7ac..82d4789a 100644 --- a/src/app/components/RelayDescription.svelte +++ b/src/app/components/RelayDescription.svelte @@ -1,11 +1,16 @@ {#if $relay?.description} -{$relay.description}
+{url}
-+
- Unable to reach the relay. Please check your connection and try again. +
+ Unable to reach the space. Please check your connection and try again.
{:else if isExplicitAuthError} -- Oops! It looks like you're not a member of this relay. +
+ Oops! It looks like you're not a member of this space.
{:else}This space has opted not to publish , which means that they have the ability to forge messages from other users.
diff --git a/src/app/env.ts b/src/app/env.ts index fa441c23..d0009779 100644 --- a/src/app/env.ts +++ b/src/app/env.ts @@ -51,7 +51,11 @@ export const POMADE_SIGNERS = fromCsv(import.meta.env.VITE_POMADE_SIGNERS) export const DEFAULT_BLOSSOM_SERVERS = fromCsv(import.meta.env.VITE_DEFAULT_BLOSSOM_SERVERS) -export const DEFAULT_SPACES = fromCsv(import.meta.env.VITE_DEFAULT_SPACES).map(normalizeRelayUrl) +export const DEFAULT_SPACES = fromCsv(import.meta.env.VITE_DEFAULT_SPACES).map(item => { + const [url, claim = ""] = item.split('|') + + return [normalizeRelayUrl(url), claim] +}) export const DEFAULT_PUBKEYS = import.meta.env.VITE_DEFAULT_PUBKEYS diff --git a/src/app/routes.ts b/src/app/routes.ts index 9938a119..1090fb98 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -83,22 +83,22 @@ export const makeSpacePath = (url: string, ...extra: (string | undefined)[]) => return path } -export const goToSpace = (url: string) => { +export const goToSpace = (url: string, hash = "") => { const prevPath = lastPageBySpaceUrl.get(encodeRelay(url)) if (prevPath && prevPath !== makeSpacePath(url)) { - return goto(prevPath, {replaceState: true}) + return goto(prevPath + hash, {replaceState: true}) } if (!hasNip29(getRelay(url))) { - return goto(makeSpaceChatPath(url), {replaceState: true}) + return goto(makeSpaceChatPath(url) + hash, {replaceState: true}) } if (window.matchMedia(`(min-width: ${theme.screens.md})`).matches) { - return goto(makeSpacePath(url, "about"), {replaceState: true}) + return goto(makeSpacePath(url, "about") + hash, {replaceState: true}) } - return goto(makeSpacePath(url), {replaceState: true}) + return goto(makeSpacePath(url) + hash, {replaceState: true}) } // Content types, events diff --git a/src/lib/components/card-button.css b/src/lib/components/card-button.css index 0751a229..914bf554 100644 --- a/src/lib/components/card-button.css +++ b/src/lib/components/card-button.css @@ -49,6 +49,10 @@ @apply border border-solid; } +[data-fl-theme="navy"] .card-button { + @apply border border-solid; +} + [data-fl-theme="clay"] .card-button { @apply border-2 border-solid shadow-sm; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 574a2184..90e8f865 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,14 +1,15 @@ diff --git a/src/routes/settings/profile/+page.svelte b/src/routes/settings/profile/+page.svelte index e68709ed..603c3c00 100644 --- a/src/routes/settings/profile/+page.svelte +++ b/src/routes/settings/profile/+page.svelte @@ -142,7 +142,7 @@ {/snippet} {#snippet info()}- Your public key is your nostr user identifier. It also allows other people to authenticate + Your public key is your user identifier. It also allows other people to authenticate your messages.
{/snippet} diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte index b1e26e21..e0a35964 100644 --- a/src/routes/spaces/[relay]/+layout.svelte +++ b/src/routes/spaces/[relay]/+layout.svelte @@ -13,7 +13,7 @@ import SpaceAuthError from "@app/components/SpaceAuthError.svelte" import SpaceTrustRelay from "@app/components/SpaceTrustRelay.svelte" import SpaceJoin from "@app/components/SpaceJoin.svelte" - import {pushModal} from "@app/modal" + import {modal, pushModal} from "@app/modal" import {makeSpacePath} from "@app/routes" import {decodeRelay, deriveRelayAuthError} from "@app/relays" import {userGroupList, userSpaceUrls} from "@app/groups" @@ -35,34 +35,19 @@ const showPendingTrust = once(() => pushModal(SpaceTrustRelay, {url}, {noEscape: true})) - // Watch for relay errors and notify the user - $effect(() => { - if ($authError) { - showAuthError() - } else if ($relaysPendingTrust.includes(url)) { - showPendingTrust() - } - }) - - // Direct links skip Discover — prompt to join when relay is not in the user's space list. - const shouldPromptJoin = $derived.by(() => { + // Watch for relay errors and notify the user + // Direct links skip Discover — prompt to join when relay is not in the user's space list. + $effect(() => { void $userGroupList - return ( - Boolean($pubkey) && - !$userSpaceUrls.includes(url) && - !$authError && - !$relaysPendingTrust.includes(url) - ) - }) + if ($modal) return + if ($authError) return showAuthError() + if ($relaysPendingTrust.includes(url)) return showPendingTrust() - $effect(() => { - if (!shouldPromptJoin || joinPrompted.has(url)) { - return + if (!$userSpaceUrls.includes(url)) { + joinPrompted.add(url) + pushModal(SpaceJoin, {url}) } - - joinPrompted.add(url) - pushModal(SpaceJoin, {url}) })