feature/23-voice-room/poc #93

Merged
hodlbod merged 68 commits from feature/23-voice-room/poc into dev 2026-03-16 20:38:06 +00:00
2 changed files with 6 additions and 2 deletions
Showing only changes of commit 2acf971a10 - Show all commits
+1 -1
View File
@@ -27,7 +27,7 @@
</script>
{#if roomType === RoomType.Voice}
<VoiceRoomItem {url} {h} />
<VoiceRoomItem {url} {h} {replaceState} />
{:else}
<SecondaryNavItem
href={path}
hodlbod marked this conversation as resolved Outdated
Outdated
Review

I can see why this would be confusing, but we should figure out what to do about muted rooms still

I can see why this would be confusing, but we should figure out what to do about muted rooms still
Outdated
Review

Oh yes that's my mistake. How about we use a bell icon for notifications and speaker icon for voice rooms?

Oh yes that's my mistake. How about we use a bell icon for notifications and speaker icon for voice rooms?
Outdated
Review

sure, that makes sense

sure, that makes sense
+5 -1
View File
@@ -6,6 +6,7 @@
import RoomImage from "@app/components/RoomImage.svelte"
import RoomName from "@app/components/RoomName.svelte"
import {pushToast} from "@app/util/toast"
import {makeRoomPath} from "@app/util/routes"
import {
deriveVoiceParticipants,
joinVoiceRoom,
@@ -19,9 +20,10 @@
interface Props {
url: string
h: string
replaceState?: boolean
}
const {url, h}: Props = $props()
const {url, h, replaceState = false}: Props = $props()
const participants = deriveVoiceParticipants(url, h)
const isActive = $derived($currentVoiceSession?.url === url && $currentVoiceSession?.h === h)
8
@@ -55,6 +57,8 @@
</script>
<SecondaryNavItem
href={makeRoomPath(url, h)}
{replaceState}
onclick={handleClick}
class={cx("!items-start", isActive && "!bg-base-100 !text-base-content")}>
<div class="flex w-full min-w-0 flex-col gap-2">
2