BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21107 from JoVictorNunes/fix-restoring-audio-on-breakout-exit

Browse Source 
fix(audio): Returning from breakout does not always rejoin you in main room audio
This commit is contained in:
Gustavo Trott 2024-09-11 14:42:13 -03:00 committed by GitHub
commit 3460e869a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/breakout-join-confirmation-graphql/hooks.ts
View File

@ -2,26 +2,26 @@ import {
useEffect, useMemo, useRef, useState,
} from 'react';
import { useSubscription } from '@apollo/client';
import { GetIfUserJoinedBreakoutRoomResponse, getIfUserJoinedBreakoutRoom } from '../../breakout-room/breakout-room/queries';
import { GetIsUserCurrentlyInBreakoutRoomResponse, getIsUserCurrentlyInBreakoutRoom } from '../../breakout-room/breakout-room/queries';
type BreakoutCount = GetIfUserJoinedBreakoutRoomResponse;
type BreakoutCount = GetIsUserCurrentlyInBreakoutRoomResponse;
type Callback = () => void;
const useBreakoutExitObserver = () => {
const [joinedRooms, setJoinedRooms] = useState<number>(0);
const [numberOfCurrentRooms, setNumberOfCurrentRooms] = useState<number>(0);
const [observing, setObserving] = useState(false);
const callbacks = useRef<Map<string, Callback>>(new Map());
const oneTimeCallbacks = useRef<Callback[]>([]);
const { data: userJoinedBreakoutData } = useSubscription<BreakoutCount>(
getIfUserJoinedBreakoutRoom,
const { data: userIsCurrentlyInBreakoutRoomData } = useSubscription<BreakoutCount>(
getIsUserCurrentlyInBreakoutRoom,
{ skip: !observing },
);
const userJoinedRooms = userJoinedBreakoutData?.breakoutRoom_aggregate.aggregate.count ?? 0;
const numberOfCurrentRoomsGql = userIsCurrentlyInBreakoutRoomData?.breakoutRoom_aggregate.aggregate.count ?? 0;
useEffect(() => {
if (userJoinedRooms !== joinedRooms) {
setJoinedRooms((prev) => {
if (userJoinedRooms === 0 && prev > 0) {
if (numberOfCurrentRoomsGql !== numberOfCurrentRooms) {
setNumberOfCurrentRooms((prevNumberOfCurrentRooms) => {
if (numberOfCurrentRoomsGql === 0 && prevNumberOfCurrentRooms > 0) {
callbacks.current.forEach((value) => value());
oneTimeCallbacks.current.forEach((c) => c());
oneTimeCallbacks.current = [];
@ -29,10 +29,10 @@ const useBreakoutExitObserver = () => {
setObserving(false);
}
}
return userJoinedRooms;
return numberOfCurrentRoomsGql;
});
}
}, [userJoinedRooms]);
}, [numberOfCurrentRoomsGql]);
return useMemo(() => ({
resetCallbacks: () => {

10
bigbluebutton-html5/imports/ui/components/breakout-room/breakout-room/queries.ts
View File

@ -25,7 +25,7 @@ export interface GetBreakoutDataResponse {
breakoutRoom: BreakoutRoom[];
}
export interface GetIfUserJoinedBreakoutRoomResponse {
export interface GetIsUserCurrentlyInBreakoutRoomResponse {
breakoutRoom_aggregate:{
aggregate: {
count: number;
@ -58,9 +58,9 @@ export const getBreakoutData = gql`
}
`;
export const getIfUserJoinedBreakoutRoom = gql`
subscription getIdUserJoinedABreakout {
breakoutRoom_aggregate(where: {hasJoined: {_eq: true}}) {
export const getIsUserCurrentlyInBreakoutRoom = gql`
subscription getIsUserCurrentlyInBreakoutRoom {
breakoutRoom_aggregate(where: {isUserCurrentlyInRoom: {_eq: true}}) {
aggregate {
count
}
@ -70,5 +70,5 @@ export const getIfUserJoinedBreakoutRoom = gql`
export default {
getBreakoutData,
getIfUserJoinedBreakoutRoom,
getIsUserCurrentlyInBreakoutRoom,
};