Add ptt URL param to control what mode rooms are created in
This commit is contained in:
parent
cb34b1634d
commit
32907764b3
3 changed files with 30 additions and 8 deletions
|
@ -19,12 +19,19 @@ import { useLoadGroupCall } from "./useLoadGroupCall";
|
||||||
import { ErrorView, FullScreenView } from "../FullScreenView";
|
import { ErrorView, FullScreenView } from "../FullScreenView";
|
||||||
import { usePageTitle } from "../usePageTitle";
|
import { usePageTitle } from "../usePageTitle";
|
||||||
|
|
||||||
export function GroupCallLoader({ client, roomId, viaServers, children }) {
|
export function GroupCallLoader({
|
||||||
|
client,
|
||||||
|
roomId,
|
||||||
|
viaServers,
|
||||||
|
createPtt,
|
||||||
|
children,
|
||||||
|
}) {
|
||||||
const { loading, error, groupCall } = useLoadGroupCall(
|
const { loading, error, groupCall } = useLoadGroupCall(
|
||||||
client,
|
client,
|
||||||
roomId,
|
roomId,
|
||||||
viaServers,
|
viaServers,
|
||||||
true
|
true,
|
||||||
|
createPtt
|
||||||
);
|
);
|
||||||
|
|
||||||
usePageTitle(groupCall ? groupCall.room.name : "Loading...");
|
usePageTitle(groupCall ? groupCall.room.name : "Loading...");
|
||||||
|
|
|
@ -29,9 +29,13 @@ export function RoomPage() {
|
||||||
|
|
||||||
const { roomId: maybeRoomId } = useParams();
|
const { roomId: maybeRoomId } = useParams();
|
||||||
const { hash, search } = useLocation();
|
const { hash, search } = useLocation();
|
||||||
const [viaServers, isEmbedded] = useMemo(() => {
|
const [viaServers, isEmbedded, isPtt] = useMemo(() => {
|
||||||
const params = new URLSearchParams(search);
|
const params = new URLSearchParams(search);
|
||||||
return [params.getAll("via"), params.has("embed")];
|
return [
|
||||||
|
params.getAll("via"),
|
||||||
|
params.has("embed"),
|
||||||
|
params.get("ptt") === "true",
|
||||||
|
];
|
||||||
}, [search]);
|
}, [search]);
|
||||||
const roomId = (maybeRoomId || hash || "").toLowerCase();
|
const roomId = (maybeRoomId || hash || "").toLowerCase();
|
||||||
|
|
||||||
|
@ -49,7 +53,12 @@ export function RoomPage() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MediaHandlerProvider client={client}>
|
<MediaHandlerProvider client={client}>
|
||||||
<GroupCallLoader client={client} roomId={roomId} viaServers={viaServers}>
|
<GroupCallLoader
|
||||||
|
client={client}
|
||||||
|
roomId={roomId}
|
||||||
|
viaServers={viaServers}
|
||||||
|
createPtt={isPtt}
|
||||||
|
>
|
||||||
{(groupCall) => (
|
{(groupCall) => (
|
||||||
<GroupCallView
|
<GroupCallView
|
||||||
client={client}
|
client={client}
|
||||||
|
|
|
@ -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({
|
const [state, setState] = useState({
|
||||||
loading: true,
|
loading: true,
|
||||||
error: undefined,
|
error: undefined,
|
||||||
|
@ -79,7 +85,7 @@ export function useLoadGroupCall(client, roomId, viaServers, createIfNotFound) {
|
||||||
isLocalRoomId(roomId)
|
isLocalRoomId(roomId)
|
||||||
) {
|
) {
|
||||||
const roomName = roomNameFromRoomId(roomId);
|
const roomName = roomNameFromRoomId(roomId);
|
||||||
await createRoom(client, roomName);
|
await createRoom(client, roomName, createPtt);
|
||||||
const groupCall = await fetchGroupCall(
|
const groupCall = await fetchGroupCall(
|
||||||
client,
|
client,
|
||||||
roomId,
|
roomId,
|
||||||
|
@ -102,7 +108,7 @@ export function useLoadGroupCall(client, roomId, viaServers, createIfNotFound) {
|
||||||
.catch((error) =>
|
.catch((error) =>
|
||||||
setState((prevState) => ({ ...prevState, loading: false, error }))
|
setState((prevState) => ({ ...prevState, loading: false, error }))
|
||||||
);
|
);
|
||||||
}, [client, roomId, state.reloadId, createIfNotFound, viaServers]);
|
}, [client, roomId, state.reloadId, createIfNotFound, viaServers, createPtt]);
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue