From fe72798592dccce325c15931d86a57c681386d46 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 27 Oct 2025 14:13:17 -0700
Subject: [PATCH] Send leave request

---
 src/app/components/MenuSpace.svelte |  3 ++-
 src/app/components/SpaceExit.svelte |  3 ++-
 src/app/core/commands.ts            | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/components/MenuSpace.svelte b/src/app/components/MenuSpace.svelte
index 69156390..a50acd75 100644
--- a/src/app/components/MenuSpace.svelte
+++ b/src/app/components/MenuSpace.svelte
@@ -43,6 +43,7 @@
     deriveEventsForUrl,
     deriveUserRooms,
     deriveOtherRooms,
+    userSpaceUrls,
     hasNip29,
     alerts,
     deriveUserCanCreateRoom,
@@ -157,7 +158,7 @@
               </li>
             {/if}
             <li>
-              {#if $userRooms.includes(url)}
+              {#if $userSpaceUrls.includes(url)}
                 <Button onclick={leaveSpace} class="text-error">
                   <Icon icon={Exit} />
                   Leave Space
diff --git a/src/app/components/SpaceExit.svelte b/src/app/components/SpaceExit.svelte
index 3e4f67e2..4b1ed9e1 100644
--- a/src/app/components/SpaceExit.svelte
+++ b/src/app/components/SpaceExit.svelte
@@ -8,7 +8,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {removeSpaceMembership, removeTrustedRelay} from "@app/core/commands"
+  import {removeSpaceMembership, publishLeaveRequest, removeTrustedRelay} from "@app/core/commands"
 
   const {url} = $props()
 
@@ -19,6 +19,7 @@
 
     try {
       await removeSpaceMembership(url)
+      await publishLeaveRequest({url})
       await removeTrustedRelay(url)
     } finally {
       loading = false
diff --git a/src/app/core/commands.ts b/src/app/core/commands.ts
index 82e907a4..6ad71aa9 100644
--- a/src/app/core/commands.ts
+++ b/src/app/core/commands.ts
@@ -36,6 +36,7 @@ import {
   FOLLOWS,
   REACTION,
   RELAY_JOIN,
+  RELAY_LEAVE,
   ROOMS,
   COMMENT,
   ALERT_EMAIL,
@@ -627,6 +628,15 @@ export const makeJoinRequest = (params: JoinRequestParams) =>
 export const publishJoinRequest = (params: JoinRequestParams) =>
   publishThunk({event: makeJoinRequest(params), relays: [params.url]})
 
+// Leave request
+
+export type LeaveRequestParams = {
+  url: string
+}
+
+export const publishLeaveRequest = (params: LeaveRequestParams) =>
+  publishThunk({event: makeEvent(RELAY_LEAVE), relays: [params.url]})
+
 // Lightning
 
 export const getWebLn = () => (window as any).webln