From f620d101ba537d7bd01e00356e93a3331770930f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=8F=D0=BD=20=D0=9C=D0=B8=D0=BD=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Mon, 13 Dec 2021 13:46:05 -0600 Subject: [PATCH] fix: Fixes disable moderation sounds in meeting. (#10604) * fix: Fixes disable moderation sounds in meeting. Moderators in the meeting were sending presence update after one moderator turn it on, which even my result a inconsistent state and flipping the state between moderators several times. * squash: Adds option to disable reaction moderation. --- config.js | 3 ++ react/features/base/conference/actions.js | 6 ++- react/features/base/config/configWhitelist.js | 1 + react/features/reactions/middleware.js | 23 +++++++--- react/features/reactions/subscriber.js | 45 ------------------- react/features/settings/actions.js | 3 +- .../settings/components/web/ModeratorTab.js | 17 ++++--- react/features/settings/functions.js | 2 + 8 files changed, 41 insertions(+), 59 deletions(-) delete mode 100644 react/features/reactions/subscriber.js diff --git a/config.js b/config.js index 4a738548c..4cc26bf4c 100644 --- a/config.js +++ b/config.js @@ -80,6 +80,9 @@ var config = { // Disables the reactions feature. // disableReactions: true, + // Disables the reactions moderation feature. + // disableReactionsModeration: false, + // Disables polls feature. // disablePolls: false, diff --git a/react/features/base/conference/actions.js b/react/features/base/conference/actions.js index 3669d2e59..7cc1e972e 100644 --- a/react/features/base/conference/actions.js +++ b/react/features/base/conference/actions.js @@ -670,15 +670,17 @@ export function setFollowMe(enabled: boolean) { * Enables or disables the Mute reaction sounds feature. * * @param {boolean} muted - Whether or not reaction sounds should be muted for all participants. + * @param {boolean} updateBackend - Whether or not the moderator should notify all participants for the new setting. * @returns {{ * type: SET_START_REACTIONS_MUTED, * muted: boolean * }} */ -export function setStartReactionsMuted(muted: boolean) { +export function setStartReactionsMuted(muted: boolean, updateBackend: boolean = false) { return { type: SET_START_REACTIONS_MUTED, - muted + muted, + updateBackend }; } diff --git a/react/features/base/config/configWhitelist.js b/react/features/base/config/configWhitelist.js index cd16a86a5..38b16572e 100644 --- a/react/features/base/config/configWhitelist.js +++ b/react/features/base/config/configWhitelist.js @@ -108,6 +108,7 @@ export default [ 'disablePolls', 'disableProfile', 'disableReactions', + 'disableReactionsModeration', 'disableRecordAudioNotification', 'disableRemoteControl', 'disableRemoteMute', diff --git a/react/features/reactions/middleware.js b/react/features/reactions/middleware.js index e3be76ead..2d9623987 100644 --- a/react/features/reactions/middleware.js +++ b/react/features/reactions/middleware.js @@ -4,7 +4,11 @@ import { batch } from 'react-redux'; import { createReactionSoundsDisabledEvent, sendAnalytics } from '../analytics'; import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app'; -import { CONFERENCE_WILL_JOIN, setStartReactionsMuted } from '../base/conference'; +import { + CONFERENCE_WILL_JOIN, + SET_START_REACTIONS_MUTED, + setStartReactionsMuted +} from '../base/conference'; import { getParticipantById, getParticipantCount, @@ -49,11 +53,6 @@ import { import logger from './logger'; import { RAISE_HAND_SOUND_FILE } from './sounds'; -import './subscriber'; - - -declare var APP: Object; - /** * Middleware which intercepts Reactions actions to handle changes to the * visibility timeout of the Reactions. @@ -171,6 +170,18 @@ MiddlewareRegistry.register(store => next => action => { break; } + // Settings changed for mute reactions in the meeting + case SET_START_REACTIONS_MUTED: { + const state = getState(); + const { conference } = state['features/base/conference']; + const { muted, updateBackend } = action; + + if (conference && isLocalParticipantModerator(state) && updateBackend) { + conference.sendCommand(MUTE_REACTIONS_COMMAND, { attributes: { startReactionsMuted: Boolean(muted) } }); + } + break; + } + case SETTINGS_UPDATED: { const { soundsReactions } = getState()['features/base/settings']; diff --git a/react/features/reactions/subscriber.js b/react/features/reactions/subscriber.js deleted file mode 100644 index 4dd1bb59a..000000000 --- a/react/features/reactions/subscriber.js +++ /dev/null @@ -1,45 +0,0 @@ -// @flow - -import { getCurrentConference } from '../base/conference'; -import { isLocalParticipantModerator } from '../base/participants'; -import { StateListenerRegistry } from '../base/redux'; - -import { MUTE_REACTIONS_COMMAND } from './constants'; - -/** - * Subscribes to changes to the Mute Reaction Sounds setting for the local participant to - * notify remote participants of current user interface status. - * Changing newSelectedValue param to off, when feature is turned of so we can - * notify all listeners. - */ -StateListenerRegistry.register( - /* selector */ state => state['features/base/conference'].startReactionsMuted, - /* listener */ (newSelectedValue, store) => _sendMuteReactionsCommand(newSelectedValue || false, store)); - - -/** - * Sends the mute-reactions command, when a local property change occurs. - * - * @param {*} newSelectedValue - The changed selected value from the selector. - * @param {Object} store - The redux store. - * @private - * @returns {void} - */ -function _sendMuteReactionsCommand(newSelectedValue, store) { - const state = store.getState(); - const conference = getCurrentConference(state); - - if (!conference) { - return; - } - - // Only a moderator is allowed to send commands. - if (!isLocalParticipantModerator(state)) { - return; - } - - conference.sendCommand( - MUTE_REACTIONS_COMMAND, - { attributes: { startReactionsMuted: Boolean(newSelectedValue) } } - ); -} diff --git a/react/features/settings/actions.js b/react/features/settings/actions.js index e44dab768..2ce91e2ec 100644 --- a/react/features/settings/actions.js +++ b/react/features/settings/actions.js @@ -129,7 +129,8 @@ export function submitModeratorTab(newState: Object): Function { if (newState.startReactionsMuted !== currentState.startReactionsMuted) { batch(() => { - dispatch(setStartReactionsMuted(newState.startReactionsMuted)); + // updating settings we want to update and backend (notify the rest of the participants) + dispatch(setStartReactionsMuted(newState.startReactionsMuted, true)); dispatch(updateSettings({ soundsReactions: !newState.startReactionsMuted })); }); } diff --git a/react/features/settings/components/web/ModeratorTab.js b/react/features/settings/components/web/ModeratorTab.js index 01e7ea7f1..e1aa45f38 100644 --- a/react/features/settings/components/web/ModeratorTab.js +++ b/react/features/settings/components/web/ModeratorTab.js @@ -12,6 +12,11 @@ import { translate } from '../../../base/i18n'; export type Props = { ...$Exact, + /** + * + */ + disableReactionsModeration: boolean, + /** * Whether or not follow me is currently active (enabled by some other participant). */ @@ -142,6 +147,7 @@ class ModeratorTab extends AbstractDialogTab { */ _renderModeratorSettings() { const { + disableReactionsModeration, followMeActive, followMeEnabled, startAudioMuted, @@ -171,11 +177,12 @@ class ModeratorTab extends AbstractDialogTab { label = { t('settings.followMe') } name = 'follow-me' onChange = { this._onFollowMeEnabledChanged } /> - + { !disableReactionsModeration + && } ); diff --git a/react/features/settings/functions.js b/react/features/settings/functions.js index 495377b6a..ef0e8446f 100644 --- a/react/features/settings/functions.js +++ b/react/features/settings/functions.js @@ -120,6 +120,7 @@ export function getModeratorTabProps(stateful: Object | Function) { startVideoMutedPolicy, startReactionsMuted } = state['features/base/conference']; + const { disableReactionsModeration } = state['features/base/config']; const followMeActive = isFollowMeActive(state); const configuredTabs = interfaceConfig.SETTINGS_SECTIONS || []; @@ -131,6 +132,7 @@ export function getModeratorTabProps(stateful: Object | Function) { // The settings sections to display. return { showModeratorSettings, + disableReactionsModeration: Boolean(disableReactionsModeration), followMeActive: Boolean(conference && followMeActive), followMeEnabled: Boolean(conference && followMeEnabled), startReactionsMuted: Boolean(conference && startReactionsMuted),