From 2fae3ca248a4393c5c139a664922b9171bafb1ee Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 16 Jun 2025 16:56:59 -0700
Subject: [PATCH] Fix broadcasting user profiles when protected

---
 src/app/commands.ts                        |  5 +++++
 src/app/components/ProfileEdit.svelte      | 15 +++++++--------
 src/app/components/SpaceJoin.svelte        |  3 ++-
 src/app/components/SpaceJoinConfirm.svelte | 17 +++++++++++++++--
 src/routes/+layout.svelte                  |  2 ++
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/app/commands.ts b/src/app/commands.ts
index ed56bf5..f69e741 100644
--- a/src/app/commands.ts
+++ b/src/app/commands.ts
@@ -233,6 +233,11 @@ export const checkRelayAccess = async (url: string, claim = "") => {
     // Ignore messages about the relay ignoring ours
     if (error?.startsWith("mute: ")) return
 
+    // Ignore rejected empty claims
+    if (!claim && error?.includes("invite code")) {
+      return `failed to request access to relay`
+    }
+
     return message
   }
 }
diff --git a/src/app/components/ProfileEdit.svelte b/src/app/components/ProfileEdit.svelte
index b18c8c8..b3a2af3 100644
--- a/src/app/components/ProfileEdit.svelte
+++ b/src/app/components/ProfileEdit.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {nthEq} from "@welshman/lib"
+  import {nthNe} from "@welshman/lib"
   import type {Profile} from "@welshman/util"
   import {
     getTag,
@@ -10,7 +10,7 @@
     isPublishedProfile,
     uniqTags,
   } from "@welshman/util"
-  import {Router, addMaximalFallbacks} from "@welshman/router"
+  import {Router} from "@welshman/router"
   import {pubkey, profilesByPubkey, publishThunk} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
@@ -25,20 +25,19 @@
   const back = () => history.back()
 
   const onsubmit = ({profile, shouldBroadcast}: {profile: Profile; shouldBroadcast: boolean}) => {
+    const router = Router.get()
     const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)
-    const relays = [...getMembershipUrls($userMembership)]
+    const scenarios = [router.FromRelays(getMembershipUrls($userMembership))]
 
     if (shouldBroadcast) {
-      const router = Router.get()
-      const scenario = router.merge([router.FromUser(), router.Index()])
-
-      relays.push(...scenario.policy(addMaximalFallbacks).getUrls())
-      template.tags = template.tags.filter(nthEq(0, "-"))
+      scenarios.push(router.FromUser(), router.Index())
+      template.tags = template.tags.filter(nthNe(0, "-"))
     } else {
       template.tags = uniqTags([...template.tags, PROTECTED])
     }
 
     const event = makeEvent(template.kind, template)
+    const relays = router.merge(scenarios).getUrls()
 
     publishThunk({event, relays})
     pushToast({message: "Your profile has been updated!"})
diff --git a/src/app/components/SpaceJoin.svelte b/src/app/components/SpaceJoin.svelte
index 73fd9ef..539f54e 100644
--- a/src/app/components/SpaceJoin.svelte
+++ b/src/app/components/SpaceJoin.svelte
@@ -7,7 +7,7 @@
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {clearModals} from "@app/modal"
-  import {addSpaceMembership} from "@app/commands"
+  import {addSpaceMembership, broadcastUserData} from "@app/commands"
 
   const {url} = $props()
 
@@ -16,6 +16,7 @@
   const tryJoin = async () => {
     await addSpaceMembership(url)
 
+    broadcastUserData([url])
     clearModals()
   }
 
diff --git a/src/app/components/SpaceJoinConfirm.svelte b/src/app/components/SpaceJoinConfirm.svelte
index e5eb11c..32285dd 100644
--- a/src/app/components/SpaceJoinConfirm.svelte
+++ b/src/app/components/SpaceJoinConfirm.svelte
@@ -1,13 +1,26 @@
 <script module lang="ts">
   import {goto} from "$app/navigation"
+  import {ROOM_META} from "@welshman/util"
+  import {load} from "@welshman/net"
   import {makeSpacePath} from "@app/routes"
-  import {addSpaceMembership} from "@app/commands"
+  import {addSpaceMembership, broadcastUserData} from "@app/commands"
   import {pushToast} from "@app/toast"
 
   export const confirmSpaceJoin = async (url: string) => {
     await addSpaceMembership(url)
 
-    goto(makeSpacePath(url), {replaceState: true})
+    const path = makeSpacePath(url)
+
+    if (window.location.pathname === path) {
+      load({
+        relays: [url],
+        filters: [{kinds: [ROOM_META]}],
+      })
+    }
+
+    broadcastUserData([url])
+
+    goto(path, {replaceState: true})
 
     pushToast({
       message: "Welcome to the space!",
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index da6d228..1281d36 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -44,6 +44,7 @@
   } from "@welshman/app"
   import * as lib from "@welshman/lib"
   import * as util from "@welshman/util"
+  import * as router from "@welshman/router"
   import * as welshmanSigner from "@welshman/signer"
   import * as net from "@welshman/net"
   import * as app from "@welshman/app"
@@ -81,6 +82,7 @@
       nip19,
       ...lib,
       ...welshmanSigner,
+      ...router,
       ...util,
       ...net,
       ...app,