haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fixes setting subject from url. 

There are occasions when role to moderator can change a little bit after joining the room, and initial try to set subject will silently be ignored if not moderator.
This commit is contained in:
damencho 2020-06-16 10:58:06 -05:00 committed by Дамян Минков
parent 430125a8bd
commit 929622b27c
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
react/features/base/conference/middleware.js
View File

@ -16,6 +16,7 @@ import {
getLocalParticipant,
getParticipantById,
getPinnedParticipant,
PARTICIPANT_ROLE,
PARTICIPANT_UPDATED,
PIN_PARTICIPANT
} from '../participants';
@ -602,13 +603,26 @@ function _trackAddedOrRemoved(store, next, action) {
* @private
* @returns {Object} The value returned by {@code next(action)}.
*/
function _updateLocalParticipantInConference({ getState }, next, action) {
function _updateLocalParticipantInConference({ dispatch, getState }, next, action) {
const { conference } = getState()['features/base/conference'];
const { participant } = action;
const result = next(action);
if (conference && participant.local && 'name' in participant) {
conference.setDisplayName(participant.name);
const localParticipant = getLocalParticipant(getState);
if (conference && participant.id === localParticipant.id) {
if ('name' in participant) {
conference.setDisplayName(participant.name);
}
const { pendingSubjectChange, subject } = getState()['features/base/conference'];
const isModerator = participant.role === PARTICIPANT_ROLE.MODERATOR;
// when local user role is updated to moderator and we have a pending subject change
// which was not reflected we need to set it (the first time we tried was before becoming moderator)
if (isModerator && pendingSubjectChange !== subject) {
dispatch(setSubject(pendingSubjectChange));
}
}
return result;