Briq/multiparty-meeting
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add images to chat

Browse Source
This commit is contained in:
Torjus
2018-07-18 12:00:55 +02:00
parent 977ffd9d24
commit c416d0c402
9 changed files with 94 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/redux/reducers/chatmessages.js
+1 -3
View File
@@ -3,9 +3,7 @@ import
createNewMessage
} from './helper';
const initialState = [];
const chatmessages = (state = initialState, action) =>
const chatmessages = (state = [], action) =>
{
switch (action.type)
{
app/lib/redux/reducers/helper.js
+4 -3
View File
@@ -1,10 +1,11 @@
export function createNewMessage(text, sender, name)
export function createNewMessage(text, sender, name, picture)
{
return {
type : 'message',
text,
time : Date.now(),
name,
sender
sender,
picture
};
}
}
app/lib/redux/reducers/me.js
+7 -1
View File
@@ -21,7 +21,8 @@ const initialState =
audioOnlyInProgress : false,
raiseHand : false,
raiseHandInProgress : false,
restartIceInProgress : false
restartIceInProgress : false,
picture : null
};
const me = (state = initialState, action) =>
@@ -164,6 +165,11 @@ const me = (state = initialState, action) =>
return { ...state, restartIceInProgress: flag };
}
case 'SET_PICTURE':
{
return { ...state, picture: action.payload.picture };
}
default:
return state;
}
app/lib/redux/reducers/peers.js
+55 -95
View File
@@ -1,126 +1,86 @@
const initialState = {};
import omit from 'lodash/omit';
const peers = (state = initialState, action) =>
const peer = (state, action) =>
{
switch (action.type)
{
case 'ADD_PEER':
return action.payload.peer;
case 'SET_PEER_DISPLAY_NAME':
return { ...state, displayName: action.payload.displayName };
case 'SET_PEER_VIDEO_IN_PROGRESS':
return { ...state, peerVideoInProgress: action.payload.flag };
case 'SET_PEER_AUDIO_IN_PROGRESS':
return { ...state, peerAudioInProgress: action.payload.flag };
case 'SET_PEER_SCREEN_IN_PROGRESS':
return { ...state, peerScreenInProgress: action.payload.flag };
case 'SET_PEER_RAISE_HAND_STATE':
return { ...state, raiseHandState: action.payload.raiseHandState };
case 'ADD_CONSUMER':
{
const consumers = [ ...state.consumers, action.payload.consumer.id ];
return { ...state, consumers };
}
case 'REMOVE_CONSUMER':
{
const consumers = state.consumers.filter((consumer) => consumer !== action.payload.consumerId);
return { ...state, consumers };
}
default:
return state;
}
};
const peers = (state = {}, action) =>
{
switch (action.type)
{
case 'ADD_PEER':
{
const { peer } = action.payload;
return { ...state, [peer.name]: peer };
return { ...state, [action.payload.peer.name]: peer(undefined, action) };
}
case 'REMOVE_PEER':
{
const { peerName } = action.payload;
const newState = { ...state };
delete newState[peerName];
return newState;
return omit(state, [ action.payload.peerName ]);
}
case 'SET_PEER_DISPLAY_NAME':
{
const { displayName, peerName } = action.payload;
const peer = state[peerName];
if (!peer)
throw new Error('no Peer found');
const newPeer = { ...peer, displayName };
return { ...state, [newPeer.name]: newPeer };
}
case 'SET_PEER_VIDEO_IN_PROGRESS':
{
const { peerName, flag } = action.payload;
const peer = state[peerName];
if (!peer)
throw new Error('no Peer found');
const newPeer = { ...peer, peerVideoInProgress: flag };
return { ...state, [newPeer.name]: newPeer };
}
case 'SET_PEER_AUDIO_IN_PROGRESS':
{
const { peerName, flag } = action.payload;
const peer = state[peerName];
if (!peer)
throw new Error('no Peer found');
const newPeer = { ...peer, peerAudioInProgress: flag };
return { ...state, [newPeer.name]: newPeer };
}
case 'SET_PEER_SCREEN_IN_PROGRESS':
{
const { peerName, flag } = action.payload;
const peer = state[peerName];
if (!peer)
throw new Error('no Peer found');
const newPeer = { ...peer, peerScreenInProgress: flag };
return { ...state, [newPeer.name]: newPeer };
}
case 'SET_PEER_RAISE_HAND_STATE':
{
const { peerName, raiseHandState } = action.payload;
const peer = state[peerName];
if (!peer)
throw new Error('no Peer found');
const newPeer = { ...peer, raiseHandState };
return { ...state, [newPeer.name]: newPeer };
}
case 'ADD_CONSUMER':
{
const { consumer, peerName } = action.payload;
const peer = state[peerName];
const oldPeer = state[action.payload.peerName];
if (!peer)
throw new Error('no Peer found for new Consumer');
if (!oldPeer)
{
throw new Error('no Peer found');
}
const newConsumers = [ ...peer.consumers, consumer.id ];
const newPeer = { ...peer, consumers: newConsumers };
return { ...state, [newPeer.name]: newPeer };
return { ...state, [oldPeer.name]: peer(oldPeer, action) };
}
case 'REMOVE_CONSUMER':
{
const { consumerId, peerName } = action.payload;
const peer = state[peerName];
const oldPeer = state[action.payload.peerName];
// NOTE: This means that the Peer was closed before, so it's ok.
if (!peer)
if (!oldPeer)
return state;
const idx = peer.consumers.indexOf(consumerId);
if (idx === -1)
throw new Error('Consumer not found');
const newConsumers = peer.consumers.slice();
newConsumers.splice(idx, 1);
const newPeer = { ...peer, consumers: newConsumers };
return { ...state, [newPeer.name]: newPeer };
return { ...state, [oldPeer.name]: peer(oldPeer, action) };
}
default:
app/lib/redux/requestActions.js
+2 -2
View File
@@ -184,9 +184,9 @@ export const installExtension = () =>
};
};
export const sendChatMessage = (text, name) =>
export const sendChatMessage = (text, name, picture) =>
{
const message = createNewMessage(text, 'response', name);
const message = createNewMessage(text, 'response', name, picture);
return {
type : 'SEND_CHAT_MESSAGE',
app/lib/redux/stateActions.js
+6
View File
@@ -418,3 +418,9 @@ export const dropMessages = () =>
type : 'DROP_MESSAGES'
};
};
export const setPicture = (picture) =>
({
type : 'SET_PICTURE',
payload : { picture }
});