remove group calling, fix video toggle visibility, fix empty Google setup container

- Removed all group call code (backend handlers, frontend logic,
WebSocket dispatch, HTML) — only 1-to-1 calling remains
- Video toggle button now properly shown/hidden in setupCallMedia
(visible during video calls, hidden during audio calls)
- Empty tab container during Google account setup is now hidden
(auth-tabs div hidden in showGoogleSetup, restored in showTab)

src/main.py

@@ -65,14 +65,6 @@ async def websocket_endpoint(websocket: WebSocket, token: str, db: Session = Dep
                 await manager.handle_ice_candidate(msg, user)
             elif msg_type == "call_end":
                 await manager.handle_call_end(msg, user)
-            elif msg_type == "group_call_start":
-                await manager.handle_group_call_start(msg, user, db)
-            elif msg_type == "group_call_accept":
-                await manager.handle_group_call_accept(msg, user, db)
-            elif msg_type == "group_call_leave":
-                await manager.handle_group_call_leave(msg, user)
-            elif msg_type == "group_call_end":
-                await manager.handle_group_call_end(msg, user)
 
     except WebSocketDisconnect:
         manager.disconnect(user.id)

src/static/app.js

@@ -34,12 +34,7 @@ const ICE_SERVERS = {
   ]
 };
 
-// ── Group Call State ──────────────────────────────────────────────────────────
-let activeGroupCallId = null;
-let activeGroupCallType = null;
-let groupCallParticipants = {}; // userId -> { display_name, avatar_color, pc, stream }
-let groupCallLocalStream = null;
-let groupCallRinging = false;
+
 
 // ── Bootstrap ───────────────────────────────────────────────────────────────
 
@@ -133,6 +128,7 @@ async function apiFetch(path, tok, method = "GET", body = null) {
 // ── Auth ─────────────────────────────────────────────────────────────────────
 
 function showTab(tab) {
+  document.getElementById("auth-tabs").classList.remove("hidden");
   document.getElementById("form-login").classList.toggle("hidden", tab !== "login");
   document.getElementById("form-register").classList.toggle("hidden", tab !== "register");
   document.getElementById("form-google-setup").classList.add("hidden");
@@ -213,8 +209,7 @@ function googleLogin() {
 }
 
 function showGoogleSetup() {
-  document.getElementById("tab-login").classList.add("hidden");
-  document.getElementById("tab-register").classList.add("hidden");
+  document.getElementById("auth-tabs").classList.add("hidden");
   document.getElementById("form-login").classList.add("hidden");
   document.getElementById("form-register").classList.add("hidden");
   document.getElementById("form-google-setup").classList.remove("hidden");
@@ -351,33 +346,13 @@ async function handleWsMessage(evt) {
   } else if (msg.type === "read_receipt") {
     handleReadReceipt(msg);
   } else if (msg.type === "call_offer") {
-    if (msg.group_id) {
-      handleGroupCallOffer(msg.from, msg.sdp);
-    } else {
-      handleCallOffer(msg);
-    }
+    handleCallOffer(msg);
   } else if (msg.type === "call_answer") {
-    if (msg.group_id) {
-      handleGroupCallAnswer(msg.from, msg.sdp);
-    } else {
-      handleCallAnswer(msg);
-    }
+    handleCallAnswer(msg);
   } else if (msg.type === "ice_candidate") {
     handleIceCandidate(msg);
   } else if (msg.type === "call_end") {
     handleCallEnd(msg);
-  } else if (msg.type === "group_call_started") {
-    handleGroupCallStarted(msg);
-  } else if (msg.type === "group_call_ringing") {
-    handleGroupCallRinging(msg);
-  } else if (msg.type === "group_call_joined") {
-    handleGroupCallJoined(msg);
-  } else if (msg.type === "group_participant_joined") {
-    handleGroupParticipantJoined(msg);
-  } else if (msg.type === "group_participant_left") {
-    handleGroupParticipantLeft(msg);
-  } else if (msg.type === "group_call_ended") {
-    handleGroupCallEnded(msg);
   }
 }
 
@@ -523,13 +498,8 @@ function hideIncomingCall() {
 }
 
 async function startCall(type) {
+  if (!currentChat || currentChat.type !== "dm" || !currentChat.other_user) return;
   document.getElementById("call-dropdown").classList.add("hidden");
-  if (!currentChat) return;
-  if (currentChat.type === "group") {
-    await startGroupCall(type);
-    return;
-  }
-  if (!currentChat.other_user) return;
   callType = type;
   callTarget = currentChat.other_user;
   callState = "calling";
@@ -568,8 +538,7 @@ async function startCall(type) {
 }
 
 function handleCallOffer(msg) {
-  if (msg.group_id) return;
-  if (callState || activeGroupCallId) {
+  if (callState) {
     ws.send(JSON.stringify({ type: "call_end", target_id: msg.from }));
     return;
   }
@@ -589,10 +558,6 @@ function handleCallOffer(msg) {
 
 async function acceptCall() {
   hideIncomingCall();
-  if (groupCallRinging) {
-    await acceptGroupCall();
-    return;
-  }
   callState = "connected";
   try {
     const constraints = { audio: true, video: callType === "video" };
@@ -632,10 +597,6 @@ async function acceptCall() {
 
 function rejectCall() {
   hideIncomingCall();
-  if (groupCallRinging) {
-    endGroupCall();
-    return;
-  }
   if (ws && ws.readyState === WebSocket.OPEN && callTarget) {
     ws.send(JSON.stringify({ type: "call_end", target_id: callTarget.id }));
   }
@@ -666,16 +627,9 @@ function handleCallEnd(msg) {
     }
     cleanupCall();
   }
-  if (activeGroupCallId) {
-    endGroupCall();
-  }
 }
 
 function endCall() {
-  if (activeGroupCallId) {
-    endGroupCall();
-    return;
-  }
   if (ws && ws.readyState === WebSocket.OPEN && callTarget) {
     ws.send(JSON.stringify({ type: "call_end", target_id: callTarget.id }));
   }
@@ -703,12 +657,15 @@ function setupCallMedia() {
   if (lv) lv.srcObject = localStream;
   const videoContent = document.getElementById("call-video-content");
   const audioContent = document.getElementById("call-audio-content");
+  const videoBtn = document.getElementById("call-video-btn");
   if (callType === "video") {
     if (videoContent) videoContent.classList.remove("hidden");
     if (audioContent) audioContent.classList.add("hidden");
+    if (videoBtn) videoBtn.classList.remove("hidden");
   } else {
     if (videoContent) videoContent.classList.add("hidden");
     if (audioContent) audioContent.classList.remove("hidden");
+    if (videoBtn) videoBtn.classList.add("hidden");
     const av = document.getElementById("call-audio-avatar");
     if (av) {
       av.textContent = callTarget.display_name[0].toUpperCase();
@@ -737,244 +694,6 @@ function toggleVideo() {
   }
 }
 
-// ── Group Call Functions ──────────────────────────────────────────────────────
-
-async function startGroupCall(type) {
-  document.getElementById("call-dropdown").classList.add("hidden");
-  if (activeGroupCallId) return;
-  activeGroupCallId = currentChat.id;
-  activeGroupCallType = type;
-  try {
-    groupCallLocalStream = await navigator.mediaDevices.getUserMedia({ audio: true, video: type === "video" });
-    ws.send(JSON.stringify({ type: "group_call_start", group_id: activeGroupCallId, call_type: type }));
-    showCallModal();
-    document.getElementById("call-status").textContent = "Calling everyone…";
-    document.getElementById("call-peer-name").textContent = currentChat.name || "Group Call";
-    document.getElementById("group-video-content").classList.remove("hidden");
-    document.getElementById("call-video-content").classList.add("hidden");
-    document.getElementById("call-audio-content").classList.add("hidden");
-    document.getElementById("call-video-btn").classList.remove("hidden");
-    const lv = document.getElementById("group-local-video");
-    if (lv) lv.srcObject = groupCallLocalStream;
-    showGroupParticipants();
-  } catch (e) {
-    console.error("startGroupCall error:", e);
-    endGroupCall();
-  }
-}
-
-function handleGroupCallStarted(msg) {
-  // We're the initiator — participant list tells us who's in the group
-  activeGroupCallId = msg.group_id;
-  showGroupCallUI();
-}
-
-function handleGroupCallRinging(msg) {
-  // Someone else started a call — show incoming notification
-  if (activeGroupCallId) { ws.send(JSON.stringify({ type: "group_call_end", group_id: msg.group_id })); return; }
-  activeGroupCallId = msg.group_id;
-  activeGroupCallType = msg.call_type;
-  groupCallRinging = true;
-  document.getElementById("incoming-caller-name").textContent = `${msg.initiator_name} started a group call`;
-  document.getElementById("incoming-call-type").textContent = msg.call_type === "video" ? "Video Call" : "Audio Call";
-  document.getElementById("incoming-call-type-icon").textContent = msg.call_type === "video" ? "📹" : "📞";
-  const av = document.getElementById("incoming-avatar");
-  av.textContent = msg.initiator_name[0].toUpperCase();
-  av.style.background = msg.initiator_avatar || "#6366f1";
-  showIncomingCall();
-}
-
-async function acceptGroupCall() {
-  hideIncomingCall();
-  if (!activeGroupCallId) return;
-  groupCallRinging = false;
-  try {
-    groupCallLocalStream = await navigator.mediaDevices.getUserMedia({ audio: true, video: activeGroupCallType === "video" });
-    ws.send(JSON.stringify({ type: "group_call_accept", group_id: activeGroupCallId }));
-    showCallModal();
-    document.getElementById("call-status").textContent = "Connecting…";
-    document.getElementById("call-peer-name").textContent = "Group Call";
-    setupGroupCallModal();
-  } catch (e) {
-    console.error("acceptGroupCall error:", e);
-    endGroupCall();
-  }
-}
-
-function handleGroupCallJoined(msg) {
-  // We joined successfully — create peer connections to existing participants
-  document.getElementById("call-status").textContent = "Connected";
-  for (const p of msg.participants) {
-    if (p.id !== me.id) {
-      createGroupPeerConnection(p.id, p.display_name, p.avatar_color, true);
-    }
-  }
-  showGroupParticipants();
-}
-
-function handleGroupParticipantJoined(msg) {
-  const uid = msg.user_id;
-  if (uid === me.id) return;
-  // Check if we already have a connection
-  if (groupCallParticipants[uid]) return;
-  // If we have a lower ID, send offer; otherwise wait for their offer
-  if (me.id < uid) {
-    createGroupPeerConnection(uid, msg.display_name, msg.avatar_color, true);
-  }
-  showGroupParticipants();
-}
-
-function handleGroupParticipantLeft(msg) {
-  closeGroupPeerConnection(msg.user_id);
-  showGroupParticipants();
-}
-
-function handleGroupCallEnded(msg) {
-  endGroupCall();
-  document.getElementById("call-status").textContent = "Call ended";
-  setTimeout(hideCallModal, 1500);
-}
-
-async function createGroupPeerConnection(uid, displayName, avatarColor, sendOffer) {
-  if (groupCallParticipants[uid]) return;
-  const pc = new RTCPeerConnection(ICE_SERVERS);
-  if (groupCallLocalStream) {
-    groupCallLocalStream.getTracks().forEach(t => pc.addTrack(t, groupCallLocalStream));
-  }
-  const stream = new MediaStream();
-  pc.ontrack = (event) => {
-    event.streams[0].getTracks().forEach(t => stream.addTrack(t));
-    const container = document.getElementById("group-remote-videos");
-    if (container) {
-      let vid = container.querySelector(`[data-uid="${uid}"]`);
-      if (!vid) {
-        showGroupParticipants();
-      } else {
-        vid.srcObject = stream;
-      }
-    }
-  };
-  pc.onicecandidate = (event) => {
-    if (event.candidate && ws && ws.readyState === WebSocket.OPEN) {
-      ws.send(JSON.stringify({ type: "ice_candidate", target_id: uid, candidate: event.candidate, group_id: activeGroupCallId }));
-    }
-  };
-  pc.oniceconnectionstatechange = () => {
-    if (pc.connectionState === "disconnected" || pc.connectionState === "failed") {
-      closeGroupPeerConnection(uid);
-    }
-  };
-  groupCallParticipants[uid] = { display_name: displayName, avatar_color: avatarColor, pc, stream };
-
-  if (sendOffer) {
-    try {
-      const offer = await pc.createOffer();
-      await pc.setLocalDescription(offer);
-      ws.send(JSON.stringify({ type: "call_offer", target_id: uid, sdp: pc.localDescription, group_id: activeGroupCallId }));
-    } catch (e) {
-      console.error("createOffer error:", e);
-    }
-  }
-  return pc;
-}
-
-function handleGroupCallOffer(uid, sdp) {
-  // Only create PC if we don't have one and we have a higher ID (we answer)
-  if (groupCallParticipants[uid]) {
-    // Existing PC, might be a renegotiation
-    const pc = groupCallParticipants[uid].pc;
-    if (pc.signalingState !== "stable") return;
-    pc.setRemoteDescription(new RTCSessionDescription(sdp)).catch(() => {});
-    return;
-  }
-  if (me.id < uid) return; // We should be sending offer, not receiving
-  createGroupPeerConnection(uid, "", "", false).then(async (pc) => {
-    if (!pc) return;
-    await pc.setRemoteDescription(new RTCSessionDescription(sdp));
-    const answer = await pc.createAnswer();
-    await pc.setLocalDescription(answer);
-    ws.send(JSON.stringify({ type: "call_answer", target_id: uid, sdp: pc.localDescription, group_id: activeGroupCallId }));
-  });
-}
-
-function handleGroupCallAnswer(uid, sdp) {
-  const p = groupCallParticipants[uid];
-  if (p && p.pc && p.pc.signalingState !== "closed") {
-    p.pc.setRemoteDescription(new RTCSessionDescription(sdp)).catch(() => {});
-  }
-}
-
-function closeGroupPeerConnection(uid) {
-  const p = groupCallParticipants[uid];
-  if (p) {
-    if (p.pc) p.pc.close();
-    if (p.stream) p.stream.getTracks().forEach(t => t.stop());
-    delete groupCallParticipants[uid];
-  }
-}
-
-function showGroupParticipants() {
-  const container = document.getElementById("group-remote-videos");
-  if (!container) return;
-  let html = "";
-  for (const [uid, p] of Object.entries(groupCallParticipants)) {
-    const name = p.display_name || "User";
-    html += `<div class="relative glass rounded-2xl overflow-hidden aspect-video flex items-center justify-center">
-      <video data-uid="${uid}" autoplay playsinline class="absolute inset-0 w-full h-full object-cover"></video>
-      <div class="absolute bottom-2 left-2 text-xs text-white/80 bg-black/40 px-2 py-0.5 rounded-lg">${escHtml(name)}</div>
-    </div>`;
-  }
-  if (!html) html = '<div class="col-span-full flex items-center justify-center text-gray-500 text-sm">Waiting for participants…</div>';
-  container.innerHTML = html;
-  // Attach streams to video elements
-  for (const [uid, p] of Object.entries(groupCallParticipants)) {
-    const vid = container.querySelector(`[data-uid="${uid}"]`);
-    if (vid && p.stream) vid.srcObject = p.stream;
-  }
-}
-
-function setupGroupCallModal() {
-  const lv = document.getElementById("group-local-video");
-  if (lv) lv.srcObject = groupCallLocalStream;
-  document.getElementById("group-video-content").classList.remove("hidden");
-  document.getElementById("call-video-content").classList.add("hidden");
-  document.getElementById("call-audio-content").classList.add("hidden");
-  document.getElementById("call-video-btn").classList.remove("hidden");
-  document.getElementById("call-status").textContent = "Connected";
-}
-
-function showGroupCallUI() {
-  showCallModal();
-  document.getElementById("call-status").textContent = "Connected";
-  document.getElementById("call-peer-name").textContent = currentChat?.name || "Group Call";
-  const lv = document.getElementById("group-local-video");
-  if (lv) lv.srcObject = groupCallLocalStream;
-  document.getElementById("group-video-content").classList.remove("hidden");
-  document.getElementById("call-video-content").classList.add("hidden");
-  document.getElementById("call-audio-content").classList.add("hidden");
-  document.getElementById("call-video-btn").classList.remove("hidden");
-  showGroupParticipants();
-}
-
-function endGroupCall() {
-  for (const uid of Object.keys(groupCallParticipants)) {
-    closeGroupPeerConnection(parseInt(uid));
-  }
-  groupCallParticipants = {};
-  if (groupCallLocalStream) {
-    groupCallLocalStream.getTracks().forEach(t => t.stop());
-    groupCallLocalStream = null;
-  }
-  if (activeGroupCallId && ws && ws.readyState === WebSocket.OPEN) {
-    ws.send(JSON.stringify({ type: groupCallRinging ? "group_call_end" : "group_call_leave", group_id: activeGroupCallId }));
-  }
-  activeGroupCallId = null;
-  activeGroupCallType = null;
-  groupCallRinging = false;
-  hideCallModal();
-  hideIncomingCall();
-}
-
 async function loadChats() {
   [conversations, groups] = await Promise.all([
     apiFetch("/chat/conversations"),
@@ -1080,7 +799,7 @@ async function openGroupChat(group) {
   document.getElementById("chat-avatar").style.background = full.avatar_color;
   document.getElementById("chat-name").textContent = full.name;
   document.getElementById("chat-sub").textContent = `${full.members.length} members`;
-  document.getElementById("call-btn").classList.remove("hidden");
+  document.getElementById("call-btn").classList.add("hidden");
   document.getElementById("call-dropdown").classList.add("hidden");
   document.getElementById("group-settings-btn").classList.remove("hidden");
 

src/static/index.html

@@ -48,7 +48,7 @@
 
     <div class="glass rounded-2xl p-8 shadow-2xl">
       <!-- Tabs -->
-      <div class="flex gap-1 mb-6 bg-white/5 p-1 rounded-xl">
+      <div id="auth-tabs" class="flex gap-1 mb-6 bg-white/5 p-1 rounded-xl">
         <button onclick="showTab('login')" id="tab-login" class="flex-1 py-2 rounded-lg text-sm font-medium transition-all glass-btn-active text-white">Sign In</button>
         <button onclick="showTab('register')" id="tab-register" class="flex-1 py-2 rounded-lg text-sm font-medium transition-all text-gray-400">Create Account</button>
       </div>
@@ -360,15 +360,6 @@
       <video id="local-video" autoplay playsinline muted class="w-full h-full object-cover"></video>
     </div>
   </div>
-  <!-- Group video content (multiple participants) -->
-  <div id="group-video-content" class="hidden flex-1 flex flex-col p-4">
-    <div id="group-remote-videos" class="flex-1 grid grid-cols-2 gap-3 auto-rows-[40%]"></div>
-    <div class="flex justify-center mt-3">
-      <div class="w-32 h-24 rounded-xl overflow-hidden border border-white/10">
-        <video id="group-local-video" autoplay playsinline muted class="w-full h-full object-cover"></video>
-      </div>
-    </div>
-  </div>
   <!-- Audio content -->
   <div id="call-audio-content" class="hidden flex-1 flex flex-col items-center justify-center gap-4">
     <div id="call-audio-avatar" class="w-28 h-28 rounded-full flex items-center justify-center text-white text-5xl font-semibold"></div>

src/ws_manager.py

@@ -1,6 +1,6 @@
 from fastapi import WebSocket
 from sqlalchemy.orm import Session
-from typing import Dict, Optional, List
+from typing import Dict, Optional
 import json
 from datetime import datetime
 
@@ -198,93 +198,4 @@ class ConnectionManager:
                         "read_by": sender.id
                     })
 
-    # ── Group Calls ────────────────────────────────────────────────────────────
-
-    active_group_calls: Dict[int, dict] = {}
-
-    async def handle_group_call_start(self, msg: dict, sender: User, db: Session):
-        group_id = msg.get("group_id")
-        call_type = msg.get("call_type", "audio")
-        member = db.query(GroupMember).filter(
-            GroupMember.group_id == group_id, GroupMember.user_id == sender.id
-        ).first()
-        if not member or group_id in self.active_group_calls:
-            return
-
-        members = db.query(GroupMember).filter(GroupMember.group_id == group_id).all()
-        member_users = []
-        for m in members:
-            u = db.query(User).filter(User.id == m.user_id).first()
-            if u:
-                member_users.append({"id": u.id, "display_name": u.display_name, "avatar_color": u.avatar_color})
-
-        self.active_group_calls[group_id] = {
-            "call_type": call_type,
-            "participants": [sender.id],
-            "member_ids": [m.user_id for m in members]
-        }
-
-        await self.send_to(sender.id, {
-            "type": "group_call_started", "group_id": group_id,
-            "call_type": call_type, "participants": member_users
-        })
-
-        for m in members:
-            if m.user_id != sender.id and m.user_id in self.active:
-                await self.send_to(m.user_id, {
-                    "type": "group_call_ringing", "group_id": group_id,
-                    "call_type": call_type, "initiator_id": sender.id,
-                    "initiator_name": sender.display_name,
-                    "initiator_avatar": sender.avatar_color
-                })
-
-    async def handle_group_call_accept(self, msg: dict, sender: User, db: Session):
-        group_id = msg.get("group_id")
-        call = self.active_group_calls.get(group_id)
-        if not call or sender.id in call["participants"]:
-            return
-        call["participants"].append(sender.id)
-
-        for pid in call["participants"]:
-            if pid != sender.id:
-                await self.send_to(pid, {
-                    "type": "group_participant_joined", "group_id": group_id,
-                    "user_id": sender.id, "display_name": sender.display_name,
-                    "avatar_color": sender.avatar_color
-                })
-
-        participant_list = []
-        for pid in call["participants"]:
-            if pid != sender.id:
-                u = db.query(User).filter(User.id == pid).first()
-                if u:
-                    participant_list.append({"id": u.id, "display_name": u.display_name, "avatar_color": u.avatar_color})
-
-        await self.send_to(sender.id, {
-            "type": "group_call_joined", "group_id": group_id, "participants": participant_list
-        })
-
-    async def handle_group_call_leave(self, msg: dict, sender: User):
-        group_id = msg.get("group_id")
-        call = self.active_group_calls.get(group_id)
-        if not call:
-            return
-        call["participants"] = [p for p in call["participants"] if p != sender.id]
-        for pid in call["participants"]:
-            await self.send_to(pid, {
-                "type": "group_participant_left", "group_id": group_id, "user_id": sender.id
-            })
-        if not call["participants"]:
-            del self.active_group_calls[group_id]
-
-    async def handle_group_call_end(self, msg: dict, sender: User):
-        group_id = msg.get("group_id")
-        call = self.active_group_calls.pop(group_id, None)
-        if not call:
-            return
-        for pid in call["participants"]:
-            if pid != sender.id:
-                await self.send_to(pid, {"type": "group_call_ended", "group_id": group_id})
-
-
 manager = ConnectionManager()