diff --git a/src/app/components/SignUp.svelte b/src/app/components/SignUp.svelte index 86037605..885e9403 100644 --- a/src/app/components/SignUp.svelte +++ b/src/app/components/SignUp.svelte @@ -2,7 +2,15 @@ import cx from "classnames" import type {ClientOptions} from "@pomade/core" import type {Profile} from "@welshman/util" - import {makeProfile, makeSecret, RELAYS, MESSAGING_RELAYS, makeEvent} from "@welshman/util" + import { + makeProfile, + makeSecret, + RELAYS, + PROFILE, + MESSAGING_RELAYS, + makeEvent, + createProfile, + } from "@welshman/util" import {loginWithNip01, publishThunk, waitForThunkCompletion} from "@welshman/app" import Key from "@assets/icons/key-minimalistic.svg?dataurl" import Letter from "@assets/icons/letter.svg?dataurl" @@ -16,7 +24,6 @@ import SignUpEmail from "@app/components/SignUpEmail.svelte" import SignUpProfile from "@app/components/SignUpProfile.svelte" import SignUpComplete from "@app/components/SignUpComplete.svelte" - import {initProfile} from "@app/profiles" import {attemptRelayAccess} from "@app/relays" import { POMADE_SIGNERS, @@ -54,13 +61,16 @@ const thunks = await Promise.all([ publishThunk({ event: makeEvent(RELAYS, {tags: DEFAULT_RELAYS.map(url => ["r", url])}), - relays: [...INDEXER_RELAYS, ...DEFAULT_RELAYS], + relays: [...INDEXER_RELAYS, ...DEFAULT_RELAYS, ...defaultSpaceUrls], }), publishThunk({ event: makeEvent(MESSAGING_RELAYS, {tags: DEFAULT_MESSAGING_RELAYS.map(url => ["r", url])}), - relays: DEFAULT_RELAYS, + relays: [...DEFAULT_RELAYS, ...defaultSpaceUrls], + }), + publishThunk({ + event: makeEvent(PROFILE, createProfile(getKey("signup.profile")!)), + relays: [...DEFAULT_RELAYS, ...defaultSpaceUrls], }), - initProfile(getKey("signup.profile")!), setSpaces(defaultSpaceUrls), ]) diff --git a/src/app/profiles.ts b/src/app/profiles.ts index 0066fe08..947027d0 100644 --- a/src/app/profiles.ts +++ b/src/app/profiles.ts @@ -14,7 +14,6 @@ import type {Profile} from "@welshman/util" import {nthNe} from "@welshman/lib" import {publishThunk, pubkey, repository} from "@welshman/app" import {Router} from "@welshman/router" -import {DEFAULT_RELAYS} from "@app/env" import {userSpaceUrls} from "@app/groups" export const broadcastUserData = async (relays: string[]) => { @@ -29,12 +28,6 @@ export const broadcastUserData = async (relays: string[]) => { } } -export const initProfile = (profile: Profile) => { - const event = makeEvent(PROFILE, createProfile(profile)) - - return publishThunk({event, relays: DEFAULT_RELAYS}) -} - export const updateProfile = ({profile}: {profile: Profile}) => { const router = Router.get() const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)