From c3441981c53a26093275243cb5d11aac56a95599 Mon Sep 17 00:00:00 2001
From: mplorentz <mplorentz@noreply.gitea.coracle.social>
Date: Wed, 1 Apr 2026 16:38:46 -0400
Subject: [PATCH 1/2] Fix error toast when failing to join room.

---
 src/app/components/VoiceRoomJoinDialog.svelte |  3 ++-
 src/app/components/VoiceWidget.svelte         | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/app/components/VoiceRoomJoinDialog.svelte b/src/app/components/VoiceRoomJoinDialog.svelte
index 044fcd64..b9436e66 100644
--- a/src/app/components/VoiceRoomJoinDialog.svelte
+++ b/src/app/components/VoiceRoomJoinDialog.svelte
@@ -13,6 +13,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import {displayRoom} from "@app/core/state"
+  import {handleJoinError} from "@app/components/VoiceWidget.svelte"
   import {joinVoiceRoom} from "@app/voice"
   import {popModal} from "@app/util/modal"
 
@@ -52,7 +53,7 @@
       h,
       startWithoutMic,
       startWithoutMic ? undefined : selectedDeviceId || undefined,
-    )
+    ).catch(handleJoinError)
   }
 </script>
 
diff --git a/src/app/components/VoiceWidget.svelte b/src/app/components/VoiceWidget.svelte
index 1ed8356e..ddfa7619 100644
--- a/src/app/components/VoiceWidget.svelte
+++ b/src/app/components/VoiceWidget.svelte
@@ -1,3 +1,18 @@
+<script module lang="ts">
+  import {AbortError, TimeoutError} from "$lib/util"
+  import {pushToast} from "@app/util/toast"
+
+  export function handleJoinError(e: unknown) {
+    if (e instanceof AbortError) return
+    console.error("Failed to join voice room", e)
+    let message = "Failed to join voice room"
+    if (e instanceof TimeoutError)
+      message = "Connection timed out. Please check your network and try again."
+    else if (e instanceof Error) message = e.message
+    pushToast({theme: "error", message})
+  }
+</script>
+
 <script lang="ts">
   import {readable} from "svelte/store"
   import {fly} from "svelte/transition"
-- 
2.52.0


From d70391905a97be971c95a382f1ff3bad67e6e7c5 Mon Sep 17 00:00:00 2001
From: mplorentz <mplorentz@noreply.gitea.coracle.social>
Date: Wed, 1 Apr 2026 16:45:24 -0400
Subject: [PATCH 2/2] Move handleJoinerror into VoiceRoomJoinDialog.

---
 src/app/components/VoiceRoomJoinDialog.svelte | 13 ++++++++++++-
 src/app/components/VoiceWidget.svelte         | 15 ---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/app/components/VoiceRoomJoinDialog.svelte b/src/app/components/VoiceRoomJoinDialog.svelte
index b9436e66..8bba88b5 100644
--- a/src/app/components/VoiceRoomJoinDialog.svelte
+++ b/src/app/components/VoiceRoomJoinDialog.svelte
@@ -12,10 +12,11 @@
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
+  import {AbortError, TimeoutError} from "$lib/util"
   import {displayRoom} from "@app/core/state"
-  import {handleJoinError} from "@app/components/VoiceWidget.svelte"
   import {joinVoiceRoom} from "@app/voice"
   import {popModal} from "@app/util/modal"
+  import {pushToast} from "@app/util/toast"
 
   type Props = {
     url: string
@@ -46,6 +47,16 @@
 
   const goBack = () => history.back()
 
+  const handleJoinError = (e: unknown) => {
+    if (e instanceof AbortError) return
+    console.error("Failed to join voice room", e)
+    let message = "Failed to join voice room"
+    if (e instanceof TimeoutError)
+      message = "Connection timed out. Please check your network and try again."
+    else if (e instanceof Error) message = e.message
+    pushToast({theme: "error", message})
+  }
+
   const joinVoice = async () => {
     popModal()
     await joinVoiceRoom(
diff --git a/src/app/components/VoiceWidget.svelte b/src/app/components/VoiceWidget.svelte
index ddfa7619..1ed8356e 100644
--- a/src/app/components/VoiceWidget.svelte
+++ b/src/app/components/VoiceWidget.svelte
@@ -1,18 +1,3 @@
-<script module lang="ts">
-  import {AbortError, TimeoutError} from "$lib/util"
-  import {pushToast} from "@app/util/toast"
-
-  export function handleJoinError(e: unknown) {
-    if (e instanceof AbortError) return
-    console.error("Failed to join voice room", e)
-    let message = "Failed to join voice room"
-    if (e instanceof TimeoutError)
-      message = "Connection timed out. Please check your network and try again."
-    else if (e instanceof Error) message = e.message
-    pushToast({theme: "error", message})
-  }
-</script>
-
 <script lang="ts">
   import {readable} from "svelte/store"
   import {fly} from "svelte/transition"
-- 
2.52.0