Shared video simplify logic and check from

modules/API/API.js

@@ -115,7 +115,7 @@ import { toggleScreenshotCaptureSummary } from '../../react/features/screenshot-
 import { isScreenshotCaptureEnabled } from '../../react/features/screenshot-capture/functions';
 import SettingsDialog from '../../react/features/settings/components/web/SettingsDialog';
 import { SETTINGS_TABS } from '../../react/features/settings/constants';
-import { playSharedVideo, stopSharedVideo } from '../../react/features/shared-video/actions.any';
+import { playSharedVideo, stopSharedVideo } from '../../react/features/shared-video/actions';
 import { extractYoutubeIdOrURL } from '../../react/features/shared-video/functions';
 import { setRequestingSubtitles, toggleRequestingSubtitles } from '../../react/features/subtitles/actions';
 import { isAudioMuteButtonDisabled } from '../../react/features/toolbox/functions';

react/features/shared-video/actionTypes.ts

@@ -28,17 +28,6 @@ export const RESET_SHARED_VIDEO_STATUS = 'RESET_SHARED_VIDEO_STATUS';
  */
 export const SET_CONFIRM_SHOW_VIDEO = 'SET_CONFIRM_SHOW_VIDEO';
 
-
-/**
- * The type of the action which signals to disable or enable the shared video
- * button.
- *
- * {
- *     type: SET_DISABLE_BUTTON
- * }
- */
-export const SET_DISABLE_BUTTON = 'SET_DISABLE_BUTTON';
-
 /**
  * The type of the action which sets an array of whitelisted urls.
  *

react/features/shared-video/components/native/AbstractVideoManager.ts

@@ -5,7 +5,7 @@ import { IReduxState, IStore } from '../../../app/types';
 import { getCurrentConference } from '../../../base/conference/functions';
 import { IJitsiConference } from '../../../base/conference/reducer';
 import { getLocalParticipant } from '../../../base/participants/functions';
-import { setSharedVideoStatus } from '../../actions.any';
+import { setSharedVideoStatus } from '../../actions';
 import { PLAYBACK_STATUSES } from '../../constants';
 
 /**

react/features/shared-video/components/native/SharedVideoButton.ts

@@ -7,7 +7,7 @@ import { translate } from '../../../base/i18n/functions';
 import { IconPlay } from '../../../base/icons/svg';
 import { getLocalParticipant } from '../../../base/participants/functions';
 import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
-import { toggleSharedVideo } from '../../actions.native';
+import { toggleSharedVideo } from '../../actions';
 import { isSharingStatus } from '../../functions';
 
 /**

react/features/shared-video/components/web/AbstractVideoManager.ts

@@ -15,7 +15,7 @@ import { showWarningNotification } from '../../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../../notifications/constants';
 import { dockToolbox } from '../../../toolbox/actions';
 import { muteLocal } from '../../../video-menu/actions.any';
-import { setSharedVideoStatus, stopSharedVideo } from '../../actions.any';
+import { setSharedVideoStatus, stopSharedVideo } from '../../actions';
 import { PLAYBACK_STATUSES } from '../../constants';
 
 const logger = Logger.getLogger(__filename);

react/features/shared-video/components/web/SharedVideoButton.ts

@@ -3,8 +3,9 @@ import { connect } from 'react-redux';
 import { IReduxState } from '../../../app/types';
 import { translate } from '../../../base/i18n/functions';
 import { IconPlay } from '../../../base/icons/svg';
+import { getLocalParticipant } from '../../../base/participants/functions';
 import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
-import { toggleSharedVideo } from '../../actions.any';
+import { toggleSharedVideo } from '../../actions';
 import { isSharingStatus } from '../../functions';
 
 interface IProps extends AbstractButtonProps {
@@ -83,16 +84,14 @@ class SharedVideoButton extends AbstractButton<IProps> {
  * @returns {IProps}
  */
 function _mapStateToProps(state: IReduxState) {
-    const {
-        disabled: sharedVideoBtnDisabled,
-        status: sharedVideoStatus
-    } = state['features/shared-video'];
+    const { ownerId, status: sharedVideoStatus } = state['features/shared-video'];
+    const localParticipantId = getLocalParticipant(state)?.id;
+    const isSharing = isSharingStatus(sharedVideoStatus ?? '');
 
     return {
-        _isDisabled: Boolean(sharedVideoBtnDisabled),
-        _sharingVideo: isSharingStatus(sharedVideoStatus ?? '')
+        _isDisabled: isSharing && ownerId !== localParticipantId,
+        _sharingVideo: isSharing
     };
 }
 
-
 export default translate(connect(_mapStateToProps)(SharedVideoButton));

react/features/shared-video/middleware.any.ts → react/features/shared-video/middleware.ts

@@ -22,7 +22,7 @@ import {
     setAllowedUrlDomians,
     setSharedVideoStatus,
     showConfirmPlayingDialog
-} from './actions.any';
+} from './actions';
 import {
     DEFAULT_ALLOWED_URL_DOMAINS,
     PLAYBACK_START,
@@ -55,27 +55,41 @@ MiddlewareRegistry.register(store => next => action => {
 
         conference.addCommandListener(SHARED_VIDEO,
             ({ value, attributes }: { attributes: {
-                from: string; muted: string; state: string; time: string; }; value: string; }) => {
+                muted: string; state: string; time: string; }; value: string; },
+            from: string) => {
                 const state = getState();
-
-                const { from } = attributes;
                 const sharedVideoStatus = attributes.state;
 
+                const { ownerId } = state['features/shared-video'];
+
+                if (ownerId && ownerId !== from) {
+                    logger.warn(
+                        `User with id: ${from} sent shared video command: ${sharedVideoStatus} while we are playing.`);
+
+                    return;
+                }
+
                 if (isSharingStatus(sharedVideoStatus)) {
                     // confirmShowVideo is undefined the first time we receive
                     // when confirmShowVideo is false we ignore everything except stop that resets it
-                    if (getState()['features/shared-video'].confirmShowVideo === false) {
+                    if (state['features/shared-video'].confirmShowVideo === false) {
                         return;
                     }
 
-                    if (isURLAllowedForSharedVideo(value, getState()['features/shared-video'].allowedUrlDomains, true)
+                    if (isURLAllowedForSharedVideo(value, state['features/shared-video'].allowedUrlDomains, true)
                         || localParticipantId === from
-                        || getState()['features/shared-video'].confirmShowVideo) { // if confirmed skip asking again
-                        handleSharingVideoStatus(store, value, attributes, conference);
+                        || state['features/shared-video'].confirmShowVideo) { // if confirmed skip asking again
+                        handleSharingVideoStatus(store, value, {
+                            ...attributes,
+                            from
+                        }, conference);
                     } else {
-                        dispatch(showConfirmPlayingDialog(getParticipantDisplayName(getState(), from), () => {
+                        dispatch(showConfirmPlayingDialog(getParticipantDisplayName(state, from), () => {
 
-                            handleSharingVideoStatus(store, value, attributes, conference);
+                            handleSharingVideoStatus(store, value, {
+                                ...attributes,
+                                from
+                            }, conference);
 
                             return true; // on mobile this is used to close the dialog
                         }));
@@ -87,11 +101,11 @@ MiddlewareRegistry.register(store => next => action => {
                 if (sharedVideoStatus === 'stop') {
                     const videoParticipant = getParticipantById(state, value);
 
-                    if (getState()['features/shared-video'].confirmShowVideo === false) {
+                    if (state['features/shared-video'].confirmShowVideo === false) {
                         dispatch(showWarningNotification({
                             titleKey: 'dialog.shareVideoLinkStopped',
                             titleArguments: {
-                                name: getParticipantDisplayName(getState(), from)
+                                name: getParticipantDisplayName(state, from)
                             }
                         }, NOTIFICATION_TIMEOUT_TYPE.LONG));
                     }

react/features/shared-video/reducer.ts

@@ -4,7 +4,6 @@ import {
     RESET_SHARED_VIDEO_STATUS,
     SET_ALLOWED_URL_DOMAINS,
     SET_CONFIRM_SHOW_VIDEO,
-    SET_DISABLE_BUTTON,
     SET_SHARED_VIDEO_STATUS
 } from './actionTypes';
 import { DEFAULT_ALLOWED_URL_DOMAINS } from './constants';
@@ -16,7 +15,6 @@ const initialState = {
 export interface ISharedVideoState {
     allowedUrlDomains: Array<string>;
     confirmShowVideo?: boolean;
-    disabled?: boolean;
     muted?: boolean;
     ownerId?: string;
     status?: string;
@@ -30,7 +28,7 @@ export interface ISharedVideoState {
  */
 ReducerRegistry.register<ISharedVideoState>('features/shared-video',
 (state = initialState, action): ISharedVideoState => {
-    const { videoUrl, status, time, ownerId, disabled, muted, volume } = action;
+    const { videoUrl, status, time, ownerId, muted, volume } = action;
 
     switch (action.type) {
     case RESET_SHARED_VIDEO_STATUS:
@@ -55,12 +53,6 @@ ReducerRegistry.register<ISharedVideoState>('features/shared-video',
             volume
         };
 
-    case SET_DISABLE_BUTTON:
-        return {
-            ...state,
-            disabled
-        };
-
     case SET_ALLOWED_URL_DOMAINS: {
         return {
             ...state,

react/features/video-menu/components/web/FakeParticipantContextMenu.tsx

@@ -9,7 +9,7 @@ import { isWhiteboardParticipant } from '../../../base/participants/functions';
 import { IParticipant } from '../../../base/participants/types';
 import ContextMenu from '../../../base/ui/components/web/ContextMenu';
 import ContextMenuItemGroup from '../../../base/ui/components/web/ContextMenuItemGroup';
-import { stopSharedVideo } from '../../../shared-video/actions.any';
+import { stopSharedVideo } from '../../../shared-video/actions';
 import { getParticipantMenuButtonsWithNotifyClick, showOverflowDrawer } from '../../../toolbox/functions.web';
 import { NOTIFY_CLICK_MODE } from '../../../toolbox/types';
 import { setWhiteboardOpen } from '../../../whiteboard/actions';