matt/flotilla
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Keep the leave-space spinner up until the navigation home lands

Browse source
This commit is contained in:
Coracle-Bot 2026-09-15 19:06:13 +00:00
parent 980003e836
commit 97ccfc4d5c
3 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/app/access.ts
View file

@ -22,7 +22,7 @@ import {PLATFORM_URL} from "@app/env"
import {relaysMostlyRestricted} from "@app/policies"
import {Push} from "@app/push"
import {deriveSocket} from "@app/relays"
import {notificationSettings, setSpaceNotifications} from "@app/settings"
import {notificationSettings, removeTrustedRelay, setSpaceNotifications} from "@app/settings"
import {syncApplicationData} from "@app/sync"
export const ROOM_CREATE_INVITE = 9009
@ -149,6 +149,12 @@ export const leaveRoom = async (url: string, h: string) => {
await roomLists.get().removeRoom(h, url).then(publish)
}
export const leaveSpace = async (url: string) => {
await roomLists.get().removeRelay(url).then(publish)
await publishLeaveRequest(url)
await removeTrustedRelay(url)
}
export const publishRoomInvite = async (url: string, h: string) => {
const code = randomId()
const event = makeEvent(ROOM_CREATE_INVITE, {

17
src/app/components/SpaceAuthError.svelte
View file

@ -1,7 +1,6 @@
<script lang="ts">
import {displayRelayUrl} from "@welshman/util"
import {parse, renderAsHtml} from "@welshman/content"
import {publish} from "@welshman/app"
import Button from "@lib/components/Button.svelte"
import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"
@ -15,10 +14,8 @@
import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
import ModalFooter from "@lib/components/ModalFooter.svelte"
import SpaceAccessRequest from "@app/components/SpaceAccessRequest.svelte"
import {publishLeaveRequest} from "@app/access"
import {roomLists} from "@app/core"
import {leaveSpace} from "@app/access"
import {clearModals, navigate, pushModal} from "@app/modal"
import {removeTrustedRelay} from "@app/settings"
type Props = {
url: string
@ -31,18 +28,15 @@
const requestAccess = () => pushModal(SpaceAccessRequest, {url, callback: clearModals})
const leaveSpace = async () => {
const leave = async () => {
loading = true
try {
await $roomLists.removeRelay(url).then(publish)
await publishLeaveRequest(url)
await removeTrustedRelay(url)
await leaveSpace(url)
await navigate("/home")
} finally {
loading = false
}
navigate("/home")
}
let loading = $state(false)
@ -69,8 +63,7 @@
Go Home
</Button>
<div class="flex gap-2">
<Button class="button button-error" onclick={leaveSpace} disabled={loading}
>Leave Space</Button>
<Button class="button button-error" onclick={leave} disabled={loading}>Leave Space</Button>
<Button type="submit" class="button button-primary" disabled={loading}>
Request Access
<Icon icon={AltArrowRight} />

12
src/app/components/SpaceExit.svelte
View file

@ -1,7 +1,6 @@
<script lang="ts">
import {navigate} from "@app/modal"
import {displayRelayUrl} from "@welshman/util"
import {publish} from "@welshman/app"
import {preventDefault} from "@lib/html"
import Spinner from "@lib/components/Spinner.svelte"
import Button from "@lib/components/Button.svelte"
@ -12,9 +11,7 @@
import ModalHeader from "@lib/components/ModalHeader.svelte"
import ModalTitle from "@lib/components/ModalTitle.svelte"
import ModalFooter from "@lib/components/ModalFooter.svelte"
import {publishLeaveRequest} from "@app/access"
import {roomLists} from "@app/core"
import {removeTrustedRelay} from "@app/settings"
import {leaveSpace} from "@app/access"
const {url} = $props()
@ -24,14 +21,11 @@
loading = true
try {
await $roomLists.removeRelay(url).then(publish)
await publishLeaveRequest(url)
await removeTrustedRelay(url)
await leaveSpace(url)
await navigate("/home")
} finally {
loading = false
}
navigate("/home")
}
let loading = $state(false)