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

Combined some socket request code

master
Håvar Aambø Fosstveit 2018-10-19 11:28:17 +02:00
parent a7340fa155
commit 2c6b33c2b8
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/lib/RoomClient.js
View File

@ -271,14 +271,17 @@ export default class RoomClient
}); });
} }
getChatHistory() getServerHistory()
{ {
logger.debug('getChatHistory()'); logger.debug('getServerHistory()');
return this.sendRequest('chat-history') return this.sendRequest('server-history')
.then((response) => .then((response) =>
{ {
const { chatHistory } = response; const {
chatHistory,
fileHistory
} = response;
if (chatHistory.length > 0) if (chatHistory.length > 0)
{ {
@ -286,27 +289,6 @@ export default class RoomClient
this._dispatch( this._dispatch(
stateActions.addChatHistory(chatHistory)); stateActions.addChatHistory(chatHistory));
} }
})
.catch((error) =>
{
logger.error('getChatHistory() | failed: %o', error);
this._dispatch(requestActions.notify(
{
type : 'error',
text : `Could not get chat history: ${error}`
}));
});
}
getFileHistory()
{
logger.debug('getFileHistory()');
return this.sendRequest('file-history')
.then((response) =>
{
const { fileHistory } = response;
if (fileHistory.length > 0) if (fileHistory.length > 0)
{ {
@ -317,11 +299,12 @@ export default class RoomClient
}) })
.catch((error) => .catch((error) =>
{ {
logger.error('getFileHistory() | failed: %o', error); logger.error('getServerHistory() | failed: %o', error);
this._dispatch(requestActions.notify({ this._dispatch(requestActions.notify(
{
type : 'error', type : 'error',
text : 'Could not get file history' text : `Could not get chat history: ${error}`
})); }));
}); });
} }
@ -1329,8 +1312,7 @@ export default class RoomClient
// Clean all the existing notifcations. // Clean all the existing notifcations.
this._dispatch(stateActions.removeAllNotifications()); this._dispatch(stateActions.removeAllNotifications());
this.getChatHistory(); this.getServerHistory();
this.getFileHistory();
this._dispatch(requestActions.notify( this._dispatch(requestActions.notify(
{ {

16
server/lib/Room.js
View File

@ -263,10 +263,16 @@ class Room extends EventEmitter
); );
}); });
signalingPeer.socket.on('chat-history', (request, cb) => signalingPeer.socket.on('server-history', (request, cb) =>
{ {
// Return to sender // Return to sender
cb(null, { chatHistory: this._chatHistory }); cb(
null,
{
chatHistory : this._chatHistory,
fileHistory : this._fileHistory
}
);
}); });
signalingPeer.socket.on('send-file', (request, cb) => signalingPeer.socket.on('send-file', (request, cb) =>
@ -292,12 +298,6 @@ class Room extends EventEmitter
); );
}); });
signalingPeer.socket.on('file-history', (request, cb) =>
{
// Return to sender
cb(null, { fileHistory : this._fileHistory });
});
signalingPeer.socket.on('raisehand-message', (request, cb) => signalingPeer.socket.on('raisehand-message', (request, cb) =>
{ {
// Return no error // Return no error