diff --git a/app/src/App.js b/app/src/App.js index 0ff6749..2b7a003 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -46,7 +46,6 @@ function hboClickFix(ev) { ev.preventDefault(); ev.stopPropagation(); ev.stopImmediatePropagation(); - console.log('cc'); } } @@ -95,7 +94,6 @@ const App = () => { ev.preventDefault(); ev.stopPropagation(); ev.stopImmediatePropagation(); - console.log('cc'); } }, { capture: true } diff --git a/app/src/CallManager.js b/app/src/CallManager.js index 8a93359..bfc51d7 100644 --- a/app/src/CallManager.js +++ b/app/src/CallManager.js @@ -95,7 +95,7 @@ export default class CallManager { async leaveCall() { VoxeetSDK.conference.leave().then(() => { VoxeetSDK.session.close(); - this.listener({ onCall: false, callActionPending: false }); + this.listener({ onCall: false, muted: false, callActionPending: false }); }); } async openSession() { @@ -114,13 +114,23 @@ export default class CallManager { } return true; } + async usersListHandle() { + var usersOnCall = {}; + VoxeetSDK.conference.participants.forEach((v, k, m) => { + usersOnCall[k] = v; + }); + this.listener({ usersOnCall }); + } async initialize() { + VoxeetSDK.conference.on('participantAdded', () => this.usersListHandle()); + VoxeetSDK.conference.on('participantUpdated', () => this.usersListHandle()); + VoxeetSDK.conference.on('joined', () => { - this.listener({ onCall: true, callActionPending: false, voxeet: VoxeetSDK }); + this.listener({ onCall: true, callActionPending: false }); }); VoxeetSDK.conference.on('left', () => { - this.listener({ onCall: false, callActionPending: false, voxeet: null }); + this.listener({ onCall: false, callActionPending: false, usersOnCall: {} }); }); VoxeetSDK.conference.on('streamAdded', (participant, stream) => { @@ -134,10 +144,12 @@ export default class CallManager { voiceNode.classList.add('voxeetAudioOut'); document.body.appendChild(voiceNode); } + this.listener({ callActionPending: false }); }); VoxeetSDK.conference.on('streamRemoved', (participant, stream) => { if (document.getElementById(participant.id)) document.getElementById(participant.id).remove(); + this.listener({ callActionPending: false }); }); if ( diff --git a/app/src/Chat.js b/app/src/Chat.js index 08b274e..ca513cf 100644 --- a/app/src/Chat.js +++ b/app/src/Chat.js @@ -71,6 +71,7 @@ import Create from './Create'; import { goTo } from 'route-lite'; import CallManager from './CallManager'; import VideoListener from './VideoListener'; +import VoxeetSDK from '@voxeet/voxeet-web-sdk'; const giphyFetch = new GiphyFetch('ojJbIMUN6XRMn4mHiFFav3rMCpXUg8sq'); const alerts = [ @@ -90,6 +91,7 @@ export default class Chat extends Component { newMessage: '', admin: null, users: [], + usersOnCall: {}, gif: false, onCall: false, muted: false, @@ -310,6 +312,7 @@ export default class Chat extends Component { allowChatNotification, users, callActionPending, + usersOnCall, } = this.state; return (