Skip relays onboarding stage when forcing relays

This commit is contained in:
Jonathan Staab 2023-03-22 08:51:16 -05:00
parent 47565265ba
commit d7d05c2802
3 changed files with 18 additions and 10 deletions

View File

@ -22,6 +22,7 @@
# Custom views
- [ ] Badges link to https://badges.page/p/97c70a44366a6535c145b333f973ea86dfdc2d7a99da618c40c64705ad98e322
- [ ] Link/embed good chat/DM micro-apps
- [ ] Add QR code that pre-fills follows and relays for a new user
- If logged in, open a detail page that shows the relays and people

View File

@ -15,6 +15,7 @@
import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
import {getPersonWithFallback} from "src/agent/tables"
import network from "src/agent/network"
import pool from "src/agent/pool"
import user from "src/agent/user"
import keys from "src/agent/keys"
import {loadAppData} from "src/app"
@ -24,15 +25,19 @@
const {relays: userRelays, petnamePubkeys} = user
let relays =
$userRelays.length > 0
? $userRelays
: [
{url: "wss://nostr-pub.wellorder.net", write: true},
{url: "wss://nostr.zebedee.cloud", write: true},
{url: "wss://nos.lol", write: true},
{url: "wss://brb.io", write: true},
]
let relays = []
if ($userRelays.length > 0) {
relays = $userRelays
} else if (pool.forceRelays.length > 0) {
relays = pool.forceRelays
} else {
relays = [
{url: "wss://nostr-pub.wellorder.net", write: true},
{url: "wss://nostr.zebedee.cloud", write: true},
{url: "wss://nos.lol", write: true},
{url: "wss://brb.io", write: true},
]
}
let follows =
$petnamePubkeys.length > 0

View File

@ -5,11 +5,13 @@
import Anchor from "src/partials/Anchor.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import pool from "src/agent/pool"
import {modal, toast} from "src/app/ui"
export let privkey
const nsec = nip19.nsecEncode(privkey)
const nextStage = pool.forceRelays.length > 0 ? "follows" : "relays"
const copyKey = () => {
copyToClipboard(nsec)
@ -28,7 +30,7 @@
<i slot="before" class="fa fa-lock" />
<button slot="after" class="fa fa-copy cursor-pointer" on:click={copyKey} />
</Input>
<Anchor type="button-accent" on:click={() => modal.set({type: "onboarding", stage: "relays"})}>
<Anchor type="button-accent" on:click={() => modal.set({type: "onboarding", stage: nextStage})}>
Log in
</Anchor>
</div>