feat(voice): WebRTC voice/stream channels with text chat

compose.yaml

@@ -2,107 +2,17 @@ services:
   obsidian:
     build:
       context: .
-      dockerfile: Dockerfile
-    container_name: obsidian-irc
-    ports:
-      - '3000:80'
+      dockerfile: ./Dockerfile
+      args:
+        VITE_DEFAULT_IRC_SERVER: wss://${IRC_FQDN}
+        VITE_DEFAULT_IRC_SERVER_NAME: ${NETWORK_NAME}
+    image: obsidianirc:local
+    container_name: obsidianirc
     restart: unless-stopped
-    healthcheck:
-      test: ['CMD', 'wget', '-qO-', 'http://localhost/']
-      interval: 30s
-      timeout: 10s
-      retries: 3
-
-  gen-certs:
-    image: alpine:3.20
-    volumes:
-      - ${MKCERT_CAROOT:?Run ./scripts/setup-dev-certs.sh first}:/caroot:ro
-      - ./certs:/certs
-    command:
-      - sh
-      - -c
-      - |
-        openssl x509 -noout -in /certs/server.pem 2>/dev/null && exit 0
-        apk add --no-cache openssl -q
-        openssl genrsa -out /certs/server-key.pem 2048
-        openssl req -new -key /certs/server-key.pem -out /tmp/csr.pem -subj "/CN=localhost"
-        printf '[SAN]\nsubjectAltName=DNS:localhost,IP:127.0.0.1,IP:::1\n' > /tmp/ext.cnf
-        openssl x509 -req -in /tmp/csr.pem \
-          -CA /caroot/rootCA.pem -CAkey /caroot/rootCA-key.pem -set_serial 1 \
-          -out /certs/server.pem -days 825 -sha256 -extfile /tmp/ext.cnf -extensions SAN
-    profiles:
-      - testing
-
-  # TODO - Add IRC daemon + backend etc
-  ircd:
-    init: true
-    # TODO: Use our unrealircd custom image instead
-    image: ghcr.io/ergochat/ergo:master
-    container_name: ergo
-    ports:
-      - '6667:6667'   # plain IRC (bots)
-      - '6697:6697'   # IRC over TLS — ircs://localhost:6697 (Tauri native TCP)
-      - '8097:8097'   # WebSocket over TLS — wss://localhost:8097 (browser / WebView)
-    restart: unless-stopped
-    depends_on:
-      gen-certs:
-        condition: service_completed_successfully
-    volumes:
-      - ./docker/ergo.yaml:/ircd/ircd.yaml
-      - ./certs:/ircd/certs:ro
-    profiles:
-      - testing
-
-  echo-bot:
-    image: python:3.12-alpine
-    container_name: echo-bot
-    volumes:
-      - ./docker/echobot.py:/app/echobot.py:ro
-    working_dir: /app
-    depends_on:
-      - ircd
-    environment:
-      HOST: ircd
-      PORT: 6667
-      CHANNEL: '#test'
-      NICK: EchoBot
-    command: ['python', '-u', 'echobot.py']
-    restart: unless-stopped
-    profiles:
-      - testing
-
-  helper-bot:
-    image: python:3.12-alpine
-    container_name: helper-bot
-    volumes:
-      - ./docker/echobot.py:/app/echobot.py:ro
-    working_dir: /app
-    depends_on:
-      - ircd
-    environment:
-      HOST: ircd
-      PORT: 6667
-      CHANNEL: '#test'
-      NICK: HelperBot1
-    command: ['python', '-u', 'echobot.py']
-    restart: unless-stopped
-    profiles:
-      - testing
-
-  chat-bot:
-    image: python:3.12-alpine
-    container_name: chat-bot
-    volumes:
-      - ./docker/echobot.py:/app/echobot.py:ro
-    working_dir: /app
-    depends_on:
-      - ircd
-    environment:
-      HOST: ircd
-      PORT: 6667
-      CHANNEL: '#test'
-      NICK: HelperBot2
-    command: ['python', '-u', 'echobot.py']
-    restart: unless-stopped
-    profiles:
-      - testing
+    expose:
+      - "80"
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.obsidian.rule=Host(`${WEB_FQDN}`)
+      - traefik.http.routers.obsidian.tls=true
+      - traefik.http.services.obsidian.loadbalancer.server.port=80

src-tauri/gen/android/app/build.gradle.kts

@@ -1,3 +1,4 @@
+import java.io.File
 import java.util.Properties
 
 plugins {
@@ -24,6 +25,28 @@ android {
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
         versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
+    signingConfigs {
+        create("release") {
+            val keystorePropsFile = rootProject.file("keystore.properties")
+            if (keystorePropsFile.exists()) {
+                val keystoreProps = Properties().apply {
+                    keystorePropsFile.inputStream().use { load(it) }
+                }
+                storeFile = file(keystoreProps.getProperty("storeFile"))
+                storePassword = keystoreProps.getProperty("storePassword")
+                keyAlias = keystoreProps.getProperty("keyAlias")
+                keyPassword = keystoreProps.getProperty("keyPassword")
+            } else {
+                val debugKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+                if (debugKeystore.exists()) {
+                    storeFile = debugKeystore
+                    storePassword = "android"
+                    keyAlias = "androiddebugkey"
+                    keyPassword = "android"
+                }
+            }
+        }
+    }
     buildTypes {
         getByName("debug") {
             manifestPlaceholders["usesCleartextTraffic"] = "true"
@@ -38,6 +61,7 @@ android {
         }
         getByName("release") {
             isMinifyEnabled = true
+            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 *fileTree(".") { include("**/*.pro") }
                     .plus(getDefaultProguardFile("proguard-android-optimize.txt"))

src-tauri/gen/android/app/src/main/AndroidManifest.xml

@@ -44,6 +44,8 @@
             <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
             <intent-filter >
                 <action android:name="android.intent.action.VIEW" />
+                <!-- ChromeOS ARC++ uses a different action for deep links -->
+                <action android:name="org.chromium.arc.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="https" />
@@ -56,6 +58,8 @@
             </intent-filter>
             <intent-filter >
                 <action android:name="android.intent.action.VIEW" />
+                <!-- ChromeOS ARC++ uses a different action for deep links -->
+                <action android:name="org.chromium.arc.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="https" />

src/components/layout/AppLayout.tsx

@@ -12,6 +12,7 @@ import { ChatArea } from "./ChatArea";
 import { MemberList } from "./MemberList";
 import { ResizableSidebar } from "./ResizableSidebar";
 import { ServerList } from "./ServerList";
+import { VoiceChannelView } from "./VoiceChannelView";
 
 const PAGE_ORDER: layoutColumn[] = ["serverList", "chatView", "memberList"];
 const getPageIndex = (column: layoutColumn): number =>
@@ -41,7 +42,19 @@ export const AppLayout: React.FC = () => {
     selectedChannelId: null,
     selectedPrivateChatId: null,
   };
-  const { selectedPrivateChatId } = currentSelection;
+  const { selectedChannelId, selectedPrivateChatId } = currentSelection;
+
+  const selectedChannel = useStore((s) => {
+    if (!selectedServerId || !selectedChannelId) return null;
+    const srv = s.servers.find((x) => x.id === selectedServerId);
+    return srv?.channels.find((c) => c.id === selectedChannelId) ?? null;
+  });
+  // Both ^ (voice) and $ (stream) channels render through VoiceChannelView.
+  // The view itself reads the room mode from VoiceState.mode and adapts
+  // its layout (publishing controls vs viewer chat).
+  const isVoiceChannel =
+    !!selectedChannel?.name.startsWith("^") ||
+    !!selectedChannel?.name.startsWith("$");
   const {
     isDarkMode,
     isMobileMenuOpen,
@@ -50,8 +63,9 @@ export const AppLayout: React.FC = () => {
     mobileViewActiveColumn,
   } = ui;
 
-  // Hide member list for private chats
-  const shouldShowMemberList = isMemberListVisible && !selectedPrivateChatId;
+  // Hide member list for private chats and voice channels (voice has its own grid)
+  const shouldShowMemberList =
+    isMemberListVisible && !selectedPrivateChatId && !isVoiceChannel;
 
   const handleChannelListWidthChange = useCallback((width: number) => {
     setChannelListWidth(width);
@@ -202,16 +216,33 @@ export const AppLayout: React.FC = () => {
           <div
             className={`${isNarrowView ? "w-full" : "flex-grow"} h-full bg-discord-dark-200 flex flex-col min-w-0 z-10`}
           >
-            <ChatArea
-              isChanListVisible={isChannelListVisible}
-              onToggleChanList={() => {
-                if (isNarrowView) {
-                  setMobileViewActiveColumn("serverList");
-                } else {
-                  toggleChannelList(!isChannelListVisible);
-                }
-              }}
-            />
+            {(() => {
+              // Both `^` (voice) and `$` (stream) channels render through
+              // ChatArea with the VoiceChannelView injected as a topSlot,
+              // so the channel's ChatHeader stays at the very top of the
+              // panel and the voice grid + chat live beneath it as one
+              // continuous column.
+              const voiceTopSlot =
+                isVoiceChannel && selectedServerId && selectedChannel ? (
+                  <VoiceChannelView
+                    serverId={selectedServerId}
+                    channelName={selectedChannel.name}
+                  />
+                ) : undefined;
+              return (
+                <ChatArea
+                  isChanListVisible={isChannelListVisible}
+                  onToggleChanList={() => {
+                    if (isNarrowView) {
+                      setMobileViewActiveColumn("serverList");
+                    } else {
+                      toggleChannelList(!isChannelListVisible);
+                    }
+                  }}
+                  topSlot={voiceTopSlot}
+                />
+              );
+            })()}
           </div>
         );
       case "memberList":