Merge branch 'main' into dbkr/postmessage_ptt_2

src/room/GroupCallLoader.jsx

@@ -19,12 +19,19 @@ import { useLoadGroupCall } from "./useLoadGroupCall";
 import { ErrorView, FullScreenView } from "../FullScreenView";
 import { usePageTitle } from "../usePageTitle";
 
-export function GroupCallLoader({ client, roomId, viaServers, children }) {
+export function GroupCallLoader({
+  client,
+  roomId,
+  viaServers,
+  createPtt,
+  children,
+}) {
   const { loading, error, groupCall } = useLoadGroupCall(
     client,
     roomId,
     viaServers,
-    true
+    true,
+    createPtt
   );
 
   usePageTitle(groupCall ? groupCall.room.name : "Loading...");

src/room/GroupCallView.jsx

@@ -61,7 +61,10 @@ export function GroupCallView({
 
   useEffect(() => {
     window.groupCall = groupCall;
-  }, [groupCall]);
+
+    // In embedded mode, bypass the lobby and just enter the call straight away
+    if (isEmbedded) groupCall.enter();
+  }, [groupCall, isEmbedded]);
 
   useSentryGroupCallHandler(groupCall);
 
@@ -128,24 +131,32 @@ export function GroupCallView({
   } else if (left) {
     return <CallEndedView client={client} />;
   } else {
-    return (
-      <LobbyView
-        client={client}
-        groupCall={groupCall}
-        hasLocalParticipant={hasLocalParticipant}
-        roomName={groupCall.room.name}
-        avatarUrl={avatarUrl}
-        state={state}
-        onInitLocalCallFeed={initLocalCallFeed}
-        localCallFeed={localCallFeed}
-        onEnter={enter}
-        microphoneMuted={microphoneMuted}
-        localVideoMuted={localVideoMuted}
-        toggleLocalVideoMuted={toggleLocalVideoMuted}
-        toggleMicrophoneMuted={toggleMicrophoneMuted}
-        roomId={roomId}
-        isEmbedded={isEmbedded}
-      />
-    );
+    if (isEmbedded) {
+      return (
+        <FullScreenView>
+          <h1>Loading room...</h1>
+        </FullScreenView>
+      );
+    } else {
+      return (
+        <LobbyView
+          client={client}
+          groupCall={groupCall}
+          hasLocalParticipant={hasLocalParticipant}
+          roomName={groupCall.room.name}
+          avatarUrl={avatarUrl}
+          state={state}
+          onInitLocalCallFeed={initLocalCallFeed}
+          localCallFeed={localCallFeed}
+          onEnter={enter}
+          microphoneMuted={microphoneMuted}
+          localVideoMuted={localVideoMuted}
+          toggleLocalVideoMuted={toggleLocalVideoMuted}
+          toggleMicrophoneMuted={toggleMicrophoneMuted}
+          roomId={roomId}
+          isEmbedded={isEmbedded}
+        />
+      );
+    }
   }
 }

src/room/RoomPage.jsx

@@ -29,9 +29,13 @@ export function RoomPage() {
 
   const { roomId: maybeRoomId } = useParams();
   const { hash, search } = useLocation();
-  const [viaServers, isEmbedded] = useMemo(() => {
+  const [viaServers, isEmbedded, isPtt] = useMemo(() => {
     const params = new URLSearchParams(search);
-    return [params.getAll("via"), params.has("embed")];
+    return [
+      params.getAll("via"),
+      params.has("embed"),
+      params.get("ptt") === "true",
+    ];
   }, [search]);
   const roomId = (maybeRoomId || hash || "").toLowerCase();
 
@@ -49,7 +53,12 @@ export function RoomPage() {
 
   return (
     <MediaHandlerProvider client={client}>
-      <GroupCallLoader client={client} roomId={roomId} viaServers={viaServers}>
+      <GroupCallLoader
+        client={client}
+        roomId={roomId}
+        viaServers={viaServers}
+        createPtt={isPtt}
+      >
         {(groupCall) => (
           <GroupCallView
             client={client}

src/room/useLoadGroupCall.js

@@ -53,7 +53,13 @@ async function fetchGroupCall(
   });
 }
 
-export function useLoadGroupCall(client, roomId, viaServers, createIfNotFound) {
+export function useLoadGroupCall(
+  client,
+  roomId,
+  viaServers,
+  createIfNotFound,
+  createPtt
+) {
   const [state, setState] = useState({
     loading: true,
     error: undefined,
@@ -79,7 +85,7 @@ export function useLoadGroupCall(client, roomId, viaServers, createIfNotFound) {
           isLocalRoomId(roomId)
         ) {
           const roomName = roomNameFromRoomId(roomId);
-          await createRoom(client, roomName);
+          await createRoom(client, roomName, createPtt);
           const groupCall = await fetchGroupCall(
             client,
             roomId,
@@ -102,7 +108,7 @@ export function useLoadGroupCall(client, roomId, viaServers, createIfNotFound) {
       .catch((error) =>
         setState((prevState) => ({ ...prevState, loading: false, error }))
       );
-  }, [client, roomId, state.reloadId, createIfNotFound, viaServers]);
+  }, [client, roomId, state.reloadId, createIfNotFound, viaServers, createPtt]);
 
   return state;
 }