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

Remove getServerHistory, and use 'join' callback instead.

auto_join_3.3
Håvar Aambø Fosstveit 2020-05-01 21:48:09 +02:00
parent a8dabf7343
commit 881eac741a
2 changed files with 48 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
app/src/RoomClient.js
View File

@ -844,62 +844,6 @@ export default class RoomClient
}
}
async getServerHistory()
{
logger.debug('getServerHistory()');
try
{
const {
chatHistory,
fileHistory,
lastNHistory,
locked,
lobbyPeers,
accessCode
} = await this.sendRequest('serverHistory');
(chatHistory.length > 0) && store.dispatch(
chatActions.addChatHistory(chatHistory));
(fileHistory.length > 0) && store.dispatch(
fileActions.addFileHistory(fileHistory));
if (lastNHistory.length > 0)
{
logger.debug('Got lastNHistory');
// Remove our self from list
const index = lastNHistory.indexOf(this._peerId);
lastNHistory.splice(index, 1);
this._spotlights.addSpeakerList(lastNHistory);
}
locked ?
store.dispatch(roomActions.setRoomLocked()) :
store.dispatch(roomActions.setRoomUnLocked());
(lobbyPeers.length > 0) && lobbyPeers.forEach((peer) =>
{
store.dispatch(
lobbyPeerActions.addLobbyPeer(peer.peerId));
store.dispatch(
lobbyPeerActions.setLobbyPeerDisplayName(peer.displayName, peer.peerId));
store.dispatch(
lobbyPeerActions.setLobbyPeerPicture(peer.picture));
});
(accessCode != null) && store.dispatch(
roomActions.setAccessCode(accessCode));
}
catch (error)
{
logger.error('getServerHistory() | failed: %o', error);
}
}
async muteMic()
{
logger.debug('muteMic()');
@ -2733,7 +2677,13 @@ export default class RoomClient
peers,
tracker,
permissionsFromRoles,
userRoles
userRoles,
chatHistory,
fileHistory,
lastNHistory,
locked,
lobbyPeers,
accessCode
} = await this.sendRequest(
'join',
{
@ -2788,6 +2738,38 @@ export default class RoomClient
this.updateSpotlights(spotlights);
});
(chatHistory.length > 0) && store.dispatch(
chatActions.addChatHistory(chatHistory));
(fileHistory.length > 0) && store.dispatch(
fileActions.addFileHistory(fileHistory));
if (lastNHistory.length > 0)
{
logger.debug('_joinRoom() | got lastN history');
this._spotlights.addSpeakerList(
lastNHistory.filter((peerId) => peerId !== this._peerId)
);
}
locked ?
store.dispatch(roomActions.setRoomLocked()) :
store.dispatch(roomActions.setRoomUnLocked());
(lobbyPeers.length > 0) && lobbyPeers.forEach((peer) =>
{
store.dispatch(
lobbyPeerActions.addLobbyPeer(peer.peerId));
store.dispatch(
lobbyPeerActions.setLobbyPeerDisplayName(peer.displayName, peer.peerId));
store.dispatch(
lobbyPeerActions.setLobbyPeerPicture(peer.picture));
});
(accessCode != null) && store.dispatch(
roomActions.setAccessCode(accessCode));
// Don't produce if explicitly requested to not to do it.
if (this._produce)
{
@ -2821,8 +2803,6 @@ export default class RoomClient
// Clean all the existing notifications.
store.dispatch(notificationActions.removeAllNotifications());
this.getServerHistory();
store.dispatch(requestActions.notify(
{
text : intl.formatMessage({

30
server/lib/Room.js
View File

@ -597,13 +597,21 @@ class Room extends EventEmitter
.filter((joinedPeer) => joinedPeer.id !== peer.id)
.map((joinedPeer) => (joinedPeer.peerInfo));
const lobbyPeers = this._lobby.peerList();
cb(null, {
roles : peer.roles,
peers : peerInfos,
tracker : config.fileTracker,
authenticated : peer.authenticated,
permissionsFromRoles : permissionsFromRoles,
userRoles : userRoles
userRoles : userRoles,
chatHistory : this._chatHistory,
fileHistory : this._fileHistory,
lastNHistory : this._lastN,
locked : this._locked,
lobbyPeers : lobbyPeers,
accessCode : this._accessCode
});
// Mark the new Peer as joined.
@ -1078,26 +1086,6 @@ class Room extends EventEmitter
break;
}
case 'serverHistory':
{
// Return to sender
const lobbyPeers = this._lobby.peerList();
cb(
null,
{
chatHistory : this._chatHistory,
fileHistory : this._fileHistory,
lastNHistory : this._lastN,
locked : this._locked,
lobbyPeers : lobbyPeers,
accessCode : this._accessCode
}
);
break;
}
case 'lockRoom':
{
if (