From d26b95985d753db1a879ba4c6a6cd62df3778870 Mon Sep 17 00:00:00 2001
From: KoalaDev <6156589+Shik3i@users.noreply.github.com>
Date: Sat, 27 Jun 2026 01:29:00 +0200
Subject: [PATCH] fix(host-control-mode): only show host-control card when
 meaningful
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The card was rendered in every room with a "Guest" badge by default — confusing
in normal rooms, and outright misleading against a relay that doesn't yet support
host control (older server omits hostPeerId, so amHost is always false and nobody
is ever recognized as host).

Now the card shows only when it's meaningful: the host always sees it (to toggle
host-only), a guest sees it only while host-only is active, and it's hidden in a
normal "everyone" room and whenever the server doesn't advertise hostPeerId
(feature unavailable). Thread hostPeerId through updateHostControlUI to detect
server support.

Note: the feature still requires the relay to run the host-control server code;
this just makes the client degrade cleanly instead of showing a stray "Guest".

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 extension/popup.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/extension/popup.js b/extension/popup.js
index 70c4f99..27facaf 100644
--- a/extension/popup.js
+++ b/extension/popup.js
@@ -249,7 +249,7 @@ async function init() {
             updatePingDisplay(res.ping);
             updatePeerList(res.peers);
             lastKnownPeers = res.peers || [];
-            updateHostControlUI(res.controlMode, res.amHost, res.status === 'connected');
+            updateHostControlUI(res.controlMode, res.amHost, res.hostPeerId, res.status === 'connected');
             if (res.lastActionState) updateLastActionUI(res.lastActionState, res.peers);
 
             // If user has a room configured but background is not connected (disconnected or idle),
@@ -313,17 +313,26 @@ function toggleUIState(inRoom) {
 // True when we're a guest in a host-only room → remote-control buttons are locked.
 let hcmGuestLocked = false;
 
-function updateHostControlUI(controlMode, amHost, inRoom) {
+function updateHostControlUI(controlMode, amHost, hostPeerId, inRoom) {
     const card = elements.hostControlCard;
     if (!card) return;
-    if (!inRoom) {
+    const hostOnly = controlMode === 'host-only';
+    // The server only sends hostPeerId once it supports host control. Against an
+    // older relay it's absent → the feature is unavailable, so hide the card
+    // entirely instead of showing a misleading "Guest".
+    const serverSupportsHostControl = !!hostPeerId;
+    // Only show the card when it's actually meaningful:
+    //   - host: always (so they can enable/disable host-only)
+    //   - guest: only while host-only is active (explains why they can't control)
+    // A guest in a normal "everyone" room sees nothing — no confusing noise.
+    const show = inRoom && serverSupportsHostControl && (amHost || hostOnly);
+    if (!show) {
         card.style.display = 'none';
         hcmGuestLocked = false;
         setRemoteControlsLocked(false);
         return;
     }
     card.style.display = 'block';
-    const hostOnly = controlMode === 'host-only';
     if (elements.hostRoleBadge) {
         elements.hostRoleBadge.textContent = amHost ? (getMessage('BADGE_HOST') || 'Host') : (getMessage('BADGE_GUEST') || 'Guest');
         elements.hostRoleBadge.style.background = amHost ? 'var(--accent)' : 'var(--text-muted)';
@@ -1736,7 +1745,7 @@ chrome.runtime.onMessage.addListener((msg) => {
         if (msg.peers) detectPeerChanges(msg.peers);
     } else if (msg.type === 'CONTROL_MODE') {
         const inRoom = elements.sectionActive && elements.sectionActive.style.display === 'block';
-        updateHostControlUI(msg.controlMode, msg.amHost, inRoom);
+        updateHostControlUI(msg.controlMode, msg.amHost, msg.hostPeerId, inRoom);
     } else if (msg.type === 'CONNECTION_STATUS') {
         if (msg.status === 'connected' || msg.status === 'disconnected') {
             if (joinBtnTimeout) { clearTimeout(joinBtnTimeout); joinBtnTimeout = null; }
@@ -1754,7 +1763,7 @@ chrome.runtime.onMessage.addListener((msg) => {
                 if (res.peers) updatePeerList(res.peers);
                 if (res.lastActionState) updateLastActionUI(res.lastActionState, res.peers);
                 updatePingDisplay(res.ping);
-                updateHostControlUI(res.controlMode, res.amHost, true);
+                updateHostControlUI(res.controlMode, res.amHost, res.hostPeerId, true);
             });
         }
         if (msg.status === 'disconnected') {