Pass through pending media source

Author: samuelmaddock

packages/metastream-app/src/components/GameLobby.tsx

@@ -298,7 +298,7 @@ class _GameLobby extends React.Component<PrivateProps, IState> {
       this.props.clearPendingMedia()
       this.props.sendMediaRequest({
         ...pendingMedia,
-        source: 'pending',
+        source: pendingMedia.source || 'pending',
         immediate: this.props.host
       })
     }

packages/metastream-app/src/containers/HomePage.tsx

@@ -10,6 +10,7 @@ import { replace } from 'react-router-redux'
 import { localUserId } from 'network'
 import { setPendingMedia } from 'lobby/actions/mediaPlayer'
 import { SEC2MS } from 'utils/math'
+import { PendingMedia } from 'lobby/reducers/mediaPlayer'
 
 interface IProps extends RouteComponentProps<any> {}
 
@@ -20,7 +21,7 @@ interface IConnectedProps {
 
 interface DispatchProps {
   showInstallPrompt(): void
-  setPendingMedia(url: string, time?: number): void
+  setPendingMedia(media: PendingMedia): void
 }
 
 function mapStateToProps(state: IAppState): IConnectedProps {
@@ -35,8 +36,8 @@ const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({
   showInstallPrompt() {
     dispatch({ type: SHOW_INSTALL_PROMPT })
   },
-  setPendingMedia(url, time) {
-    dispatch(setPendingMedia({ url, time }))
+  setPendingMedia(media: PendingMedia) {
+    dispatch(setPendingMedia(media))
     dispatch(replace({ pathname: `/join/${localUserId()}`, search: '' }))
   }
 })
@@ -50,9 +51,10 @@ class _HomePage extends Component<PrivateProps> {
 
     const url = params.get('url')
     const time = parseInt(params.get('t') || '', 10) || undefined
+    const source = params.get('source') || undefined
 
     if (url) {
-      this.props.setPendingMedia(url, time ? time * SEC2MS : undefined)
+      this.props.setPendingMedia({ url, time: time ? time * SEC2MS : undefined, source })
     }
   }
 

packages/metastream-app/src/index.tsx

@@ -39,8 +39,8 @@ function onMessage(event: MessageEvent) {
   switch (data.type) {
     case 'metastream-extension-request':
       if (typeof data.payload === 'object') {
-        const { url, time } = data.payload
-        store.dispatch(setPendingMedia({ url, time: time ? time * SEC2MS : undefined }))
+        const { url, time, source } = data.payload
+        store.dispatch(setPendingMedia({ url, time: time ? time * SEC2MS : undefined, source }))
       }
       break
   }

packages/metastream-app/src/lobby/reducers/mediaPlayer.ts

@@ -65,6 +65,7 @@ export interface IMediaItem {
 export interface PendingMedia {
   url: string
   time?: number
+  source?: string
 }
 
 export const enum RepeatMode {