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

ref(api): move conference join notification to middleware

This commit is contained in:
Leonard Kim 2019-06-25 17:58:38 -07:00 committed by Saúl Ibarra Corretgé
parent 13cfd61c83
commit 9d94257e79
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
conference.js
View File

@ -79,7 +79,6 @@ import {
import { showNotification } from './react/features/notifications'; import { showNotification } from './react/features/notifications';
import { import {
dominantSpeakerChanged, dominantSpeakerChanged,
getAvatarURLByParticipantId,
getLocalParticipant, getLocalParticipant,
getNormalizedDisplayName, getNormalizedDisplayName,
getParticipantById, getParticipantById,
@ -2278,18 +2277,6 @@ export default {
= APP.store.getState()['features/base/settings'].displayName; = APP.store.getState()['features/base/settings'].displayName;
APP.UI.changeDisplayName('localVideoContainer', displayName); APP.UI.changeDisplayName('localVideoContainer', displayName);
APP.API.notifyConferenceJoined(
this.roomName,
this._room.myUserId(),
{
displayName,
formattedDisplayName: appendSuffix(
displayName,
interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME),
avatarURL: getAvatarURLByParticipantId(
APP.store.getState(), this._room.myUserId())
}
);
}, },
/** /**

35
react/features/external-api/middleware.js
View File

@ -1,20 +1,28 @@
// @flow // @flow
import { CONFERENCE_FAILED } from '../base/conference'; import { CONFERENCE_FAILED, CONFERENCE_JOINED } from '../base/conference';
import { NOTIFY_CAMERA_ERROR, NOTIFY_MIC_ERROR } from '../base/devices'; import { NOTIFY_CAMERA_ERROR, NOTIFY_MIC_ERROR } from '../base/devices';
import { JitsiConferenceErrors } from '../base/lib-jitsi-meet'; import { JitsiConferenceErrors } from '../base/lib-jitsi-meet';
import {
getAvatarURLByParticipantId,
getLocalParticipant
} from '../base/participants';
import { MiddlewareRegistry } from '../base/redux'; import { MiddlewareRegistry } from '../base/redux';
import { appendSuffix } from '../display-name';
import { SUBMIT_FEEDBACK } from '../feedback'; import { SUBMIT_FEEDBACK } from '../feedback';
import { SET_FILMSTRIP_VISIBLE } from '../filmstrip'; import { SET_FILMSTRIP_VISIBLE } from '../filmstrip';
declare var APP: Object; declare var APP: Object;
declare var interfaceConfig: Object;
/** /**
* The middleware of the feature {@code external-api}. * The middleware of the feature {@code external-api}.
* *
* @returns {Function} * @returns {Function}
*/ */
MiddlewareRegistry.register((/* store */) => next => action => { MiddlewareRegistry.register(store => next => action => {
const result = next(action);
switch (action.type) { switch (action.type) {
case CONFERENCE_FAILED: { case CONFERENCE_FAILED: {
if (action.conference if (action.conference
@ -24,6 +32,27 @@ MiddlewareRegistry.register((/* store */) => next => action => {
break; break;
} }
case CONFERENCE_JOINED: {
const state = store.getState();
const { room } = state['features/base/conference'];
const { name, id } = getLocalParticipant(state);
APP.API.notifyConferenceJoined(
room,
id,
{
displayName: name,
formattedDisplayName: appendSuffix(
name,
interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME
),
avatarURL: getAvatarURLByParticipantId(state, id)
}
);
break;
}
case NOTIFY_CAMERA_ERROR: case NOTIFY_CAMERA_ERROR:
if (action.error) { if (action.error) {
APP.API.notifyOnCameraError( APP.API.notifyOnCameraError(
@ -46,5 +75,5 @@ MiddlewareRegistry.register((/* store */) => next => action => {
break; break;
} }
return next(action); return result;
}); });