Stop tracking .next artifacts

Keep follow sync trickling
Align sync as per the review
2026-04-08 16:42:54 +00:00 · 2026-04-08 16:42:54 +00:00 · 2026-04-08 16:42:54 +00:00 · 2026-04-08 16:42:54 +00:00 · 2026-04-08 16:42:54 +00:00 · 2026-04-08 16:42:54 +00:00
31 changed files with 422 additions and 3947 deletions
@@ -70,7 +70,6 @@ GoogleService-Info.plist
 .roo
 .idea/
 .vscode/
-.claude/

 # OS generated
 .DS_Store
@@ -44,7 +44,4 @@
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature android:name="android.hardware.camera.any" android:required="false" />
 </manifest>
@@ -24,10 +24,8 @@
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>Flotilla uses the camera when you enable it in a voice room.</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>Flotilla uses the microphone when you enable it in a voice room.</string>
+	<string>Flotilla uses the microphone for voice chat in rooms.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>
@@ -59,7 +59,7 @@
    "@getalby/lightning-tools": "^6.1.0",
    "@getalby/sdk": "^5.1.2",
    "@noble/curves": "^1.9.7",
-    "@pomade/core": "^0.2.3",
+    "@pomade/core": "^0.2.2",
    "@poppanator/sveltekit-svg": "^4.2.1",
    "@sveltejs/adapter-static": "^3.0.10",
    "@tiptap/core": "^2.27.2",
@@ -101,9 +101,9 @@
    "onlyBuiltDependencies": [
      "sharp",
      "nostr-signer-capacitor-plugin"
-    ]
-  },
-  "overrides": {
-    "sharp": "0.35.0-rc.0"
+    ],
+    "overrides": {
+      "sharp": "0.35.0-rc.0"
+    }
  }
 }
@@ -60,8 +60,8 @@ importers:
        specifier: ^1.9.7
        version: 1.9.7
      '@pomade/core':
-        specifier: ^0.2.3
-        version: 0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
+        specifier: ^0.2.2
+        version: 0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
      '@poppanator/sveltekit-svg':
        specifier: ^4.2.1
        version: 4.2.1(rollup@2.80.0)(svelte@5.48.0)(svgo@3.3.2)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0))
@@ -85,7 +85,7 @@ importers:
        version: 0.6.8(@sveltejs/kit@2.50.1(@sveltejs/vite-plugin-svelte@4.0.4(svelte@5.48.0)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0)))(svelte@5.48.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0)))(@vite-pwa/assets-generator@0.2.6)(vite-plugin-pwa@0.21.2(@vite-pwa/assets-generator@0.2.6)(vite@5.4.21(@types/node@25.0.10)(lightningcss@1.32.0)(terser@5.46.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
      '@welshman/app':
        specifier: ^0.8.12
-        version: 0.8.12(2f5bd20a84c8c39e26176b5a5db083ae)
+        version: 0.8.12(3074ef6691f94dc03952d8dbc98013a7)
      '@welshman/content':
        specifier: ^0.8.12
        version: 0.8.12(nostr-tools@2.20.0(typescript@5.9.3))
@@ -1427,9 +1427,9 @@ packages:
  '@polka/url@1.0.0-next.29':
    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}

-  '@pomade/core@0.2.3':
-    resolution: {integrity: sha512-36+abWfMH1Mif9FjBO7xICCkGZE4IqQpy7Csxlauyt0bhYQ9GsB07LqK5Qm3GgEHNwF9rFXdSZawkM+E6BeIfg==}
-    version: 0.2.3
+  '@pomade/core@0.2.2':
+    resolution: {integrity: sha512-FoilLsO0gVjiKMW3LV63pmXU7x3gh8YVGVulyR6QJr4h47XrsBg8vPkZtKWr4+sH3sW31e2tNIPUb3ptiuhrMA==}
+    version: 0.2.2
    engines: {node: '>=12.0.0'}
    peerDependencies:
      '@frostr/bifrost': ^1.0.7
@@ -6610,7 +6610,7 @@ snapshots:

  '@polka/url@1.0.0-next.29': {}

-  '@pomade/core@0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))':
+  '@pomade/core@0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))':
    dependencies:
      '@frostr/bifrost': 1.0.7(typescript@5.9.3)
      '@noble/hashes': 2.0.1
@@ -7276,9 +7276,9 @@ snapshots:
    optionalDependencies:
      '@vite-pwa/assets-generator': 0.2.6

-  '@welshman/app@0.8.12(2f5bd20a84c8c39e26176b5a5db083ae)':
+  '@welshman/app@0.8.12(3074ef6691f94dc03952d8dbc98013a7)':
    dependencies:
-      '@pomade/core': 0.2.3(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
+      '@pomade/core': 0.2.2(@frostr/bifrost@1.0.7(typescript@5.9.3))(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/signer@0.8.12(@noble/curves@1.9.7)(@noble/hashes@2.0.1)(@welshman/lib@0.8.12)(@welshman/net@0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-signer-capacitor-plugin@https://codeload.github.com/coracle-social/nostr-signer-capacitor-plugin/tar.gz/be4bb90a1a15c8eec0934f2f66ce9e82ecc72d51(@capacitor/core@8.0.1))(nostr-tools@2.20.0(typescript@5.9.3)))(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(nostr-tools@2.20.0(typescript@5.9.3))
      '@welshman/feeds': 0.8.12(d5b74f0c83250e052e0b96f7ff5804e8)
      '@welshman/lib': 0.8.12
      '@welshman/net': 0.8.12(@welshman/lib@0.8.12)(@welshman/util@0.8.12(@noble/curves@1.9.7)(@welshman/lib@0.8.12)(nostr-tools@2.20.0(typescript@5.9.3)))(ws@8.18.3)
@@ -1,4 +1,4 @@
-@import "tailwindcss";
+@import 'tailwindcss';

@config "../tailwind.config.js";

@@ -22,16 +22,6 @@
  @apply pl-sai pr-sai;
 }

-/* root */
-
-:root {
-  font-family: Lato;
-  --sait: var(--safe-area-inset-top, env(safe-area-inset-top));
-  --saib: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
-  --sail: var(--safe-area-inset-left, env(safe-area-inset-left));
-  --sair: var(--safe-area-inset-right, env(safe-area-inset-right));
-}
-
@utility py-sai {
  @apply pt-sai pb-sai;
 }
@@ -141,7 +131,7 @@
 }

@utility content-padding-y {
-  @apply pt-4 pb-4 sm:pt-8 sm:pb-8 md:pt-12 md:pb-12;
+  @apply pt-4 sm:pt-8 md:pt-12 pb-4 sm:pb-8 md:pb-12;
 }

@utility content-sizing {
@@ -149,7 +139,7 @@
 }

@utility content {
-  @apply m-auto w-full max-w-3xl px-4 pt-4 pb-4 sm:px-8 sm:pt-8 sm:pb-8 md:px-12 md:pt-12 md:pb-12;
+  @apply m-auto w-full max-w-3xl px-4 sm:px-8 md:px-12 pt-4 sm:pt-8 md:pt-12 pb-4 sm:pb-8 md:pb-12;
 }

@utility heading {
@@ -425,7 +415,7 @@ body.keyboard-open .hide-on-keyboard {
 /* chat view */

 .chat__compose {
-  @apply z-compose relative mb-14 shrink-0 md:mb-0;
+  @apply z-compose relative mb-14 grow md:mb-0;
 }

 .chat__compose .chat__compose-inner {
@@ -1,57 +0,0 @@
-import {Room as LiveKitRoom} from "livekit-client"
-import {derived, writable} from "svelte/store"
-import {type Room} from "@app/core/state"
-
-export type VoiceSession = {
-  url: string
-  h: string
-  room: LiveKitRoom
-  muted: boolean
-  cameraOn: boolean
-  screenShareOn: boolean
-}
-
-export type Pubkey = string
-
-export type VoiceParticipant = {pubkey?: Pubkey; identity: string}
-
-export enum VoiceState {
-  Joining = "joining",
-  Connected = "connected",
-  Disconnected = "disconnected",
-}
-
-export const currentVoiceSession = writable<VoiceSession | undefined>(undefined)
-
-export const voiceState = writable<VoiceState>(VoiceState.Disconnected)
-
-export const currentVoiceRoom = writable<Room | undefined>(undefined)
-
-export const participantPubkeyMap = writable<Map<string, Pubkey>>(new Map())
-
-export const pubkeyFromLiveKitIdentity = (identity: string): string | undefined =>
-  /^[a-f0-9]{64}$/.test(identity.slice(0, 64)) ? identity.slice(0, 64) : undefined
-
-export const participantFromLiveKitIdentity = (identity: string): VoiceParticipant => {
-  const pk = pubkeyFromLiveKitIdentity(identity)
-  return pk ? {pubkey: pk, identity} : {identity}
-}
-
-export const participantKey = (p: VoiceParticipant) => p.pubkey ?? p.identity
-
-export const speakingParticipants = writable<VoiceParticipant[]>([])
-
-export const isParticipantSpeaking = derived(
-  speakingParticipants,
-  $participants => (p: VoiceParticipant) =>
-    $participants.some(sp => participantKey(sp) === participantKey(p)),
-)
-
-export const isLocalSpeaking = derived(
-  [currentVoiceSession, speakingParticipants],
-  ([$session, $speaking]) => {
-    if (!$session?.room) return false
-    const local = participantFromLiveKitIdentity($session.room.localParticipant.identity)
-    return $speaking.some(sp => participantKey(sp) === participantKey(local))
-  },
-)
@@ -1,99 +0,0 @@
-import {Track} from "livekit-client"
-import {MediaQuery} from "svelte/reactivity"
-import {derived, get, writable} from "svelte/store"
-import {currentVoiceSession, VoiceState, type VoiceSession, voiceState} from "@app/call/stores"
-import {pushToast} from "@app/util/toast"
-
-export enum VideoCallLayout {
-  Chat = "chat",
-  Video = "video",
-  Split = "split",
-}
-
-export const isDesktopLayout = new MediaQuery("min-width: 768px", false)
-
-export enum ViewportSize {
-  Desktop = "desktop",
-  Mobile = "mobile",
-}
-
-export const videoCallViewportSync = {
-  previousLayout: undefined as ViewportSize | undefined,
-}
-
-export const videoCallLayout = writable<VideoCallLayout>(VideoCallLayout.Split)
-
-export const resetVideoCallLayout = () => {
-  videoCallViewportSync.previousLayout = undefined
-  videoCallLayout.set(VideoCallLayout.Chat)
-}
-
-export const videoPrimaryTileKey = writable<string | undefined>(undefined)
-
-export const toggleVideoPrimaryTile = (key: string) => {
-  videoPrimaryTileKey.update(k => (k === key ? undefined : key))
-}
-
-const VISUAL_SOURCES = [Track.Source.Camera, Track.Source.ScreenShare] as const
-
-const countLiveVisualFeeds = (session: VoiceSession): number => {
-  const room = session.room
-  let n = 0
-  const lp = room.localParticipant
-  if (session.cameraOn) {
-    const pub = lp.getTrackPublication(Track.Source.Camera)
-    if (pub?.track) n += 1
-  }
-  if (session.screenShareOn) {
-    const pub = lp.getTrackPublication(Track.Source.ScreenShare)
-    if (pub?.track) n += 1
-  }
-  for (const rp of room.remoteParticipants.values()) {
-    for (const source of VISUAL_SOURCES) {
-      const pub = rp.getTrackPublication(source)
-      if (pub?.isSubscribed && pub.track) n += 1
-    }
-  }
-  return n
-}
-
-export const triggerVideoFeedCount = () => {
-  currentVoiceSession.update(s => (s ? {...s} : s))
-}
-
-export const videoTileCount = derived([currentVoiceSession, voiceState], ([$session, $state]) => {
-  if ($state !== VoiceState.Connected || !$session) return 0
-  return countLiveVisualFeeds($session)
-})
-
-export const toggleCamera = async () => {
-  const session = get(currentVoiceSession)
-  if (!session) return
-
-  const cameraOn = !session.cameraOn
-  try {
-    await session.room.localParticipant.setCameraEnabled(cameraOn)
-    currentVoiceSession.set({...session, cameraOn})
-  } catch {
-    pushToast({
-      theme: "error",
-      message: cameraOn ? "Could not access camera" : "Could not turn off camera",
-    })
-  }
-}
-
-export const toggleScreenShare = async () => {
-  const session = get(currentVoiceSession)
-  if (!session) return
-
-  const screenShareOn = !session.screenShareOn
-  try {
-    await session.room.localParticipant.setScreenShareEnabled(screenShareOn)
-    currentVoiceSession.set({...session, screenShareOn})
-  } catch {
-    pushToast({
-      theme: "error",
-      message: screenShareOn ? "Could not start screen sharing" : "Could not stop screen sharing",
-    })
-  }
-}
@@ -62,7 +62,8 @@
 {@render children?.()}

 <!-- a little extra something for ios -->
-<div class="hide-on-keyboard fixed bottom-0 left-0 right-0 z-nav h-(--saib) bg-base-100 md:hidden">
+<div
+  class="hide-on-keyboard fixed bottom-0 left-0 right-0 z-nav h-(--saib) bg-base-100 md:hidden">
 </div>
 <div
  class="hide-on-keyboard border-top bottom-sai fixed left-0 right-0 z-nav h-14 border border-base-200 bg-base-100 md:hidden">
@@ -8,22 +8,16 @@
  import {getRoomItemPath} from "@app/util/routes"

  const props: ComponentProps<typeof NoteContent> = $props()
-  const MESSAGE_MIN_LENGTH = 5000
-  const MESSAGE_MAX_LENGTH = 5500

  const path = getRoomItemPath(props.url!, props.event)
-  const minLength =
-    props.minLength ?? (props.event.kind === MESSAGE ? MESSAGE_MIN_LENGTH : undefined)
-  const maxLength =
-    props.maxLength ?? (props.event.kind === MESSAGE ? MESSAGE_MAX_LENGTH : undefined)
 </script>

 <div class={cx("text-sm", {"card2 card2-sm bg-alt": props.event.kind !== MESSAGE})}>
  {#if path && !isMobile}
    <Link href={path}>
-      <NoteContent {...props} {minLength} {maxLength} />
+      <NoteContent {...props} />
    </Link>
  {:else}
-    <NoteContent {...props} {minLength} {maxLength} />
+    <NoteContent {...props} />
  {/if}
 </div>
@@ -1,278 +0,0 @@
-<script lang="ts">
-  import cx from "classnames"
-  import {Track} from "livekit-client"
-  import {displayProfileByPubkey, loadProfile} from "@welshman/app"
-  import Pin from "@assets/icons/pin.svg?dataurl"
-  import Button from "@lib/components/Button.svelte"
-  import Icon from "@lib/components/Icon.svelte"
-  import ProfileCircle from "@app/components/ProfileCircle.svelte"
-  import VideoCallTile from "@app/components/VideoCallTile.svelte"
-  import VoiceWidget from "@app/components/VoiceWidget.svelte"
-  import {get} from "svelte/store"
-  import {
-    VideoCallLayout,
-    isDesktopLayout,
-    toggleVideoPrimaryTile,
-    videoCallLayout,
-    videoCallViewportSync,
-    ViewportSize,
-    videoPrimaryTileKey,
-  } from "@app/call/video"
-  import {currentVoiceSession, currentVoiceRoom, pubkeyFromLiveKitIdentity} from "@app/call/stores"
-
-  type Props = {
-    layout: VideoCallLayout
-    mobile?: boolean
-    url: string
-    h: string
-    class?: string
-  }
-
-  type VideoTileData = {
-    identity: string
-    isLocal: boolean
-    trackSid: string
-    track: Track | undefined
-    source: Track.Source.Camera | Track.Source.ScreenShare
-  }
-
-  type TileLayout = "spotlight" | "default" | "strip"
-
-  const {layout, mobile = false, url, h, class: className = ""}: Props = $props()
-
-  $effect(() => {
-    const currentLayout = isDesktopLayout.current ? ViewportSize.Desktop : ViewportSize.Mobile
-    const {previousLayout} = videoCallViewportSync
-    if (previousLayout === undefined) {
-      videoCallViewportSync.previousLayout = currentLayout
-      return
-    }
-    if (previousLayout === currentLayout) return
-    const p = get(videoCallLayout)
-    if (previousLayout === ViewportSize.Desktop && currentLayout === ViewportSize.Mobile) {
-      if (p === VideoCallLayout.Split) videoCallLayout.set(VideoCallLayout.Video)
-    } else if (previousLayout === ViewportSize.Mobile && currentLayout === ViewportSize.Desktop) {
-      if (p === VideoCallLayout.Chat) videoCallLayout.set(VideoCallLayout.Split)
-    }
-    videoCallViewportSync.previousLayout = currentLayout
-  })
-
-  const isViewingCurrentCallRoom = $derived(
-    $currentVoiceRoom?.url === url && $currentVoiceRoom?.h === h,
-  )
-
-  const showVideoContent = $derived(
-    isViewingCurrentCallRoom &&
-      (mobile
-        ? layout === VideoCallLayout.Video
-        : layout === VideoCallLayout.Split || layout === VideoCallLayout.Video),
-  )
-
-  const videoTiles = $derived.by(() => {
-    const session = $currentVoiceSession
-    if (!session || $currentVoiceRoom?.url !== url || $currentVoiceRoom?.h !== h) {
-      return []
-    }
-
-    const room = session.room
-    const videoTiles: VideoTileData[] = []
-    const user = room.localParticipant
-
-    if (session.cameraOn) {
-      const localPub = user.getTrackPublication(Track.Source.Camera)
-      videoTiles.push({
-        identity: user.identity,
-        isLocal: true,
-        trackSid: localPub?.trackSid ?? "local-camera",
-        track: localPub?.track,
-        source: Track.Source.Camera,
-      })
-    }
-
-    if (session.screenShareOn) {
-      const localPub = user.getTrackPublication(Track.Source.ScreenShare)
-      videoTiles.push({
-        identity: user.identity,
-        isLocal: true,
-        trackSid: localPub?.trackSid ?? "local-screen",
-        track: localPub?.track,
-        source: Track.Source.ScreenShare,
-      })
-    }
-
-    for (const rp of room.remoteParticipants.values()) {
-      const camPub = rp.getTrackPublication(Track.Source.Camera)
-      if (camPub?.isSubscribed && camPub.track) {
-        videoTiles.push({
-          identity: rp.identity,
-          isLocal: false,
-          trackSid: camPub.trackSid,
-          track: camPub.track,
-          source: Track.Source.Camera,
-        })
-      }
-      const screenPub = rp.getTrackPublication(Track.Source.ScreenShare)
-      if (screenPub?.isSubscribed && screenPub.track) {
-        videoTiles.push({
-          identity: rp.identity,
-          isLocal: false,
-          trackSid: screenPub.trackSid,
-          track: screenPub.track,
-          source: Track.Source.ScreenShare,
-        })
-      }
-    }
-
-    return videoTiles
-  })
-
-  /** Identity + source only — LiveKit can change trackSid after publish, which broke spotlight + stale-key effect. */
-  const tileKey = (t: VideoTileData) => `${t.identity}\x1f${t.source}`
-
-  const primaryTile = $derived.by(() => {
-    const k = $videoPrimaryTileKey
-    if (k === undefined) return undefined
-    return videoTiles.find(t => tileKey(t) === k)
-  })
-
-  const secondaryTiles = $derived.by(() => {
-    const p = primaryTile
-    if (p === undefined) return videoTiles
-    const pk = tileKey(p)
-    return videoTiles.filter(t => tileKey(t) !== pk)
-  })
-
-  const useSpotlightLayout = $derived(primaryTile !== undefined)
-  const useMultiGrid = $derived(!useSpotlightLayout && videoTiles.length > 2)
-
-  $effect(() => {
-    const k = $videoPrimaryTileKey
-    if (k === undefined) return
-    if (!videoTiles.some(t => tileKey(t) === k)) {
-      videoPrimaryTileKey.set(undefined)
-    }
-  })
-
-  $effect(() => {
-    for (const t of videoTiles) {
-      const pk = pubkeyFromLiveKitIdentity(t.identity)
-      if (pk) loadProfile(pk)
-    }
-  })
-
-  const labelFor = (identity: string, source: VideoTileData["source"]) => {
-    const pk = pubkeyFromLiveKitIdentity(identity)
-    const name = pk ? displayProfileByPubkey(pk) : "Unknown"
-    return source === Track.Source.ScreenShare ? `${name} · screen` : name
-  }
-
-  const showTileGrid = $derived(videoTiles.length > 0)
-
-  const spotlightHandlerFor = (key: string) => () => {
-    toggleVideoPrimaryTile(key)
-  }
-
-  const panelChrome = $derived(
-    cx(
-      mobile &&
-        "flex min-h-0 w-full flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden bg-base-200 px-2 pt-4 md:hidden pb-[calc(3.5rem+var(--saib))]",
-      !mobile &&
-        "flex min-h-0 w-full min-w-0 flex-1 flex-col gap-2 overflow-hidden bg-base-200 px-2 pb-2 pt-4",
-      className,
-    ),
-  )
-</script>
-
-{#snippet videoTile(tile: VideoTileData, layout: TileLayout)}
-  <div
-    class={cx(
-      "relative isolate overflow-hidden rounded-box shadow-sm",
-      layout === "spotlight" && "min-h-0 flex-1",
-      layout === "default" && "aspect-video w-full min-h-0",
-      layout === "strip" && "aspect-video w-44 shrink-0",
-      tile.source === Track.Source.ScreenShare ? "bg-black" : "bg-base-100",
-    )}>
-    {#if tile.track}
-      <VideoCallTile
-        track={tile.track}
-        muted={tile.isLocal}
-        fit={tile.source === Track.Source.ScreenShare ? "contain" : "cover"}
-        class="pointer-events-none absolute inset-0" />
-    {:else}
-      <div class="absolute inset-0 flex items-center justify-center">
-        <ProfileCircle pubkey={pubkeyFromLiveKitIdentity(tile.identity)} {url} size={14} />
-      </div>
-    {/if}
-    <span
-      class="pointer-events-none absolute bottom-1 left-1 max-w-[calc(100%-0.5rem)] truncate rounded bg-base-100/80 px-1.5 py-0.5 text-xs">
-      {labelFor(tile.identity, tile.source)}{tile.isLocal ? " (you)" : ""}
-    </span>
-    {#if videoTiles.length > 1}
-      {@const pinned = $videoPrimaryTileKey === tileKey(tile)}
-      <Button
-        data-tip={pinned ? "Exit spotlight" : "Spotlight"}
-        aria-pressed={pinned}
-        class={cx(
-          "absolute right-1 top-1 z-20 btn btn-xs btn-square btn-ghost",
-          pinned ? "btn-active bg-primary/25 text-primary" : "bg-base-100/70",
-        )}
-        onclick={spotlightHandlerFor(tileKey(tile))}>
-        <Icon icon={Pin} size={3} />
-      </Button>
-    {/if}
-  </div>
-{/snippet}
-
-{#snippet videoPanelBody()}
-  {#if showTileGrid}
-    {#if useSpotlightLayout && primaryTile}
-      <div class="flex min-h-0 flex-1 flex-col gap-2 overflow-hidden">
-        {@render videoTile(primaryTile, "spotlight")}
-        {#if secondaryTiles.length > 0}
-          <div
-            class="flex max-h-40 shrink-0 flex-row gap-2 overflow-x-auto overflow-y-hidden py-0.5">
-            {#each secondaryTiles as tile (tileKey(tile))}
-              {@render videoTile(tile, "strip")}
-            {/each}
-          </div>
-        {/if}
-      </div>
-    {:else if useMultiGrid}
-      <div
-        class="grid min-h-0 flex-1 grid-cols-1 content-start gap-2 overflow-y-auto sm:grid-cols-2">
-        {#each videoTiles as tile (tileKey(tile))}
-          {@render videoTile(tile, "default")}
-        {/each}
-      </div>
-    {:else}
-      <div class="flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto">
-        {#each videoTiles as tile (tileKey(tile))}
-          {@render videoTile(tile, "default")}
-        {/each}
-      </div>
-    {/if}
-  {:else}
-    <div
-      class="flex min-h-[12rem] flex-1 flex-col items-center justify-center gap-2 rounded-box bg-base-200/50 p-4 text-center text-sm opacity-80">
-      <p>No camera or screen share yet.</p>
-      <p class="text-xs">Use the camera or screen share control to share video.</p>
-    </div>
-  {/if}
-{/snippet}
-
-{#if showVideoContent}
-  <div class={panelChrome}>
-    {#if mobile}
-      <div class="flex min-h-0 flex-1 flex-col gap-2">
-        <div class="min-h-0 flex-1 overflow-hidden">
-          {@render videoPanelBody()}
-        </div>
-        <div class="shrink-0 pb-2">
-          <VoiceWidget />
-        </div>
-      </div>
-    {:else}
-      {@render videoPanelBody()}
-    {/if}
-  </div>
-{/if}
@@ -1,31 +0,0 @@
-<script lang="ts">
-  import type {Track} from "livekit-client"
-  import cx from "classnames"
-
-  type Props = {
-    track: Track
-    muted?: boolean
-    fit?: "cover" | "contain"
-    class?: string
-  }
-
-  const {track, muted = true, fit = "cover", class: className = ""}: Props = $props()
-
-  let videoElement = $state<HTMLVideoElement | undefined>()
-
-  $effect(() => {
-    const element = videoElement
-    const activeTrack = track
-    if (!element) return
-    activeTrack.attach(element)
-    return () => {
-      activeTrack.detach(element)
-    }
-  })
-</script>
-
-<video
-  bind:this={videoElement}
-  class={cx("h-full w-full", fit === "contain" ? "object-contain" : "object-cover", className)}
-  playsinline
-  {muted}></video>
@@ -7,8 +7,13 @@
  import ModalHeader from "@lib/components/ModalHeader.svelte"
  import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
  import ModalTitle from "@lib/components/ModalTitle.svelte"
-  import {currentVoiceSession, type VoiceSession} from "@app/call/stores"
-  import {DeviceKind, supportsAudioOutputSelection, switchVoiceActiveDevice} from "@app/call/voice"
+  import {
+    currentVoiceSession,
+    DeviceKind,
+    supportsAudioOutputSelection,
+    switchVoiceActiveDevice,
+    type VoiceSession,
+  } from "@app/voice"
  import {popModal} from "@app/util/modal"

  const selectValueForActiveDevice = (session: VoiceSession, kind: DeviceKind): string => {
@@ -21,10 +26,8 @@

  let audioInputs = $state<MediaDeviceInfo[]>([])
  let audioOutputs = $state<MediaDeviceInfo[]>([])
-  let videoInputs = $state<MediaDeviceInfo[]>([])
  let selectedInput = $state("")
  let selectedOutput = $state("")
-  let selectedVideo = $state("")

  const loadDevices = async () => {
    if (!navigator.mediaDevices?.enumerateDevices) return
@@ -32,11 +35,9 @@
      const devices = await navigator.mediaDevices.enumerateDevices()
      audioInputs = devices.filter(d => d.kind === "audioinput")
      audioOutputs = devices.filter(d => d.kind === "audiooutput")
-      videoInputs = devices.filter(d => d.kind === "videoinput")
    } catch {
      audioInputs = []
      audioOutputs = []
-      videoInputs = []
    }
  }

@@ -54,7 +55,6 @@
    }
    selectedInput = selectValueForActiveDevice(session, DeviceKind.AudioInput)
    selectedOutput = selectValueForActiveDevice(session, DeviceKind.AudioOutput)
-    selectedVideo = selectValueForActiveDevice(session, DeviceKind.VideoInput)
  })

  const onInputChange = () => {
@@ -65,10 +65,6 @@
    void switchVoiceActiveDevice(DeviceKind.AudioOutput, selectedOutput)
  }

-  const onVideoChange = () => {
-    void switchVoiceActiveDevice(DeviceKind.VideoInput, selectedVideo)
-  }
-
  const onDone = () => {
    popModal()
  }
@@ -80,8 +76,8 @@
 <Modal>
  <ModalBody>
    <ModalHeader>
-      <ModalTitle>Call settings</ModalTitle>
-      <ModalSubtitle>Microphone, speaker, and camera for this call.</ModalSubtitle>
+      <ModalTitle>Audio settings</ModalTitle>
+      <ModalSubtitle>Choose microphone and speaker for this call.</ModalSubtitle>
    </ModalHeader>
    <div class="flex flex-col gap-4 pt-2">
      <FieldInline>
@@ -124,25 +120,6 @@
          {/snippet}
        </FieldInline>
      {/if}
-      <FieldInline>
-        {#snippet label()}
-          <p>Camera</p>
-        {/snippet}
-        {#snippet input()}
-          <select
-            class="select select-bordered w-full"
-            bind:value={selectedVideo}
-            onchange={onVideoChange}
-            aria-label="Camera">
-            <option value="">Default camera</option>
-            {#each videoInputs as d (d.deviceId)}
-              <option value={d.deviceId}>
-                {d.label || `Camera ${d.deviceId.slice(0, 8)}…`}
-              </option>
-            {/each}
-          </select>
-        {/snippet}
-      </FieldInline>
    </div>
  </ModalBody>
  <ModalFooter>
@@ -12,13 +12,14 @@
  import {makeRoomId} from "@app/core/state"
  import {
    VoiceState,
+    deriveVoiceParticipants,
+    cancelJoinVoiceRoom,
    currentVoiceRoom,
+    voiceState,
    isParticipantSpeaking,
    participantKey,
-    voiceState,
    type VoiceParticipant,
-  } from "@app/call/stores"
-  import {cancelJoinVoiceRoom, deriveVoiceParticipants} from "@app/call/voice"
+  } from "@app/voice"

  interface Props {
    url: string
@@ -14,7 +14,7 @@
  import ModalTitle from "@lib/components/ModalTitle.svelte"
  import {AbortError, TimeoutError} from "$lib/util"
  import {displayRoom} from "@app/core/state"
-  import {joinVoiceRoom} from "@app/call/voice"
+  import {joinVoiceRoom} from "@app/voice"
  import {popModal} from "@app/util/modal"
  import {pushToast} from "@app/util/toast"

@@ -1,20 +1,15 @@
 <script lang="ts">
  import {readable} from "svelte/store"
-  import {fade, fly} from "svelte/transition"
+  import {fly} from "svelte/transition"
  import {goto} from "$app/navigation"
  import {page} from "$app/stores"
-  import cx from "classnames"
  import {displayRelayUrl} from "@welshman/util"
  import Microphone from "@assets/icons/microphone.svg?dataurl"
-  import Videocamera from "@assets/icons/videocamera.svg?dataurl"
-  import VideocameraRecord from "@assets/icons/videocamera-record.svg?dataurl"
-  import Monitor from "@assets/icons/monitor.svg?dataurl"
+  import MicrophoneOff from "@assets/icons/microphone-off.svg?dataurl"
  import PhoneRounded from "@assets/icons/phone-rounded.svg?dataurl"
  import PhoneCallingRounded from "@assets/icons/phone-calling-rounded.svg?dataurl"
-  import ChatRound from "@assets/icons/chat-round.svg?dataurl"
  import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
  import Settings from "@assets/icons/settings.svg?dataurl"
-  import {Capacitor} from "@capacitor/core"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
  import VoiceCallAudioSettingsDialog from "@app/components/VoiceCallAudioSettingsDialog.svelte"
@@ -28,23 +23,16 @@
    type Room,
  } from "@app/core/state"
  import {pushModal} from "@app/util/modal"
-  import {notifications} from "@app/util/notifications"
  import {makeRoomPath} from "@app/util/routes"
-  import {
-    VideoCallLayout,
-    isDesktopLayout,
-    toggleCamera,
-    toggleScreenShare,
-    videoCallLayout,
-  } from "@app/call/video"
  import {
    VoiceState,
    currentVoiceSession,
    currentVoiceRoom,
    voiceState,
-    isLocalSpeaking,
-  } from "@app/call/stores"
-  import {cancelJoinVoiceRoom, leaveVoiceRoom, toggleMute} from "@app/call/voice"
+    leaveVoiceRoom,
+    toggleMute,
+    cancelJoinVoiceRoom,
+  } from "@app/voice"

  const {relay, h} = $derived($page.params)
  const url = $derived(relay ? decodeRelay(relay) : undefined)
@@ -53,14 +41,6 @@
  )
  const routeDisplayedRoom = $derived($displayedRoomStore)

-  const isViewingCurrentVoiceRoom = $derived(
-    $currentVoiceRoom !== undefined &&
-      url !== undefined &&
-      typeof h === "string" &&
-      $currentVoiceRoom.url === url &&
-      $currentVoiceRoom.h === h,
-  )
-
  const targetRoom = $derived.by((): Room | undefined => {
    if ($voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected) {
      return $currentVoiceRoom
@@ -86,45 +66,9 @@
    pushModal(VoiceRoomJoinDialog, {url: targetRoom.url, h: targetRoom.h})
  }

-  const goToRoom = () => {
-    if (!targetRoom) return
-    const path = makeRoomPath(targetRoom.url, targetRoom.h)
-    if ($page.url.pathname !== path) {
-      void goto(path)
-    }
-  }
-
-  const openCallSettings = () => {
+  const openAudioSettings = () => {
    pushModal(VoiceCallAudioSettingsDialog)
  }
-
-  const showChatButton = $derived($voiceState === VoiceState.Connected && isViewingCurrentVoiceRoom)
-
-  const isChatPanelActive = $derived(
-    showChatButton &&
-      (isDesktopLayout.current
-        ? $videoCallLayout === VideoCallLayout.Split
-        : $videoCallLayout === VideoCallLayout.Chat),
-  )
-
-  const onChatToggle = () => {
-    if (!showChatButton) return
-    if (isDesktopLayout.current) {
-      videoCallLayout.update(p =>
-        p === VideoCallLayout.Split ? VideoCallLayout.Video : VideoCallLayout.Split,
-      )
-    } else {
-      videoCallLayout.update(p =>
-        p === VideoCallLayout.Video ? VideoCallLayout.Chat : VideoCallLayout.Video,
-      )
-    }
-  }
-
-  const chatUnread = $derived(
-    targetRoom !== undefined && $notifications.has(makeRoomPath(targetRoom.url, targetRoom.h)),
-  )
-
-  const mediaToggleClass = "center tooltip tooltip-top btn btn-sm btn-square btn-ghost"
 </script>

 {#if targetRoom}
@@ -132,47 +76,19 @@
    in:fly={{y: 60, duration: 350}}
    out:fly={{y: 60, duration: 250}}
    class="flex flex-col gap-2 rounded-box bg-base-100 p-3">
-    <div class="flex items-start justify-between gap-2">
-      <button
-        type="button"
-        class="min-w-0 flex-1 rounded-lg px-1 py-0.5 text-left outline-none hover:bg-base-200/60 focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-base-100"
-        onclick={goToRoom}
-        aria-label="Open room {roomName}">
-        <div class="flex flex-col gap-0.5">
-          {#if $voiceState === VoiceState.Joining}
-            <span class="text-sm font-semibold text-warning">Joining...</span>
-          {:else if $voiceState === VoiceState.Connected}
-            <span class="text-sm font-semibold text-success">Voice Connected</span>
-          {:else}
-            <span class="text-sm font-semibold text-neutral-content">Disconnected</span>
-          {/if}
-          <span class="ellipsize text-xs opacity-70">
-            {roomName} / {spaceName}
-          </span>
-        </div>
-      </button>
-      {#if showChatButton}
-        <Button
-          data-tip="Toggle Chat"
-          class={cx(
-            mediaToggleClass,
-            "relative shrink-0 overflow-visible",
-            isChatPanelActive && "text-primary",
-          )}
-          onclick={onChatToggle}>
-          <span class="relative inline-flex">
-            <Icon icon={ChatRound} size={4} />
-            {#if chatUnread}
-              <span
-                transition:fade={{duration: 150}}
-                class="absolute -right-0.5 -top-0.5 h-2 w-2 rounded-full bg-primary ring-2 ring-base-100"
-                aria-hidden="true"></span>
-            {/if}
-          </span>
-        </Button>
+    <div class="flex flex-col gap-0.5">
+      {#if $voiceState === VoiceState.Joining}
+        <span class="text-sm font-semibold text-warning">Joining...</span>
+      {:else if $voiceState === VoiceState.Connected}
+        <span class="text-sm font-semibold text-success">Voice Connected</span>
+      {:else}
+        <span class="text-sm font-semibold text-neutral-content">Disconnected</span>
      {/if}
+      <span class="ellipsize text-xs opacity-70">
+        {roomName} / {spaceName}
+      </span>
    </div>
-    <div class="flex flex-wrap items-center gap-2">
+    <div class="flex items-center gap-1">
      {#if $voiceState === VoiceState.Joining}
        <span class="loading loading-spinner loading-sm"></span>
        <Button
@@ -184,45 +100,16 @@
      {:else if $voiceState === VoiceState.Connected && $currentVoiceSession}
        <Button
          data-tip={$currentVoiceSession.muted ? "Unmute" : "Mute"}
-          class={cx(
-            mediaToggleClass,
-            "overflow-visible",
-            !$currentVoiceSession.muted && $isLocalSpeaking && "text-primary",
-            $currentVoiceSession.muted &&
-              "text-error ring-1 ring-error/50 ring-offset-0 ring-offset-base-100",
-          )}
+          class="center tooltip tooltip-top btn btn-sm btn-square {$currentVoiceSession.muted
+            ? 'btn-error'
+            : 'btn-ghost'}"
          onclick={toggleMute}>
-          <span class="relative inline-flex items-center justify-center overflow-visible">
-            <Icon icon={Microphone} size={4} />
-            {#if $currentVoiceSession.muted}
-              <span
-                class="pointer-events-none absolute inset-0 flex items-center justify-center overflow-visible"
-                aria-hidden="true">
-                <span
-                  class="h-[1.3px] w-[150%] max-w-none shrink-0 -rotate-45 rounded-full bg-current"
-                ></span>
-              </span>
-            {/if}
-          </span>
+          <Icon icon={$currentVoiceSession.muted ? MicrophoneOff : Microphone} size={4} />
        </Button>
        <Button
-          data-tip={$currentVoiceSession.cameraOn ? "Turn off camera" : "Turn on camera"}
-          class={cx(mediaToggleClass, $currentVoiceSession.cameraOn && "text-primary")}
-          onclick={toggleCamera}>
-          <Icon icon={$currentVoiceSession.cameraOn ? VideocameraRecord : Videocamera} size={4} />
-        </Button>
-        {#if !Capacitor.isNativePlatform()}
-          <Button
-            data-tip={$currentVoiceSession.screenShareOn ? "Stop sharing" : "Share screen"}
-            class={cx(mediaToggleClass, $currentVoiceSession.screenShareOn && "text-primary")}
-            onclick={toggleScreenShare}>
-            <Icon icon={Monitor} size={4} />
-          </Button>
-        {/if}
-        <Button
-          data-tip="Call settings"
+          data-tip="Audio settings"
          class="center tooltip tooltip-top btn btn-sm btn-square btn-ghost"
-          onclick={openCallSettings}>
+          onclick={openAudioSettings}>
          <Icon icon={Settings} size={4} />
        </Button>
        <Button
@@ -1,6 +1,5 @@
-import {writable} from "svelte/store"
+import {get, writable} from "svelte/store"
 import {
-  batch,
  call,
  uniq,
  int,
@@ -26,8 +25,7 @@ import {
  sortEventsDesc,
 } from "@welshman/util"
 import type {TrustedEvent, Filter, List} from "@welshman/util"
-import {load, request, mergeRepositoryUpdates} from "@welshman/net"
-import type {RepositoryUpdate} from "@welshman/net"
+import {load, request} from "@welshman/net"
 import {repository, loadRelay, tracker} from "@welshman/app"
 import {createScroller} from "@lib/html"
 import {daysBetween} from "@lib/util"
@@ -58,75 +56,57 @@ export const makeFeed = ({
  let backwardWindow = [at - interval, at]
  let forwardWindow = [at, at + interval]

-  const insertIntoBuffer = (event: TrustedEvent) => {
-    for (let i = 0; i < buffer.length; i++) {
-      if (buffer[i].created_at > event.created_at) {
-        buffer.splice(i, 0, event)
-        return
-      }
-    }
-    buffer.push(event)
-  }
+  const insertEvent = (event: TrustedEvent) => {
+    let handled = false

-  // Batch-insert events into the visible store with a single update
-  const insertEvents = (newEvents: TrustedEvent[]) => {
-    const visible: TrustedEvent[] = []
+    if (between([backwardWindow[0], forwardWindow[1]], event.created_at)) {
+      const $events = get(events)

-    for (const event of newEvents) {
-      if (between([backwardWindow[0], forwardWindow[1]], event.created_at)) {
-        visible.push(event)
-      } else {
-        insertIntoBuffer(event)
-      }
-    }
-
-    if (visible.length > 0) {
-      events.update($events => {
-        for (const event of visible) {
-          let inserted = false
-          for (let i = 0; i < $events.length; i++) {
-            if ($events[i].created_at > event.created_at) {
-              $events = insertAt(i, event, $events)
-              inserted = true
-              break
-            }
-          }
-          if (!inserted) {
-            $events = [...$events, event]
-          }
+      for (let i = 0; i < $events.length; i++) {
+        if ($events[i].created_at > event.created_at) {
+          events.set(insertAt(i, event, $events))
+          handled = true
+          break
        }
-        return $events
-      })
+      }
+
+      if (!handled) {
+        events.set([...$events, event])
+      }
+    } else {
+      for (let i = 0; i < buffer.length; i++) {
+        if (buffer[i].created_at > event.created_at) {
+          buffer.splice(i, 0, event)
+          handled = true
+          break
+        }
+      }
+
+      if (!handled) {
+        buffer.push(event)
+      }
    }
  }

  const unsubscribers = [
-    on(
-      repository,
-      "update",
-      batch(150, (updates: RepositoryUpdate[]) => {
-        const {added, removed} = mergeRepositoryUpdates(updates)
+    on(repository, "update", ({added, removed}) => {
+      if (removed.size > 0) {
+        buffer = buffer.filter(e => !removed.has(e.id))
+        events.update($events => $events.filter(e => !removed.has(e.id)))
+      }

-        if (removed.size > 0) {
-          buffer = buffer.filter(e => !removed.has(e.id))
-          events.update($events => $events.filter(e => !removed.has(e.id)))
+      for (const event of added) {
+        if (matchFilters(filters, event) && tracker.getRelays(event.id).has(url)) {
+          insertEvent(event)
        }
-
-        const matching = added.filter(
-          event => matchFilters(filters, event) && tracker.getRelays(event.id).has(url),
-        )
-
-        if (matching.length > 0) {
-          insertEvents(matching)
-        }
-      }),
-    ),
+      }
+    }),
    on(tracker, "add", (id: string, trackerUrl: string) => {
      if (trackerUrl === url) {
        const event = repository.getEvent(id)

        if (event && matchFilters(filters, event)) {
-          insertEvents([event])
+          insertEvent(event)
        }
      }
    }),
@@ -157,7 +137,9 @@ export const makeFeed = ({

      backwardWindow = [since - interval, since]

-      insertEvents(buffer.splice(0, 30))
+      for (const event of buffer.splice(0, 30)) {
+        insertEvent(event)
+      }

      if (until > now() - int(2, YEAR)) {
        loadTimeframe(since, until)
@@ -178,7 +160,9 @@ export const makeFeed = ({

      forwardWindow = [until, until + interval]

-      insertEvents(buffer.splice(0, 30))
+      for (const event of buffer.splice(0, 30)) {
+        insertEvent(event)
+      }

      if (until < now()) {
        loadTimeframe(since, until)
@@ -224,61 +208,40 @@ export const makeCalendarFeed = ({

  const events = writable(sortBy(getStart, getEventsForUrl(url, filters)))

-  // Batch-insert calendar events into the store with a single update
-  const insertEvents = (newEvents: TrustedEvent[]) => {
-    const valid = newEvents.filter(e => !isNaN(getStart(e)) && !isNaN(getEnd(e)))
-    if (valid.length === 0) return
+  const insertEvent = (event: TrustedEvent) => {
+    const start = getStart(event)
+    const address = getAddress(event)
+
+    if (isNaN(start) || isNaN(getEnd(event))) return

    events.update($events => {
-      for (const event of valid) {
-        const start = getStart(event)
-        const address = getAddress(event)
-
-        let handled = false
-        for (let i = 0; i < $events.length; i++) {
-          if ($events[i].id === event.id) {
-            handled = true
-            break
-          }
-          if (getStart($events[i]) > start) {
-            $events = insertAt(i, event, $events)
-            handled = true
-            break
-          }
-        }
-
-        if (!handled) {
-          $events = [...$events.filter(e => getAddress(e) !== address), event]
-        }
+      for (let i = 0; i < $events.length; i++) {
+        if ($events[i].id === event.id) return $events
+        if (getStart($events[i]) > start) return insertAt(i, event, $events)
      }
-      return $events
+
+      return [...$events.filter(e => getAddress(e) !== address), event]
    })
  }

  const unsubscribers = [
-    on(
-      repository,
-      "update",
-      batch(150, (updates: RepositoryUpdate[]) => {
-        const {added, removed} = mergeRepositoryUpdates(updates)
+    on(repository, "update", ({added, removed}) => {
+      if (removed.size > 0) {
+        events.update($events => $events.filter(e => !removed.has(e.id)))
+      }

-        if (removed.size > 0) {
-          events.update($events => $events.filter(e => !removed.has(e.id)))
+      for (const event of added) {
+        if (matchFilters(filters, event)) {
+          insertEvent(event)
        }
-
-        const matching = added.filter(event => matchFilters(filters, event))
-
-        if (matching.length > 0) {
-          insertEvents(matching)
-        }
-      }),
-    ),
+      }
+    }),
    on(tracker, "add", (id: string, trackerUrl: string) => {
      if (trackerUrl === url) {
        const event = repository.getEvent(id)

        if (event && matchFilters(filters, event)) {
-          insertEvents([event])
+          insertEvent(event)
        }
      }
    }),
@@ -8,6 +8,7 @@ import {
  on,
  gt,
  max,
+  find,
  spec,
  call,
  first,
@@ -554,7 +555,7 @@ export const chatsById = call(() => {
        setTimeout(() => {
          addEvents(added)
          removeEvents(removed)
-        }, 200)
+        }, 50)
      }),
    ]

@@ -568,7 +569,7 @@ export const deriveChat = call(() => {
  return (pubkeys: string[]) => _deriveChat(makeChatId(pubkeys))
 })

-export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
+export const chatSearch = derived(throttled(800, chatsById), $chatsByPubkey => {
  return createSearch(
    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
    {
@@ -607,7 +608,7 @@ export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
 })

 export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
-  const result = new Map<string, Room[]>()
+  const metaByIdByUrl = new Map<string, Map<string, Room>>()

  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
@@ -619,8 +620,6 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
      }
    }

-    const metaById = new Map<string, Room>()
-
    for (const event of metaEvents) {
      const meta = tryCatch(() => readRoomMeta(event))

@@ -628,14 +627,22 @@ export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByU
        continue
      }

+      let metaById = metaByIdByUrl.get(url)
+      if (!metaById) {
+        metaById = new Map()
+        metaByIdByUrl.set(url, metaById)
+      }
+
      const id = makeRoomId(url, meta.h)

      metaById.set(id, {...meta, url, id})
    }
+  }

-    if (metaById.size > 0) {
-      result.set(url, Array.from(metaById.values()))
-    }
+  const result = new Map<string, Room[]>()
+
+  for (const [url, metaById] of metaByIdByUrl.entries()) {
+    result.set(url, Array.from(metaById.values()))
  }

  return result
@@ -808,78 +815,36 @@ export const deriveOtherRooms = (url: string) =>

 // Space/room memberships

-const getSpaceMembers = (_url: string, events: TrustedEvent[]) => {
-  const members = new Set<string>()
-
-  for (const event of sortEventsAsc(events)) {
-    if (event.kind === RELAY_MEMBERS) {
-      members.clear()
-
-      for (const pubkey of uniq(getTagValues("member", event.tags))) {
-        members.add(pubkey)
-      }
-
-      continue
-    }
-
-    const pubkeys = getPubkeyTagValues(event.tags)
-
-    if (event.kind === RELAY_ADD_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.add(pubkey)
-      }
-    }
-
-    if (event.kind === RELAY_REMOVE_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.delete(pubkey)
-      }
-    }
-  }
-
-  return Array.from(members)
-}
-
-const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
-  const members = new Set<string>()
-
-  for (const event of sortEventsAsc(events)) {
-    if (event.kind === ROOM_MEMBERS && getTagValue("d", event.tags) === h) {
-      members.clear()
-
-      for (const pubkey of uniq(getPubkeyTagValues(event.tags))) {
-        members.add(pubkey)
-      }
-
-      continue
-    }
-
-    if (getTagValue("h", event.tags) !== h) {
-      continue
-    }
-
-    const pubkeys = getPubkeyTagValues(event.tags)
-
-    if (event.kind === ROOM_ADD_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.add(pubkey)
-      }
-    }
-
-    if (event.kind === ROOM_REMOVE_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.delete(pubkey)
-      }
-    }
-  }
-
-  return Array.from(members)
-}
-
 export const deriveSpaceMembers = (url: string) =>
  derived(
    deriveRelaySignedEvents(url, [{kinds: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER, RELAY_MEMBERS]}]),
-    $events => getSpaceMembers(url, $events),
+    $events => {
+      const membersEvent = $events.find(spec({kind: RELAY_MEMBERS}))
+
+      if (membersEvent) {
+        return uniq(getTagValues("member", membersEvent.tags))
+      }
+
+      const members = new Set<string>()
+
+      for (const event of sortBy(e => e.created_at, $events)) {
+        const pubkeys = getPubkeyTagValues(event.tags)
+
+        if (event.kind === RELAY_ADD_MEMBER) {
+          for (const pubkey of pubkeys) {
+            members.add(pubkey)
+          }
+        }
+
+        if (event.kind === RELAY_REMOVE_MEMBER) {
+          for (const pubkey of pubkeys) {
+            members.delete(pubkey)
+          }
+        }
+      }
+
+      return Array.from(members)
+    },
  )

 export type BannedPubkeyItem = {
@@ -906,7 +871,33 @@ export const deriveRoomMembers = (url: string, h: string) => {
    {kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]},
  ]

-  return derived(deriveEventsForUrl(url, filters), $events => getRoomMembers(url, h, $events))
+  return derived(deriveEventsForUrl(url, filters), $events => {
+    const membersEvent = find(spec({kind: ROOM_MEMBERS}), $events)
+
+    if (membersEvent) {
+      return uniq(getPubkeyTagValues(membersEvent.tags))
+    }
+
+    const members = new Set<string>()
+
+    for (const event of sortEventsAsc($events)) {
+      const pubkeys = getPubkeyTagValues(event.tags)
+
+      if (event.kind === ROOM_ADD_MEMBER) {
+        for (const pubkey of pubkeys) {
+          members.add(pubkey)
+        }
+      }
+
+      if (event.kind === ROOM_REMOVE_MEMBER) {
+        for (const pubkey of pubkeys) {
+          members.delete(pubkey)
+        }
+      }
+    }
+
+    return Array.from(members)
+  })
 }

 export const deriveRoomAdmins = (url: string, h: string) => {
@@ -930,7 +921,7 @@ export const deriveSpaceActionItems = (url: string) =>
  derived(
    deriveEventsForUrl(url, [
      {
-        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
+        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS],
      },
    ]),
    $events => {
@@ -943,50 +934,19 @@ export const deriveSpaceActionItems = (url: string) =>
      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
        if (!h) continue

-        const roomJoins: TrustedEvent[] = []
-        const roomLeaves: TrustedEvent[] = []
-        const roomMembershipEvents: TrustedEvent[] = []
-
-        for (const event of roomEvents) {
-          switch (event.kind) {
-            case ROOM_JOIN:
-              roomJoins.push(event)
-              break
-            case ROOM_LEAVE:
-              roomLeaves.push(event)
-              break
-            case ROOM_MEMBERS:
-            case ROOM_ADD_MEMBER:
-            case ROOM_REMOVE_MEMBER:
-              roomMembershipEvents.push(event)
-              break
-          }
-        }
-
-        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
+        const roomJoins = roomEvents.filter(spec({kind: ROOM_JOIN}))
+        const roomLeaves = roomEvents.filter(spec({kind: ROOM_LEAVE}))
+        const roomMembersEvent = roomEvents.find(spec({kind: ROOM_MEMBERS}))
+        const roomMembers = getTagValues("p", roomMembersEvent?.tags ?? [])

        pendingJoins.push(
          ...removeUndefined(
-            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
-              first(sortEventsDesc(events)),
-            ),
+            Array.from(groupBy(e => e.pubkey, roomJoins).values())
+              .map(sortEventsDesc)
+              .map(first),
          ).filter(({pubkey, created_at}) => {
-            if (roomMembers.has(pubkey)) return false
-            if (
-              roomMembershipEvents.some(event => {
-                if (event.created_at <= created_at) {
-                  return false
-                }
-
-                if (event.kind === ROOM_MEMBERS) {
-                  return true
-                }
-
-                return getPubkeyTagValues(event.tags).includes(pubkey)
-              })
-            ) {
-              return false
-            }
+            if (roomMembers.includes(pubkey)) return false
+            if (gt(roomMembersEvent?.created_at, created_at)) return false
            if (roomLeaves.some(e => e.pubkey === pubkey && e.created_at > created_at)) return false

            return true
@@ -1,6 +1,7 @@
 import {page} from "$app/stores"
 import type {Unsubscriber} from "svelte/store"
-import {last, call, ifLet, assoc, chunk, WEEK, ago} from "@welshman/lib"
+import {get} from "svelte/store"
+import {last, call, ifLet, assoc, chunk, sleep, WEEK, ago} from "@welshman/lib"
 import {PollResponse} from "nostr-tools/kinds"
 import {merged} from "@welshman/store"
 import {
@@ -13,8 +14,6 @@ import {
  ROOM_MEMBERS,
  ROOM_ADD_MEMBER,
  ROOM_REMOVE_MEMBER,
-  ROOM_JOIN,
-  ROOM_LEAVE,
  ROOM_CREATE_PERMISSION,
  RELAY_MEMBERS,
  RELAY_ADD_MEMBER,
@@ -28,6 +27,7 @@ import {request, requestOne, Difference, DifferenceEvent} from "@welshman/net"
 import {
  pubkey,
  loadRelay,
+  userFollowList,
  userRelayList,
  userMessagingRelayList,
  loadRelayList,
@@ -50,6 +50,7 @@ import {
  loadGroupList,
  userSpaceUrls,
  userGroupList,
+  bootstrapPubkeys,
  decodeRelay,
  getSpaceUrlsFromGroupList,
  getSpaceRoomsFromGroupList,
@@ -57,7 +58,7 @@ import {
  loadFeedsForPubkey,
 } from "@app/core/state"
 import {hasBlossomSupport} from "@app/core/commands"
-import {LIVEKIT_PARTICIPANTS} from "@app/call/voice"
+import {LIVEKIT_PARTICIPANTS} from "@app/voice"

 // Utils

@@ -251,6 +252,29 @@ const syncUserData = () => {
    loadFeedsForPubkey(pubkey)
  }

+  const syncFollowList = async (signal: AbortSignal) => {
+    for (const pubkeys of chunk(10, get(bootstrapPubkeys))) {
+      if (signal.aborted) return
+
+      // This isn't urgent, avoid clogging other stuff up
+      await sleep(1000)
+
+      if (signal.aborted) return
+
+      await Promise.all(
+        pubkeys.flatMap(pk => [
+          loadRelayList(pk),
+          loadGroupList(pk),
+          loadProfile(pk),
+          loadFollowList(pk),
+          loadMuteList(pk),
+        ]),
+      )
+    }
+  }
+
+  let bootstrapFollowController = new AbortController()
+
  const unsubscribeGroupList = merged([userGroupList]).subscribe(([$userGroupList]) => {
    syncGroupList($userGroupList)
  })
@@ -259,10 +283,18 @@ const syncUserData = () => {
    syncRelayList($userRelayList)
  })

+  const unsubscribeFollows = merged([userFollowList]).subscribe(() => {
+    bootstrapFollowController.abort()
+    bootstrapFollowController = new AbortController()
+    void syncFollowList(bootstrapFollowController.signal)
+  })
+
  return () => {
+    bootstrapFollowController.abort()
    unsubscribersByKey.forEach(call)
    unsubscribeGroupList()
    unsubscribeRelayList()
+    unsubscribeFollows()
  }
 }

@@ -280,13 +312,8 @@ const syncSpace = (url: string, rooms: string[]) => {
        url,
        signal: controller.signal,
        filters: [
-          {kinds: [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS], "#d": [room]},
          {kinds: MESSAGE_KINDS, since, "#h": [room]},
          makeCommentFilter(CONTENT_KINDS, {since, "#h": [room]}),
-          {
-            kinds: [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
-            "#h": [room],
-          },
          {kinds: [PollResponse], since},
        ],
      })
@@ -299,7 +326,7 @@ const syncSpace = (url: string, rooms: string[]) => {

  const relayKinds = [RELAY_MEMBERS, RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER]
  const roomMetaKinds = [ROOM_META, ROOM_ADMINS, ROOM_MEMBERS, LIVEKIT_PARTICIPANTS]
-  const roomMemberKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER]
+  const roomMemberKinds = [ROOM_DELETE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER]

  pullAndListen({
    url,
@@ -332,10 +359,9 @@ const syncSpaces = () => {

  const unsubscribe = store.subscribe(([$userGroupList, $page]) => {
    const urls = new Set(getSpaceUrlsFromGroupList($userGroupList))
-    const currentUrl = $page.params.relay ? decodeRelay($page.params.relay) : undefined

-    if (currentUrl) {
-      urls.add(currentUrl)
+    if ($page.params.relay) {
+      urls.add(decodeRelay($page.params.relay))
    }

    // Stop syncing removed spaces
@@ -350,11 +376,6 @@ const syncSpaces = () => {
    // Start or restart syncing for each space
    for (const url of urls) {
      const rooms = getSpaceRoomsFromGroupList(url, $userGroupList)
-
-      if (currentUrl === url && $page.params.h && !rooms.includes($page.params.h)) {
-        rooms.push($page.params.h)
-      }
-
      const roomsKey = rooms.join(",")

      if (unsubscribersByUrl.has(url) && roomsByUrl.get(url) === roomsKey) continue
@@ -48,18 +48,6 @@ import {
 import type {Unsubscriber} from "svelte/store"
 import {db} from "@app/core/storage"

-// Shared interval for all non-critical store flushes, so they batch on the same cadence
-const FLUSH_INTERVAL = 3000
-
-// Wraps a write callback to run during idle time (non-critical persistence)
-const idleWrite = <T>(f: (xs: T[]) => void): ((xs: T[]) => void) => {
-  if (typeof requestIdleCallback !== "undefined") {
-    return (xs: T[]) => requestIdleCallback(() => f(xs))
-  }
-
-  return f
-}
-
 const kinds = {
  meta: [PROFILE, FOLLOWS, MUTES, RELAYS, BLOSSOM_SERVERS, MESSAGING_RELAYS, APP_DATA, ROOMS],
  alert: [ALERT_STATUS, ALERT_EMAIL, ALERT_WEB, ALERT_IOS, ALERT_ANDROID],
@@ -211,15 +199,14 @@ const loadCriticalRelays = async () => {
  relaysByUrl.set(indexBy(r => r.url, await table.getAll()))
 }

-const syncRelays = () =>
-  onRelay(batch(FLUSH_INTERVAL, idleWrite(db.table<RelayProfile>("relays").bulkPut)))
+const syncRelays = () => onRelay(batch(1000, db.table<RelayProfile>("relays").bulkPut))

 const initRelayStats = async () => {
  const table = db.table<RelayStats>("relayStats")

  relayStatsByUrl.set(indexBy(r => r.url, await table.getAll()))

-  return onRelayStats(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
+  return onRelayStats(batch(1000, table.bulkPut))
 }

 const initHandles = async () => {
@@ -227,7 +214,7 @@ const initHandles = async () => {

  handlesByNip05.set(indexBy(r => r.nip05, await table.getAll()))

-  return onHandle(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
+  return onHandle(batch(1000, table.bulkPut))
 }

 const initZappers = async () => {
@@ -235,7 +222,7 @@ const initZappers = async () => {

  zappersByLnurl.set(indexBy(z => z.lnurl, await table.getAll()))

-  return onZapper(batch(FLUSH_INTERVAL, idleWrite(table.bulkPut)))
+  return onZapper(batch(3000, table.bulkPut))
 }

 const initPlaintext = async () => {
@@ -4,35 +4,21 @@
 */
 import {
  DisconnectReason,
-  LocalParticipant,
-  LocalTrackPublication,
  Room as LiveKitRoom,
  RoomEvent,
  Track,
  supportsAudioOutputSelection,
  type AudioCaptureOptions,
+  type LocalParticipant,
 } from "livekit-client"
-import {derived, get} from "svelte/store"
+import {derived, get, writable} from "svelte/store"
 import {map, removeUndefined, uniqBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {makeHttpAuth, makeHttpAuthHeader, getTags} from "@welshman/util"
 import {signer} from "@welshman/app"
 import {getLivekitEndpoint} from "$lib/livekit"
 import {AbortError, whenAborted, whenTimeout} from "$lib/util"
-import {
-  currentVoiceRoom,
-  currentVoiceSession,
-  participantFromLiveKitIdentity,
-  participantKey,
-  participantPubkeyMap,
-  pubkeyFromLiveKitIdentity,
-  speakingParticipants,
-  VoiceState,
-  type VoiceParticipant,
-  voiceState,
-} from "@app/call/stores"
-import {resetVideoCallLayout, triggerVideoFeedCount, videoPrimaryTileKey} from "@app/call/video"
-import {deriveLatestEventForUrl, deriveRoom, makeRoomId} from "@app/core/state"
+import {deriveLatestEventForUrl, deriveRoom, makeRoomId, type Room} from "@app/core/state"
 import {pushToast} from "@app/util/toast"

 export const LIVEKIT_PARTICIPANTS = 39004
@@ -41,12 +27,30 @@ export {checkRelayHasLivekit} from "$lib/livekit"

 export {supportsAudioOutputSelection}

+export type VoiceSession = {
+  url: string
+  h: string
+  room: LiveKitRoom
+  muted: boolean
+}
+
+export type Pubkey = string
+
+export type VoiceParticipant = {pubkey?: Pubkey; identity: string}
+
+export enum VoiceState {
+  Joining = "joining",
+  Connected = "connected",
+  Disconnected = "disconnected",
+}
+
+export const currentVoiceSession = writable<VoiceSession | undefined>(undefined)
+
 const LIVEKIT_DEFAULT_DEVICE_ID = "default"

 export enum DeviceKind {
  AudioInput = "audioinput",
  AudioOutput = "audiooutput",
-  VideoInput = "videoinput",
 }

 export const switchVoiceActiveDevice = async (
@@ -67,14 +71,17 @@ export const switchVoiceActiveDevice = async (
      case DeviceKind.AudioOutput:
        label = "speaker"
        break
-      case DeviceKind.VideoInput:
-        label = "camera"
-        break
    }
    pushToast({theme: "error", message: `Error changing ${label}`})
  }
 }

+export const voiceState = writable<VoiceState>(VoiceState.Disconnected)
+
+export const currentVoiceRoom = writable<Room | undefined>(undefined)
+
+export const participantPubkeyMap = writable<Map<string, Pubkey>>(new Map())
+
 const addParticipant = (identity: string) => {
  participantPubkeyMap.update(m => {
    const next = new Map(m)
@@ -91,6 +98,24 @@ const deleteParticipant = (identity: string) => {
  })
 }

+export const pubkeyFromLiveKitIdentity = (identity: string): string | undefined =>
+  /^[a-f0-9]{64}$/.test(identity.slice(0, 64)) ? identity.slice(0, 64) : undefined
+
+export const participantFromLiveKitIdentity = (identity: string): VoiceParticipant => {
+  const pk = pubkeyFromLiveKitIdentity(identity)
+  return pk ? {pubkey: pk, identity} : {identity}
+}
+
+export const participantKey = (p: VoiceParticipant) => p.pubkey ?? p.identity
+
+export const speakingParticipants = writable<VoiceParticipant[]>([])
+
+export const isParticipantSpeaking = derived(
+  speakingParticipants,
+  $participants => (p: VoiceParticipant) =>
+    $participants.some(sp => participantKey(sp) === participantKey(p)),
+)
+
 const fetchLivekitToken = async (
  url: string,
  groupId: string,
@@ -172,9 +197,7 @@ const setUpMicrophone = async (
 }

 const onRoomDisconnected = (reason?: DisconnectReason) => {
-  videoPrimaryTileKey.set(undefined)
  currentVoiceSession.set(undefined)
-  resetVideoCallLayout()
  if (reason !== undefined && reason !== DisconnectReason.CLIENT_INITIATED) {
    voiceState.set(VoiceState.Disconnected)
    const message =
@@ -193,16 +216,11 @@ const onTrackSubscribed = (track: Track) => {
    element.style.display = "none"
    document.body.appendChild(element)
    element.play().catch(() => {})
-  } else if (track.kind === Track.Kind.Video) {
-    triggerVideoFeedCount()
  }
 }

 const onTrackUnsubscribed = (track: Track) => {
  track.detach().forEach(el => el.remove())
-  if (track.kind === Track.Kind.Video) {
-    triggerVideoFeedCount()
-  }
 }

 const onActiveSpeakersChanged = (participants: {identity: string}[]) => {
@@ -223,17 +241,6 @@ const onParticipantDisconnected = (participant: {identity: string}) => {
  deleteParticipant(participant.identity)
 }

-const onLocalTrackUnpublished = (
-  publication: LocalTrackPublication,
-  participant: LocalParticipant,
-) => {
-  if (publication.source !== Track.Source.ScreenShare) return
-  const session = get(currentVoiceSession)
-  if (!session || participant.identity !== session.room.localParticipant.identity) return
-  if (!session.screenShareOn) return
-  currentVoiceSession.set({...session, screenShareOn: false})
-}
-
 let joinAbortController: AbortController | undefined

 export const cancelJoinVoiceRoom = () => {
@@ -271,7 +278,6 @@ export const joinVoiceRoom = async (
    liveKitRoom.on(RoomEvent.ParticipantDisconnected, onParticipantDisconnected)
    liveKitRoom.on(RoomEvent.TrackSubscribed, onTrackSubscribed)
    liveKitRoom.on(RoomEvent.TrackUnsubscribed, onTrackUnsubscribed)
-    liveKitRoom.on(RoomEvent.LocalTrackUnpublished, onLocalTrackUnpublished)
    liveKitRoom.on(RoomEvent.ActiveSpeakersChanged, onActiveSpeakersChanged)

    try {
@@ -295,14 +301,7 @@ export const joinVoiceRoom = async (

    const muted = await setUpMicrophone(startMuted, preferredMicId, liveKitRoom.localParticipant)

-    currentVoiceSession.set({
-      url,
-      h,
-      room: liveKitRoom,
-      muted,
-      cameraOn: false,
-      screenShareOn: false,
-    })
+    currentVoiceSession.set({url, h, room: liveKitRoom, muted})
    voiceState.set(VoiceState.Connected)
    playJoinSound()
  } catch (e) {
@@ -321,26 +320,8 @@ export const leaveVoiceRoom = async () => {
  const audio = new Audio("/leave-voice-room.mp3")
  audio.play().catch(() => {})

-  if (session.cameraOn) {
-    try {
-      await session.room.localParticipant.setCameraEnabled(false)
-    } catch {
-      pushToast({theme: "error", message: "Error turning off camera."})
-    }
-  }
-
-  if (session.screenShareOn) {
-    try {
-      await session.room.localParticipant.setScreenShareEnabled(false)
-    } catch {
-      pushToast({theme: "error", message: "Error turning off screen sharing."})
-    }
-  }
-
  voiceState.set(VoiceState.Disconnected)
-  videoPrimaryTileKey.set(undefined)
  currentVoiceSession.set(undefined)
-  resetVideoCallLayout()
  session.room.disconnect()
  speakingParticipants.set([])
  participantPubkeyMap.set(new Map())
@@ -14,7 +14,6 @@
    style?: string
    disabled?: boolean
    "data-tip"?: string
-    "aria-pressed"?: boolean
  } = $props()

  const className = $derived(`text-left ${restProps.class}`)
@@ -6,6 +6,7 @@
  import Close from "@assets/icons/close.svg?dataurl"
  import Icon from "@lib/components/Icon.svelte"
  import Button from "@lib/components/Button.svelte"
+  import {clearModals} from "@app/util/modal"

  type Props = {
    onClose?: any
@@ -55,7 +56,7 @@
  <div class={wrapperClass}>
    <div class={innerClass} transition:fly>
      {#if !noEscape}
-        <Button class={buttonClass} onclick={onClose}>
+        <Button class={buttonClass} onclick={clearModals}>
          <Icon icon={Close} size={6} />
        </Button>
      {/if}
@@ -10,12 +10,7 @@

  let {children, element = $bindable(), ...props}: Props = $props()

-  const className = $derived(
-    cx(
-      props.class,
-      "scroll-container z-feature flex min-h-0 w-full min-w-0 flex-1 flex-col overflow-y-auto overflow-x-hidden",
-    ),
-  )
+  const className = cx(props.class, "scroll-container z-feature overflow-y-auto overflow-x-hidden")
 </script>

 <div {...props} bind:this={element} data-component="PageContent" class={className}>
@@ -1,56 +0,0 @@
-<script lang="ts">
-  import type {Snippet} from "svelte"
-
-  let {
-    children,
-    root,
-    initiallyVisible = false,
-    estimatedHeight = 48,
-  }: {
-    children: Snippet
-    root?: HTMLElement
-    initiallyVisible?: boolean
-    estimatedHeight?: number
-  } = $props()
-
-  let visible = $state(initiallyVisible)
-  let height = $state(estimatedHeight)
-  let el: HTMLElement | undefined = $state()
-  let hasMeasured = false
-
-  $effect(() => {
-    if (!el) return
-
-    const observer = new IntersectionObserver(
-      ([entry]) => {
-        if (entry.isIntersecting) {
-          visible = true
-        } else {
-          // Measure actual height before hiding content
-          if (el) {
-            const h = el.offsetHeight
-            if (h > 0) {
-              height = h
-              hasMeasured = true
-            }
-          }
-          if (hasMeasured) {
-            visible = false
-          }
-        }
-      },
-      {root: root || null, rootMargin: "1000px 0px"},
-    )
-
-    observer.observe(el)
-    return () => observer.disconnect()
-  })
-</script>
-
-<div bind:this={el}>
-  {#if visible}
-    {@render children()}
-  {:else}
-    <div style:height="{height}px"></div>
-  {/if}
-</div>
@@ -4,15 +4,13 @@
  import Dialog from "@lib/components/Dialog.svelte"
  import SpaceInviteAccept from "@app/components/SpaceInviteAccept.svelte"

-  const close = () => goto("/home")
-
  const children = {
    component: SpaceInviteAccept,
    props: {
      invite: $page.url.href,
-      back: close,
+      back: () => goto("/home"),
    },
  }
 </script>

-<Dialog {children} onClose={close} />
+<Dialog {children} />
@@ -172,9 +172,9 @@
      </strong>
      <Button onclick={() => (showAdvanced = !showAdvanced)}>
        {#if showAdvanced}
-          <Icon icon={AltArrowUp} />
-        {:else}
          <Icon icon={AltArrowDown} />
+        {:else}
+          <Icon icon={AltArrowUp} />
        {/if}
      </Button>
    </div>
@@ -1,14 +1,7 @@
-<script lang="ts">
-  import type {Snippet} from "svelte"
+<script>
  import {page} from "$app/stores"
-
-  type Props = {
-    children?: Snippet
-  }
-
-  const {children}: Props = $props()
 </script>

 {#key $page.url.searchParams.get("at")}
-  {@render children?.()}
+  <slot />
 {/key}
@@ -13,7 +13,6 @@
  import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"
  import InfoCircle from "@assets/icons/info-circle.svg?dataurl"
  import Login2 from "@assets/icons/login-3.svg?dataurl"
-  import cx from "classnames"
  import {slide, fade, fly} from "@lib/transition"
  import Button from "@lib/components/Button.svelte"
  import Divider from "@lib/components/Divider.svelte"
@@ -30,7 +29,6 @@
  import SpaceSearch from "@app/components/SpaceSearch.svelte"
  import ThunkToast from "@app/components/ThunkToast.svelte"
  import RoomItemAddMember from "@src/app/components/RoomItemAddMember.svelte"
-  import VirtualItem from "@lib/components/VirtualItem.svelte"
  import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
  import {canEnforceNip70, prependParent, publishDelete} from "@app/core/commands"
  import {
@@ -45,9 +43,7 @@
    userSettingsValues,
  } from "@app/core/state"
  import VoiceWidget from "@app/components/VoiceWidget.svelte"
-  import VideoCallContent from "@app/components/VideoCallContent.svelte"
-  import {VoiceState, currentVoiceRoom, voiceState} from "@app/call/stores"
-  import {VideoCallLayout, videoCallLayout, videoTileCount} from "@app/call/video"
+  import {VoiceState, voiceState} from "@app/voice"
  import {makeFeed} from "@app/core/requests"
  import {popKey} from "@lib/implicit"
  import {checked} from "@app/util/notifications"
@@ -60,53 +56,9 @@
  const url = decodeRelay(relay)
  const room = deriveRoom(url, h)
  const isVoiceRoom = $derived(getRoomType($room) === RoomType.Voice)
-
-  const voiceConnectedHere = $derived(
-    isVoiceRoom &&
-      $voiceState === VoiceState.Connected &&
-      $currentVoiceRoom?.url === url &&
-      $currentVoiceRoom?.h === h,
-  )
-
-  const showMobileVideoPanel = $derived(
-    isVoiceRoom &&
-      $voiceState === VoiceState.Connected &&
-      $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  const pageContentHiddenDesktopVideoOnly = $derived(
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  let prevVideoTileCount = $state(0)
-
-  $effect(() => {
-    if ($voiceState !== VoiceState.Connected) {
-      videoCallLayout.set(VideoCallLayout.Chat)
-      prevVideoTileCount = 0
-      return
-    }
-
-    const here = isVoiceRoom && $currentVoiceRoom?.url === url && $currentVoiceRoom?.h === h
-    const n = $videoTileCount
-
-    if (!here) {
-      prevVideoTileCount = 0
-      return
-    }
-
-    if (prevVideoTileCount === 0 && n >= 1) {
-      videoCallLayout.set(VideoCallLayout.Video)
-    }
-    if (prevVideoTileCount >= 1 && n === 0 && $videoCallLayout === VideoCallLayout.Split) {
-      videoCallLayout.set(VideoCallLayout.Chat)
-    }
-    prevVideoTileCount = n
-  })
  const shouldProtect = canEnforceNip70(url)
  const membershipStatus = deriveUserRoomMembershipStatus(url, h)
  const at = $derived(parseInt($page.url.searchParams.get("at")!))
-  const shouldVirtualize = $derived(isNaN(at))

  const showRoomDetail = () => pushModal(RoomDetail, {url, h})

@@ -412,186 +364,127 @@
  {/snippet}
 </SpaceBar>

-<div
-  class={cx(
-    "flex min-h-0 flex-1 flex-col",
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Split && "md:flex-row",
-  )}>
-  {#if voiceConnectedHere}
-    <VideoCallContent
-      layout={$videoCallLayout}
-      {url}
-      {h}
-      class="hidden min-h-0 w-full min-w-0 flex-1 flex-col md:flex" />
-  {/if}
-
-  <div
-    class={cx(
-      "flex min-h-0 min-w-0 flex-1 flex-col",
-      voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video && "md:hidden",
-    )}>
-    {#if isVoiceRoom && $voiceState === VoiceState.Connected}
-      <VideoCallContent layout={$videoCallLayout} mobile {url} {h} class="md:hidden" />
-    {/if}
-
-    <PageContent
-      bind:element
-      onscroll={onScroll}
-      class={cx(
-        showMobileVideoPanel
-          ? "hidden flex-col-reverse pt-4 md:flex md:flex-col-reverse"
-          : "flex flex-col-reverse pt-4",
-        pageContentHiddenDesktopVideoOnly && "md:hidden",
-      )}>
-      {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
-        <div class="py-20">
-          <div class="card2 col-8 m-auto max-w-md items-center text-center">
-            <p class="opacity-75">You aren't currently a member of this room.</p>
-            {#if $membershipStatus === MembershipStatus.Pending}
-              <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
-                <Icon icon={ClockCircle} />
-                Access Pending
-              </Button>
-            {:else}
-              <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
-                {#if joining}
-                  <span class="loading loading-spinner loading-sm"></span>
-                {:else}
-                  <Icon icon={Login2} />
-                {/if}
-                Join Room
-              </Button>
-            {/if}
-          </div>
-        </div>
-      {:else}
-        {#if loadingForward}
-          <p class="py-20 flex justify-center">
-            <Spinner loading={loadingForward}>Looking for messages...</Spinner>
-          </p>
-        {/if}
-        {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
-          {#if type === "new-messages"}
-            <div
-              {id}
-              class="flex items-center py-2 text-xs transition-colors"
-              class:opacity-0={showFixedNewMessages}>
-              <div class="h-px flex-grow bg-primary"></div>
-              <p class="rounded-full bg-primary px-2 py-1 text-primary-content">New Messages</p>
-              <div class="h-px flex-grow bg-primary"></div>
-            </div>
-          {:else if type === "date"}
-            <Divider>{value}</Divider>
-          {:else if shouldVirtualize}
-            <VirtualItem root={element} initiallyVisible={i < 25}>
-              {@const event = value as TrustedEvent}
-              {#if event.kind === ROOM_ADD_MEMBER}
-                <RoomItemAddMember {url} {event} />
-              {:else}
-                <div class="cv">
-                  <RoomItem
-                    {url}
-                    {event}
-                    {replyTo}
-                    {showPubkey}
-                    {addSpaceBelow}
-                    canEdit={canEditEvent}
-                    onEdit={onEditEvent} />
-                </div>
-              {/if}
-            </VirtualItem>
-          {:else}
-            {@const event = value as TrustedEvent}
-            {#if event.kind === ROOM_ADD_MEMBER}
-              <RoomItemAddMember {url} {event} />
-            {:else}
-              <div in:slide class="cv">
-                <RoomItem
-                  {url}
-                  {event}
-                  {replyTo}
-                  {showPubkey}
-                  {addSpaceBelow}
-                  canEdit={canEditEvent}
-                  onEdit={onEditEvent} />
-              </div>
-            {/if}
-          {/if}
-        {/each}
-        <p class="flex h-10 items-center justify-center py-20">
-          {#if loadingBackward}
-            <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
-          {:else}
-            <Spinner>End of message history</Spinner>
-          {/if}
-        </p>
-      {/if}
-      <div class="h-screen"></div>
-    </PageContent>
-
-    <div
-      class={cx(
-        "chat__compose-zone chat__compose flex flex-col gap-1 bg-base-200 md:flex-row md:gap-0",
-        pageContentHiddenDesktopVideoOnly && "md:hidden",
-        showMobileVideoPanel && "max-md:hidden",
-      )}>
-      <div class="chat__compose-inner min-w-0 flex-1">
-        {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
-          <!-- pass -->
-        {:else if $room.isRestricted && $membershipStatus !== MembershipStatus.Granted}
-          <div class="bg-alt card m-4 flex flex-row items-center justify-between px-4 py-3">
-            <p class="opacity-75">Only members are allowed to post to this room.</p>
-            {#if $membershipStatus === MembershipStatus.Pending}
-              <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
-                <Icon icon={ClockCircle} />
-                Access Pending
-              </Button>
-            {:else}
-              <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
-                {#if joining}
-                  <span class="loading loading-spinner loading-sm"></span>
-                {:else}
-                  <Icon icon={Login2} />
-                {/if}
-                Ask to Join
-              </Button>
-            {/if}
-          </div>
+<PageContent bind:element onscroll={onScroll} class="flex flex-col-reverse pt-4">
+  {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
+    <div class="py-20">
+      <div class="card2 col-8 m-auto max-w-md items-center text-center">
+        <p class="opacity-75">You aren't currently a member of this room.</p>
+        {#if $membershipStatus === MembershipStatus.Pending}
+          <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
+            <Icon icon={ClockCircle} />
+            Access Pending
+          </Button>
        {:else}
-          <div>
-            {#if parent}
-              <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
+          <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
+            {#if joining}
+              <span class="loading loading-spinner loading-sm"></span>
+            {:else}
+              <Icon icon={Login2} />
            {/if}
-            {#if share}
-              <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
-            {/if}
-            {#if eventToEdit}
-              <RoomComposeEdit clear={clearEventToEdit} />
-            {/if}
-          </div>
-          {#key eventToEdit}
-            <RoomCompose
-              {url}
-              {h}
-              {onSubmit}
-              {onEscape}
-              {onEditPrevious}
-              initialValues={eventToEdit}
-              bind:this={compose} />
-          {/key}
+            Join Room
+          </Button>
        {/if}
      </div>
-      {#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected}
-        <div
-          class={cx(
-            "hide-on-keyboard flex-shrink-0 p-2 md:hidden",
-            showMobileVideoPanel && "hidden",
-          )}>
-          <VoiceWidget />
-        </div>
-      {/if}
    </div>
+  {:else}
+    {#if loadingForward}
+      <p class="py-20 flex justify-center">
+        <Spinner loading={loadingForward}>Looking for messages...</Spinner>
+      </p>
+    {/if}
+    {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)}
+      {#if type === "new-messages"}
+        <div
+          {id}
+          class="flex items-center py-2 text-xs transition-colors"
+          class:opacity-0={showFixedNewMessages}>
+          <div class="h-px grow bg-primary"></div>
+          <p class="rounded-full bg-primary px-2 py-1 text-primary-content">New Messages</p>
+          <div class="h-px grow bg-primary"></div>
+        </div>
+      {:else if type === "date"}
+        <Divider>{value}</Divider>
+      {:else}
+        {@const event = $state.snapshot(value as TrustedEvent)}
+        {#if event.kind === ROOM_ADD_MEMBER}
+          <RoomItemAddMember {url} {event} />
+        {:else}
+          <div in:slide class="cv">
+            <RoomItem
+              {url}
+              {event}
+              {replyTo}
+              {showPubkey}
+              {addSpaceBelow}
+              canEdit={canEditEvent}
+              onEdit={onEditEvent} />
+          </div>
+        {/if}
+      {/if}
+    {/each}
+    <p class="flex h-10 items-center justify-center py-20">
+      {#if loadingBackward}
+        <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
+      {:else}
+        <Spinner>End of message history</Spinner>
+      {/if}
+    </p>
+  {/if}
+  <div class="h-screen"></div>
+</PageContent>
+
+<div class="chat__compose flex flex-col gap-1 bg-base-200 md:flex-row md:gap-0">
+  <div class="chat__compose-inner min-w-0 flex-1">
+    {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
+      <!-- pass -->
+    {:else if $room.isRestricted && $membershipStatus !== MembershipStatus.Granted}
+      <div class="bg-alt card m-4 flex flex-row items-center justify-between px-4 py-3">
+        <p class="opacity-75">Only members are allowed to post to this room.</p>
+        {#if $membershipStatus === MembershipStatus.Pending}
+          <Button class="btn btn-neutral btn-sm" disabled={leaving} onclick={leave}>
+            <Icon icon={ClockCircle} />
+            Access Pending
+          </Button>
+        {:else}
+          <Button class="btn btn-neutral btn-sm" disabled={joining} onclick={join}>
+            {#if joining}
+              <span class="loading loading-spinner loading-sm"></span>
+            {:else}
+              <Icon icon={Login2} />
+            {/if}
+            Ask to Join
+          </Button>
+        {/if}
+      </div>
+    {:else}
+      <div>
+        {#if parent}
+          <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
+        {/if}
+        {#if share}
+          <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
+        {/if}
+        {#if eventToEdit}
+          <RoomComposeEdit clear={clearEventToEdit} />
+        {/if}
+      </div>
+      {#key eventToEdit}
+        <RoomCompose
+          {url}
+          {h}
+          {onSubmit}
+          {onEscape}
+          {onEditPrevious}
+          initialValues={eventToEdit}
+          bind:this={compose} />
+      {/key}
+    {/if}
  </div>
+  {#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected}
+    <div class="hide-on-keyboard shrink-0 p-2 md:hidden">
+      <VoiceWidget />
+    </div>
+  {/if}
 </div>

 {#if showScrollButton}
@@ -21,7 +21,6 @@
  import SpaceSearch from "@app/components/SpaceSearch.svelte"
  import RoomItem from "@app/components/RoomItem.svelte"
  import RoomItemAddMember from "@src/app/components/RoomItemAddMember.svelte"
-  import VirtualItem from "@lib/components/VirtualItem.svelte"

  import RoomCompose from "@app/components/RoomCompose.svelte"
  import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
@@ -38,7 +37,6 @@
  const url = decodeRelay($page.params.relay!)
  const shouldProtect = canEnforceNip70(url)
  const at = $derived(parseInt($page.url.searchParams.get("at")!))
-  const shouldVirtualize = $derived(isNaN(at))

  const replyTo = (event: TrustedEvent) => {
    parent = event
@@ -307,7 +305,7 @@
      <Spinner loading={loadingForward}>Looking for messages...</Spinner>
    </p>
  {/if}
-  {#each elements as { type, id, value, showPubkey, addSpaceBelow }, i (id)}
+  {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)}
    {#if type === "new-messages"}
      <div
        {id}
@@ -319,26 +317,8 @@
      </div>
    {:else if type === "date"}
      <Divider>{value}</Divider>
-    {:else if shouldVirtualize}
-      <VirtualItem root={element} initiallyVisible={i < 25}>
-        {@const event = value as TrustedEvent}
-        {#if event.kind === RELAY_ADD_MEMBER}
-          <RoomItemAddMember {url} {event} />
-        {:else}
-          <div>
-            <RoomItem
-              {url}
-              {event}
-              {replyTo}
-              {showPubkey}
-              canEdit={canEditEvent}
-              onEdit={onEditEvent}
-              {addSpaceBelow} />
-          </div>
-        {/if}
-      </VirtualItem>
    {:else}
-      {@const event = value as TrustedEvent}
+      {@const event = $state.snapshot(value as TrustedEvent)}
      {#if event.kind === RELAY_ADD_MEMBER}
        <RoomItemAddMember {url} {event} />
      {:else}
Author	SHA1	Message	Date
nayan9617	3dd5a0915f	Stop tracking .next artifacts	2026-04-08 16:42:54 +00:00
nayan9617	55497b7949	Keep follow sync trickling	2026-04-08 16:42:54 +00:00
nayan9617	2144bffc41	Align sync as per the review	2026-04-08 16:42:54 +00:00
nayan9617	35c27090c1	Guard fallback pulls after abort	2026-04-08 16:42:54 +00:00
nayan9617	e710fc2561	refactor: revert socket reset workaround for adapter layer investigation	2026-04-08 16:42:54 +00:00
nayan9617	a5506689f7	fix: reset relay sockets on visibility change to prevent auth hangs on sleep/wake When browser tab is hidden (sleep), tear down all relay socket connections completely. This forces fresh socket creation and clean auth handshake on wake, preventing stuck AuthStatus.PendingResponse states. - Add documentVisibility store tracking document.visibilityState - Call Pool.get().remove(url) for relay sockets during hidden teardown - Integrate socket reset in syncUserData, syncSpaces, syncDMs - Add explanatory comments for visibility guards and race conditions Fixes: App stuck in "Authenticating" after Mac sleep/wake cycle Tested with: wss://news.utxo.one/	2026-04-08 16:42:54 +00:00