Fix JitsiConference access

With so many abstractions called conference, I'm not surprised I made a
mistake and my reviewer didn't catch it.

As we are transitioning from remote participants identified by ID alone
to an ID-conference pair, the subsequent commits "Protect against late
PARTICIPANT_JOINED" and "Refine PARTICIPANT_LEFT for ID collisions"
caught the error.
This commit is contained in:
Lyubo Marinov 2018-05-28 20:43:28 -05:00 committed by Saúl Ibarra Corretgé
parent 11b7144ad0
commit fa9549582f
2 changed files with 9 additions and 6 deletions

View File

@ -306,7 +306,12 @@ export default class SharedVideoManager {
SHARED_VIDEO_CONTAINER_TYPE, self.sharedVideo); SHARED_VIDEO_CONTAINER_TYPE, self.sharedVideo);
APP.store.dispatch(participantJoined({ APP.store.dispatch(participantJoined({
conference: APP.conference,
// FIXME The cat is out of the bag already or rather _room is
// not private because it is used in multiple other places
// already such as AbstractPageReloadOverlay and
// JitsiMeetLogStorage.
conference: APP.conference._room,
id: self.url, id: self.url,
isBot: true, isBot: true,
name: 'YouTube' name: 'YouTube'
@ -517,7 +522,7 @@ export default class SharedVideoManager {
UIEvents.UPDATE_SHARED_VIDEO, null, 'removed'); UIEvents.UPDATE_SHARED_VIDEO, null, 'removed');
}); });
APP.store.dispatch(participantLeft(this.url, APP.conference)); APP.store.dispatch(participantLeft(this.url, APP.conference._room));
this.url = null; this.url = null;
this.isSharedVideoShown = false; this.isSharedVideoShown = false;

View File

@ -2,6 +2,7 @@
import throttle from 'lodash/throttle'; import throttle from 'lodash/throttle';
import { set } from '../redux';
import { showNotification } from '../../notifications'; import { showNotification } from '../../notifications';
import { import {
@ -113,10 +114,7 @@ export function localParticipantIdChanged(id) {
* }} * }}
*/ */
export function localParticipantJoined(participant = {}) { export function localParticipantJoined(participant = {}) {
return participantJoined({ return participantJoined(set(participant, 'local', true));
...participant,
local: true
});
} }
/** /**